mirror of
https://github.com/espressif/esp-idf.git
synced 2026-08-18 06:35:35 +03:00
Merge branch 'feature/add_ecdsa_p384_support_and_testcases' into 'master'
feat: add ecdsa-p384 testcases and relative support for ESP32C5 ECO2 Closes IDF-13008 and IDF-12630 See merge request espressif/esp-idf!38857
This commit is contained in:
@@ -106,7 +106,7 @@ espefuse.py -p $ESPPORT burn_key BLOCK_KEY2 main/ds/keys/4096/ds_key3.bin HMAC_D
|
||||
|
||||
# Burning the ECDSA keys
|
||||
|
||||
By default, ECDSA tests are disabled. You can enable it after disabling HMAC tests using `idf.py menuconfig -> Test App Configuration -> Enable ECDSA Peripheral test cases`
|
||||
By default, ECDSA tests are disabled. You can enable it after disabling HMAC & DS tests using `idf.py menuconfig -> Test App Configuration -> Enable ECDSA Peripheral test cases`
|
||||
|
||||
The ECDSA tests need some ECDSA keys to be burned in the `BLOCK_KEY3` and `BLOCK_KEY4` of the efuses. As this verification application is independent of the efuse component, the user needs to manually burn the keys and their key purposes using `espefuse.py`.
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ menu "Test App Configuration"
|
||||
Enabling this option includes HMAC Peripheral related test cases in the build for supported targets.
|
||||
|
||||
config CRYPTO_TEST_APP_ENABLE_ECDSA_TESTS
|
||||
depends on SOC_ECDSA_SUPPORTED && !CRYPTO_TEST_APP_ENABLE_HMAC_TESTS
|
||||
depends on SOC_ECDSA_SUPPORTED && !CRYPTO_TEST_APP_ENABLE_HMAC_TESTS && !CRYPTO_TEST_APP_ENABLE_DS_TESTS
|
||||
bool "Enable ECDSA Peripheral test cases"
|
||||
default n
|
||||
help
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
-----BEGIN EC PRIVATE KEY-----
|
||||
MIGkAgEBBDAlJNNxsYfk5Ljs1S+0A+F0bsbCBOYvEkGgHLe2GX8BZWvF/UcBQ/MC
|
||||
qw2m/lFnDx+gBwYFK4EEACKhZANiAASuwiuzzbIJKY3lHflvXsUZx1txuxUGfudz
|
||||
LZ6X0dM0DAfhk37MxXHli3veGelbkUX37qyRhGShPfNCznxwgfHRTBzEus0gR0hM
|
||||
/KCjgiryPZfgI0t41sLOf4bJ1q6tvyk=
|
||||
-----END EC PRIVATE KEY-----
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Unlicense OR CC0-1.0
|
||||
*/
|
||||
@@ -20,27 +20,20 @@ const uint8_t ecc_p192_k[] = {
|
||||
0x75, 0x87, 0xbb, 0x6f, 0x80, 0x34, 0x8d, 0x5e
|
||||
};
|
||||
|
||||
uint8_t sha[] = {
|
||||
0x0c, 0xaa, 0x08, 0xb4, 0xf0, 0x89, 0xd3, 0x45,
|
||||
0xbb, 0x55, 0x98, 0xd9, 0xc2, 0xe9, 0x65, 0x5d,
|
||||
0x7e, 0xa3, 0xa9, 0xc3, 0xcd, 0x69, 0xb1, 0xcf,
|
||||
0x91, 0xbe, 0x58, 0x10, 0xfe, 0x80, 0x65, 0x6e
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa256_r[] = {
|
||||
0xff, 0x94, 0xf7, 0x5a, 0xce, 0x81, 0x05, 0xfc,
|
||||
0x98, 0x17, 0xd5, 0x0a, 0x94, 0x53, 0xab, 0x54,
|
||||
0xa8, 0x21, 0x8b, 0xe6, 0xf2, 0x6e, 0xa0, 0x7b,
|
||||
0x20, 0x36, 0x27, 0xd2, 0x60, 0x5d, 0xa3, 0x2e
|
||||
0x23, 0xc0, 0x94, 0xe5, 0x49, 0x17, 0xf4, 0x30,
|
||||
0x10, 0xa4, 0xa0, 0x53, 0x28, 0x8b, 0x87, 0xde,
|
||||
0xfc, 0x58, 0x9e, 0x64, 0x0b, 0x27, 0xe3, 0xb4,
|
||||
0x46, 0x6c, 0x24, 0x64, 0x0f, 0xe1, 0x3e, 0x97
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa256_s[] = {
|
||||
0x50, 0x78, 0x0e, 0x41, 0xe3, 0x03, 0xd2, 0x5b,
|
||||
0xaf, 0x74, 0x31, 0xb8, 0x74, 0xc9, 0xb3, 0x89,
|
||||
0x8d, 0xb5, 0x40, 0x3e, 0x5b, 0x2a, 0x4b, 0xe2,
|
||||
0x5e, 0xf8, 0x96, 0xd4, 0xf9, 0x22, 0xf9, 0xb4
|
||||
0x98, 0x16, 0xf0, 0x9a, 0x8a, 0xf1, 0x8c, 0x8f,
|
||||
0x3b, 0xcb, 0x75, 0x78, 0x71, 0xc9, 0x98, 0x67,
|
||||
0x86, 0xf3, 0x05, 0x0c, 0x5a, 0xe3, 0x8d, 0xec,
|
||||
0x55, 0x6f, 0x3b, 0xab, 0xd5, 0x1b, 0xae, 0xb1
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
@@ -61,16 +54,16 @@ uint8_t ecdsa256_pub_y[] = {
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa192_r[] = {
|
||||
0x9f, 0xee, 0xb7, 0x4f, 0x09, 0xd5, 0xc8, 0x42,
|
||||
0x2c, 0x74, 0xe7, 0xaa, 0x6d, 0xe2, 0xe1, 0x1c,
|
||||
0xb7, 0x26, 0x75, 0xb2, 0x2f, 0x18, 0x8a, 0x2b
|
||||
0x9c, 0xd0, 0xbc, 0x89, 0xbe, 0x77, 0x7e, 0x87,
|
||||
0x00, 0xfc, 0x20, 0x07, 0x2f, 0x2d, 0x46, 0xef,
|
||||
0xa2, 0x81, 0x29, 0x68, 0x95, 0x29, 0xc8, 0x90
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa192_s[] = {
|
||||
0x12, 0x5b, 0x30, 0x24, 0x59, 0x24, 0xeb, 0xf6,
|
||||
0x2f, 0x06, 0x60, 0xa8, 0xff, 0xa5, 0xed, 0xce,
|
||||
0xb6, 0xa5, 0x28, 0xf4, 0x05, 0xb4, 0x74, 0x1a
|
||||
0x46, 0x46, 0x2b, 0xfa, 0x9e, 0x0e, 0xb2, 0x74,
|
||||
0x57, 0xd6, 0xb2, 0xea, 0xbd, 0x76, 0xc1, 0x3b,
|
||||
0x11, 0x8a, 0x5b, 0xb6, 0xc5, 0x84, 0xb1, 0x1e
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
@@ -86,3 +79,53 @@ uint8_t ecdsa192_pub_y[] = {
|
||||
0xde, 0xc2, 0xdc, 0x74, 0xf3, 0xfd, 0x09, 0x74,
|
||||
0xbe, 0xc4, 0xbc, 0x65, 0xcb, 0x76, 0xfc, 0x85
|
||||
};
|
||||
|
||||
/* Big endian */
|
||||
uint8_t sha[] = {
|
||||
0x98, 0xca, 0xea, 0x85, 0x7b, 0x03, 0x5e, 0xc0,
|
||||
0xe3, 0xc3, 0x39, 0x29, 0xef, 0xf1, 0xf1, 0x25,
|
||||
0x00, 0x19, 0xe7, 0x11, 0xc3, 0x3d, 0x84, 0x42,
|
||||
0x38, 0x79, 0x10, 0xef, 0xb2, 0x9b, 0xd2, 0x63,
|
||||
0xed, 0xfe, 0x04, 0xce, 0x66, 0x89, 0xd0, 0xa4,
|
||||
0xb2, 0x60, 0xb2, 0x38, 0x93, 0xa6, 0x27, 0x14
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa384_r[] = {
|
||||
0xbb, 0x6e, 0x80, 0x35, 0x09, 0x36, 0x31, 0xc5,
|
||||
0x59, 0x0a, 0x89, 0x82, 0x22, 0xa7, 0x5f, 0xfb,
|
||||
0x35, 0x6a, 0x4b, 0xf0, 0x4a, 0x20, 0x3a, 0x9d,
|
||||
0xbe, 0x6f, 0xf0, 0xa9, 0xd7, 0x2e, 0x2d, 0x6b,
|
||||
0x04, 0x7f, 0x75, 0x14, 0xf8, 0xc6, 0x18, 0xe6,
|
||||
0x81, 0xb6, 0x08, 0x08, 0xaf, 0xe3, 0x24, 0x1a,
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa384_s[] = {
|
||||
0x94, 0x61, 0xf9, 0xa8, 0xcd, 0x7a, 0x3c, 0x23,
|
||||
0xd8, 0x12, 0x3e, 0x33, 0x29, 0xa9, 0x9b, 0xe9,
|
||||
0x85, 0x5b, 0x34, 0xb9, 0xdc, 0xc2, 0x90, 0x87,
|
||||
0x71, 0x7c, 0x89, 0xa2, 0x94, 0x5f, 0x4e, 0x47,
|
||||
0x5f, 0xa7, 0xe4, 0x20, 0x4e, 0xf7, 0x36, 0x6e,
|
||||
0xe4, 0x62, 0x94, 0x41, 0x8c, 0x30, 0x81, 0x38,
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa384_pub_x[] = {
|
||||
0x45, 0x91, 0x5b, 0xe9, 0x19, 0xde, 0x7b, 0x8b,
|
||||
0xe5, 0x71, 0xc5, 0xcc, 0x7e, 0x93, 0xe1, 0x07,
|
||||
0x0c, 0x34, 0xd3, 0xd1, 0x97, 0x9e, 0x2d, 0x73,
|
||||
0xe7, 0x7e, 0x06, 0x15, 0xbb, 0x71, 0x5b, 0xc7,
|
||||
0x19, 0xc5, 0x5e, 0x6f, 0xf9, 0x1d, 0xe5, 0x8d,
|
||||
0x29, 0x09, 0xb2, 0xcd, 0xb3, 0x2b, 0xc2, 0xae,
|
||||
};
|
||||
|
||||
/* Little endian */
|
||||
uint8_t ecdsa384_pub_y[] = {
|
||||
0x29, 0xbf, 0xad, 0xae, 0xd6, 0xc9, 0x86, 0x7f,
|
||||
0xce, 0xc2, 0xd6, 0x78, 0x4b, 0x23, 0xe0, 0x97,
|
||||
0x3d, 0xf2, 0x2a, 0x82, 0xa3, 0xa0, 0xfc, 0x4c,
|
||||
0x48, 0x47, 0x20, 0xcd, 0xba, 0xc4, 0x1c, 0x4c,
|
||||
0xd1, 0xf1, 0x81, 0x70, 0x7c, 0xce, 0x42, 0xf3,
|
||||
0x3d, 0xa1, 0x64, 0x84, 0x91, 0xac, 0xee, 0xf7,
|
||||
};
|
||||
|
||||
@@ -63,22 +63,33 @@ static void ecc_be_to_le(const uint8_t* be_point, uint8_t *le_point, uint8_t len
|
||||
}
|
||||
}
|
||||
|
||||
int test_ecdsa_verify(bool is_p256, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, uint8_t *pub_x, uint8_t *pub_y)
|
||||
int test_ecdsa_verify(ecdsa_curve_t curve, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, uint8_t *pub_x, uint8_t *pub_y)
|
||||
{
|
||||
uint16_t len;
|
||||
uint8_t sha_le[32];
|
||||
uint16_t len = 0;
|
||||
uint8_t sha_le[48];
|
||||
|
||||
ecdsa_hal_config_t conf = {
|
||||
.mode = ECDSA_MODE_SIGN_VERIFY,
|
||||
.sha_mode = ECDSA_Z_USER_PROVIDED,
|
||||
};
|
||||
|
||||
if (is_p256) {
|
||||
conf.curve = ECDSA_CURVE_SECP256R1;
|
||||
len = 32;
|
||||
} else {
|
||||
conf.curve = ECDSA_CURVE_SECP192R1;
|
||||
len = 24;
|
||||
switch (curve) {
|
||||
case ECDSA_CURVE_SECP192R1:
|
||||
conf.curve = ECDSA_CURVE_SECP192R1;
|
||||
len = 24;
|
||||
break;
|
||||
case ECDSA_CURVE_SECP256R1:
|
||||
conf.curve = ECDSA_CURVE_SECP256R1;
|
||||
len = 32;
|
||||
break;
|
||||
#if SOC_ECDSA_SUPPORT_CURVE_P384
|
||||
case ECDSA_CURVE_SECP384R1:
|
||||
conf.curve = ECDSA_CURVE_SECP384R1;
|
||||
len = 48;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* Set HASH */
|
||||
@@ -90,51 +101,53 @@ int test_ecdsa_verify(bool is_p256, uint8_t* sha, uint8_t* r_le, uint8_t* s_le,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void test_ecdsa_corrupt_data(bool is_p256, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, uint8_t *pub_x, uint8_t *pub_y)
|
||||
static void test_ecdsa_corrupt_data(ecdsa_curve_t curve, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, uint8_t *pub_x, uint8_t *pub_y)
|
||||
{
|
||||
int len;
|
||||
int len = 0;
|
||||
|
||||
if (is_p256) {
|
||||
len = 32;
|
||||
} else {
|
||||
len = 24;
|
||||
switch (curve) {
|
||||
case ECDSA_CURVE_SECP192R1: len = 24; break;
|
||||
case ECDSA_CURVE_SECP256R1: len = 32; break;
|
||||
#if SOC_ECDSA_SUPPORT_CURVE_P384
|
||||
case ECDSA_CURVE_SECP384R1: len = 48; break;
|
||||
#endif
|
||||
default: break;
|
||||
}
|
||||
|
||||
// Randomly select a bit and corrupt its corresponding value
|
||||
uint16_t r_bit = esp_random() % len * 8;
|
||||
uint16_t r_bit = esp_random() % (len * 8);
|
||||
|
||||
printf("Corrupting SHA bit %d...\n", r_bit);
|
||||
sha[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(1, sha, r_le, s_le, pub_x, pub_y));
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(curve, sha, r_le, s_le, pub_x, pub_y));
|
||||
sha[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
|
||||
printf("Corrupting R bit %d...\n", r_bit);
|
||||
r_le[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(1, sha, r_le, s_le, pub_x, pub_y));
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(curve, sha, r_le, s_le, pub_x, pub_y));
|
||||
r_le[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
|
||||
printf("Corrupting S bit %d...\n", r_bit);
|
||||
s_le[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(1, sha, r_le, s_le, pub_x, pub_y));
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(curve, sha, r_le, s_le, pub_x, pub_y));
|
||||
s_le[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
|
||||
printf("Corrupting pub_x bit %d...\n", r_bit);
|
||||
pub_x[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(1, sha, r_le, s_le, pub_x, pub_y));
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(curve, sha, r_le, s_le, pub_x, pub_y));
|
||||
pub_x[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
|
||||
printf("Corrupting pub_y bit %d...\n", r_bit);
|
||||
pub_y[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(1, sha, r_le, s_le, pub_x, pub_y));
|
||||
TEST_ASSERT_EQUAL(-1, test_ecdsa_verify(curve, sha, r_le, s_le, pub_x, pub_y));
|
||||
pub_y[r_bit / 8] ^= 1 << (r_bit % 8);
|
||||
|
||||
}
|
||||
|
||||
void test_ecdsa_sign(bool is_p256, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, bool use_km_key, ecdsa_sign_type_t k_type)
|
||||
void test_ecdsa_sign(ecdsa_curve_t curve, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, bool use_km_key, ecdsa_sign_type_t k_type)
|
||||
{
|
||||
uint8_t sha_le[32] = {0};
|
||||
uint8_t zeroes[32] = {0};
|
||||
uint16_t len;
|
||||
uint8_t sha_le[48] = {0};
|
||||
uint8_t zeroes[48] = {0};
|
||||
uint16_t len = 0;
|
||||
|
||||
#if !SOC_ECDSA_SUPPORT_HW_DETERMINISTIC_LOOP
|
||||
uint16_t det_loop_number = 1;
|
||||
@@ -146,19 +159,34 @@ void test_ecdsa_sign(bool is_p256, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, b
|
||||
.use_km_key = use_km_key,
|
||||
.sign_type = k_type,
|
||||
};
|
||||
|
||||
if (is_p256) {
|
||||
conf.curve = ECDSA_CURVE_SECP256R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_2;
|
||||
}
|
||||
len = 32;
|
||||
} else {
|
||||
conf.curve = ECDSA_CURVE_SECP192R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_1;
|
||||
}
|
||||
len = 24;
|
||||
switch (curve) {
|
||||
case ECDSA_CURVE_SECP192R1:
|
||||
conf.curve = ECDSA_CURVE_SECP192R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_1;
|
||||
}
|
||||
len = 24;
|
||||
break;
|
||||
case ECDSA_CURVE_SECP256R1:
|
||||
conf.curve = ECDSA_CURVE_SECP256R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_2;
|
||||
}
|
||||
len = 32;
|
||||
break;
|
||||
#if SOC_ECDSA_SUPPORT_CURVE_P384
|
||||
case ECDSA_CURVE_SECP384R1:
|
||||
conf.curve = ECDSA_CURVE_SECP384R1;
|
||||
if (use_km_key == 0) {
|
||||
// Store two key blocks in a single 8-bit integer
|
||||
// Most significant 4 bits for first block where, lower 4 bits for second block
|
||||
conf.efuse_key_blk = HAL_ECDSA_COMBINE_KEY_BLOCKS(EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_3, EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_4);
|
||||
}
|
||||
len = 48;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* Set HASH */
|
||||
@@ -186,43 +214,56 @@ void test_ecdsa_sign(bool is_p256, uint8_t* sha, uint8_t* r_le, uint8_t* s_le, b
|
||||
process_again |= !ecdsa_hal_det_signature_k_check();
|
||||
}
|
||||
#endif /* SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE && !SOC_ECDSA_SUPPORT_HW_DETERMINISTIC_LOOP */
|
||||
|
||||
} while(process_again);
|
||||
|
||||
ecdsa_disable();
|
||||
}
|
||||
|
||||
void test_ecdsa_sign_and_verify(bool is_p256, uint8_t* sha, uint8_t* pub_x, uint8_t* pub_y, bool use_km_key, ecdsa_sign_type_t k_type)
|
||||
void test_ecdsa_sign_and_verify(ecdsa_curve_t curve, uint8_t* sha, uint8_t* pub_x, uint8_t* pub_y, bool use_km_key, ecdsa_sign_type_t k_type)
|
||||
{
|
||||
uint8_t r_le[32] = {0};
|
||||
uint8_t s_le[32] = {0};
|
||||
|
||||
test_ecdsa_sign(is_p256, sha, r_le, s_le, use_km_key, k_type);
|
||||
TEST_ASSERT_EQUAL(0, test_ecdsa_verify(is_p256, sha, r_le, s_le, pub_x, pub_y));
|
||||
uint8_t r_le[48] = {0};
|
||||
uint8_t s_le[48] = {0};
|
||||
test_ecdsa_sign(curve, sha, r_le, s_le, use_km_key, k_type);
|
||||
TEST_ASSERT_EQUAL(0, test_ecdsa_verify(curve, sha, r_le, s_le, pub_x, pub_y));
|
||||
}
|
||||
|
||||
#ifdef SOC_ECDSA_SUPPORT_EXPORT_PUBKEY
|
||||
void test_ecdsa_export_pubkey_inner(bool is_p256, uint8_t *exported_pub_x, uint8_t *exported_pub_y, bool use_km_key, uint16_t *len)
|
||||
void test_ecdsa_export_pubkey_inner(ecdsa_curve_t curve, uint8_t *exported_pub_x, uint8_t *exported_pub_y, bool use_km_key, uint16_t *len)
|
||||
{
|
||||
|
||||
uint8_t zeroes[32] = {0};
|
||||
uint8_t zeroes[48] = {0};
|
||||
ecdsa_hal_config_t conf = {
|
||||
.mode = ECDSA_MODE_EXPORT_PUBKEY,
|
||||
.use_km_key = use_km_key,
|
||||
};
|
||||
|
||||
if (is_p256) {
|
||||
conf.curve = ECDSA_CURVE_SECP256R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_2;
|
||||
}
|
||||
*len = 32;
|
||||
} else {
|
||||
conf.curve = ECDSA_CURVE_SECP192R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_1;
|
||||
}
|
||||
*len = 24;
|
||||
switch (curve) {
|
||||
case ECDSA_CURVE_SECP192R1:
|
||||
conf.curve = ECDSA_CURVE_SECP192R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_1;
|
||||
}
|
||||
*len = 24;
|
||||
break;
|
||||
case ECDSA_CURVE_SECP256R1:
|
||||
conf.curve = ECDSA_CURVE_SECP256R1;
|
||||
if (use_km_key == 0) {
|
||||
conf.efuse_key_blk = EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_2;
|
||||
}
|
||||
*len = 32;
|
||||
break;
|
||||
#if SOC_ECDSA_SUPPORT_CURVE_P384
|
||||
case ECDSA_CURVE_SECP384R1:
|
||||
conf.curve = ECDSA_CURVE_SECP384R1;
|
||||
if (use_km_key == 0) {
|
||||
// Store two key blocks in a single 8-bit integer
|
||||
// Most significant 4 bits for first block where, lower 4 bits for second block
|
||||
conf.efuse_key_blk = HAL_ECDSA_COMBINE_KEY_BLOCKS(EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_3, EFUSE_BLK_KEY0 + ECDSA_KEY_BLOCK_4);
|
||||
}
|
||||
*len = 48;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
ecdsa_enable_and_reset();
|
||||
@@ -231,30 +272,25 @@ void test_ecdsa_export_pubkey_inner(bool is_p256, uint8_t *exported_pub_x, uint8
|
||||
|
||||
do {
|
||||
ecdsa_hal_export_pubkey(&conf, exported_pub_x, exported_pub_y, *len);
|
||||
|
||||
process_again = !ecdsa_hal_get_operation_result()
|
||||
|| !memcmp(exported_pub_x, zeroes, *len)
|
||||
|| !memcmp(exported_pub_y, zeroes, *len);
|
||||
|
||||
} while (process_again);
|
||||
|
||||
ecdsa_disable();
|
||||
}
|
||||
|
||||
void test_ecdsa_export_pubkey(bool is_p256, uint8_t *ecdsa_pub_x, uint8_t *ecdsa_pub_y, bool use_km_key)
|
||||
void test_ecdsa_export_pubkey(ecdsa_curve_t curve, uint8_t *ecdsa_pub_x, uint8_t *ecdsa_pub_y, bool use_km_key)
|
||||
{
|
||||
uint8_t pub_x[32] = {0};
|
||||
uint8_t pub_y[32] = {0};
|
||||
uint8_t pub_x[48] = {0};
|
||||
uint8_t pub_y[48] = {0};
|
||||
uint16_t len;
|
||||
test_ecdsa_export_pubkey_inner(is_p256, pub_x, pub_y, use_km_key, &len);
|
||||
test_ecdsa_export_pubkey_inner(curve, pub_x, pub_y, use_km_key, &len);
|
||||
|
||||
TEST_ASSERT_EQUAL_HEX8_ARRAY(ecdsa_pub_x, pub_x, len);
|
||||
TEST_ASSERT_EQUAL_HEX8_ARRAY(ecdsa_pub_y, pub_y, len);
|
||||
|
||||
}
|
||||
#endif /* SOC_ECDSA_SUPPORT_EXPORT_PUBKEY */
|
||||
|
||||
|
||||
TEST_GROUP(ecdsa);
|
||||
|
||||
TEST_SETUP(ecdsa)
|
||||
@@ -269,13 +305,12 @@ TEST_TEAR_DOWN(ecdsa)
|
||||
test_utils_get_leak_level(ESP_LEAK_TYPE_CRITICAL, ESP_COMP_LEAK_ALL));
|
||||
}
|
||||
|
||||
|
||||
TEST(ecdsa, ecdsa_SECP192R1_signature_verification)
|
||||
{
|
||||
if (!esp_efuse_is_ecdsa_p192_curve_supported()) {
|
||||
ESP_LOGI(TAG, "Skipping test because ECDSA 192-curve operations are disabled.");
|
||||
} else {
|
||||
TEST_ASSERT_EQUAL(0, test_ecdsa_verify(0, sha, ecdsa192_r, ecdsa192_s, ecdsa192_pub_x, ecdsa192_pub_y));
|
||||
TEST_ASSERT_EQUAL(0, test_ecdsa_verify(ECDSA_CURVE_SECP192R1, sha, ecdsa192_r, ecdsa192_s, ecdsa192_pub_x, ecdsa192_pub_y));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -284,7 +319,7 @@ TEST(ecdsa, ecdsa_SECP192R1_sign_and_verify)
|
||||
if (!esp_efuse_is_ecdsa_p192_curve_supported()) {
|
||||
ESP_LOGI(TAG, "Skipping test because ECDSA 192-curve operations are disabled.");
|
||||
} else {
|
||||
test_ecdsa_sign_and_verify(0, sha, ecdsa192_pub_x, ecdsa192_pub_y, false, ECDSA_K_TYPE_TRNG);
|
||||
test_ecdsa_sign_and_verify(ECDSA_CURVE_SECP192R1, sha, ecdsa192_pub_x, ecdsa192_pub_y, false, ECDSA_K_TYPE_TRNG);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -293,23 +328,23 @@ TEST(ecdsa, ecdsa_SECP192R1_corrupt_signature)
|
||||
if (!esp_efuse_is_ecdsa_p192_curve_supported()) {
|
||||
ESP_LOGI(TAG, "Skipping test because ECDSA 192-curve operations are disabled.");
|
||||
} else {
|
||||
test_ecdsa_corrupt_data(0, sha, ecdsa192_r, ecdsa192_s, ecdsa192_pub_x, ecdsa192_pub_y);
|
||||
test_ecdsa_corrupt_data(ECDSA_CURVE_SECP192R1, sha, ecdsa192_r, ecdsa192_s, ecdsa192_pub_x, ecdsa192_pub_y);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(ecdsa, ecdsa_SECP256R1_signature_verification)
|
||||
{
|
||||
TEST_ASSERT_EQUAL(0, test_ecdsa_verify(1, sha, ecdsa256_r, ecdsa256_s, ecdsa256_pub_x, ecdsa256_pub_y));
|
||||
TEST_ASSERT_EQUAL(0, test_ecdsa_verify(ECDSA_CURVE_SECP256R1, sha, ecdsa256_r, ecdsa256_s, ecdsa256_pub_x, ecdsa256_pub_y));
|
||||
}
|
||||
|
||||
TEST(ecdsa, ecdsa_SECP256R1_sign_and_verify)
|
||||
{
|
||||
test_ecdsa_sign_and_verify(1, sha, ecdsa256_pub_x, ecdsa256_pub_y, false, ECDSA_K_TYPE_TRNG);
|
||||
test_ecdsa_sign_and_verify(ECDSA_CURVE_SECP256R1, sha, ecdsa256_pub_x, ecdsa256_pub_y, false, ECDSA_K_TYPE_TRNG);
|
||||
}
|
||||
|
||||
TEST(ecdsa, ecdsa_SECP256R1_corrupt_signature)
|
||||
{
|
||||
test_ecdsa_corrupt_data(1, sha, ecdsa256_r, ecdsa256_s, ecdsa256_pub_x, ecdsa256_pub_y);
|
||||
test_ecdsa_corrupt_data(ECDSA_CURVE_SECP256R1, sha, ecdsa256_r, ecdsa256_s, ecdsa256_pub_x, ecdsa256_pub_y);
|
||||
}
|
||||
|
||||
#ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE
|
||||
@@ -320,7 +355,7 @@ TEST(ecdsa, ecdsa_SECP192R1_det_sign_and_verify)
|
||||
} else if (!esp_efuse_is_ecdsa_p192_curve_supported()) {
|
||||
ESP_LOGI(TAG, "Skipping test because ECDSA 192-curve operations are disabled.");
|
||||
} else {
|
||||
test_ecdsa_sign_and_verify(0, sha, ecdsa192_pub_x, ecdsa192_pub_y, false, ECDSA_K_TYPE_DETERMINISITIC);
|
||||
test_ecdsa_sign_and_verify(ECDSA_CURVE_SECP192R1, sha, ecdsa192_pub_x, ecdsa192_pub_y, false, ECDSA_K_TYPE_DETERMINISITIC);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -329,7 +364,7 @@ TEST(ecdsa, ecdsa_SECP256R1_det_sign_and_verify)
|
||||
if (!ecdsa_ll_is_deterministic_mode_supported()) {
|
||||
ESP_LOGI(TAG, "Skipping test because ECDSA deterministic mode is not supported.");
|
||||
} else {
|
||||
test_ecdsa_sign_and_verify(1, sha, ecdsa256_pub_x, ecdsa256_pub_y, false, ECDSA_K_TYPE_DETERMINISITIC);
|
||||
test_ecdsa_sign_and_verify(ECDSA_CURVE_SECP256R1, sha, ecdsa256_pub_x, ecdsa256_pub_y, false, ECDSA_K_TYPE_DETERMINISITIC);
|
||||
}
|
||||
}
|
||||
#endif /* SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE */
|
||||
@@ -340,30 +375,81 @@ TEST(ecdsa, ecdsa_SECP192R1_export_pubkey)
|
||||
if (!esp_efuse_is_ecdsa_p192_curve_supported()) {
|
||||
ESP_LOGI(TAG, "Skipping test because ECDSA 192-curve operations are disabled.");
|
||||
} else {
|
||||
test_ecdsa_export_pubkey(0, ecdsa192_pub_x, ecdsa192_pub_y, 0);
|
||||
test_ecdsa_export_pubkey(ECDSA_CURVE_SECP192R1, ecdsa192_pub_x, ecdsa192_pub_y, 0);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(ecdsa, ecdsa_SECP256R1_export_pubkey)
|
||||
{
|
||||
test_ecdsa_export_pubkey(1, ecdsa256_pub_x, ecdsa256_pub_y, 0);
|
||||
test_ecdsa_export_pubkey(ECDSA_CURVE_SECP256R1, ecdsa256_pub_x, ecdsa256_pub_y, 0);
|
||||
}
|
||||
#endif /* SOC_ECDSA_SUPPORT_EXPORT_PUBKEY */
|
||||
|
||||
#ifdef SOC_ECDSA_SUPPORT_CURVE_P384
|
||||
TEST(ecdsa, ecdsa_SECP384R1_signature_verification)
|
||||
{
|
||||
TEST_ASSERT_EQUAL(0, test_ecdsa_verify(ECDSA_CURVE_SECP384R1, sha, ecdsa384_r, ecdsa384_s, ecdsa384_pub_x, ecdsa384_pub_y));
|
||||
}
|
||||
|
||||
TEST(ecdsa, ecdsa_SECP384R1_sign_and_verify)
|
||||
{
|
||||
test_ecdsa_sign_and_verify(ECDSA_CURVE_SECP384R1, sha, ecdsa384_pub_x, ecdsa384_pub_y, false, ECDSA_K_TYPE_TRNG);
|
||||
}
|
||||
|
||||
TEST(ecdsa, ecdsa_SECP384R1_corrupt_signature)
|
||||
{
|
||||
test_ecdsa_corrupt_data(ECDSA_CURVE_SECP384R1, sha, ecdsa384_r, ecdsa384_s, ecdsa384_pub_x, ecdsa384_pub_y);
|
||||
}
|
||||
|
||||
#ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE
|
||||
TEST(ecdsa, ecdsa_SECP384R1_det_sign_and_verify)
|
||||
{
|
||||
test_ecdsa_sign_and_verify(ECDSA_CURVE_SECP384R1, sha, ecdsa384_pub_x, ecdsa384_pub_y, false, ECDSA_K_TYPE_DETERMINISITIC);
|
||||
}
|
||||
#endif /* SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE */
|
||||
|
||||
#ifdef SOC_ECDSA_SUPPORT_EXPORT_PUBKEY
|
||||
TEST(ecdsa, ecdsa_SECP384R1_export_pubkey)
|
||||
{
|
||||
test_ecdsa_export_pubkey(ECDSA_CURVE_SECP384R1, ecdsa384_pub_x, ecdsa384_pub_y, 0);
|
||||
}
|
||||
#endif /* SOC_ECDSA_SUPPORT_EXPORT_PUBKEY */
|
||||
#endif /* SOC_ECDSA_SUPPORT_CURVE_P384 */
|
||||
|
||||
TEST_GROUP_RUNNER(ecdsa)
|
||||
{
|
||||
/* SECP192R1 test cases */
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_signature_verification)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_sign_and_verify)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_corrupt_signature)
|
||||
#ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_det_sign_and_verify)
|
||||
#endif /* SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE */
|
||||
#ifdef SOC_ECDSA_SUPPORT_EXPORT_PUBKEY
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_export_pubkey)
|
||||
#endif /* SOC_ECDSA_SUPPORT_EXPORT_PUBKEY */
|
||||
|
||||
/* SECP256R1 test cases */
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_signature_verification)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_sign_and_verify)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_corrupt_signature)
|
||||
#ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_det_sign_and_verify)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_det_sign_and_verify)
|
||||
#endif /* SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE */
|
||||
#ifdef SOC_ECDSA_SUPPORT_EXPORT_PUBKEY
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_export_pubkey)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_export_pubkey)
|
||||
#endif /* SOC_ECDSA_SUPPORT_EXPORT_PUBKEY */
|
||||
|
||||
/* SECP384R1 test cases */
|
||||
#ifdef SOC_ECDSA_SUPPORT_CURVE_P384
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_signature_verification)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_sign_and_verify)
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_corrupt_signature)
|
||||
#ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_det_sign_and_verify)
|
||||
#endif /* SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE */
|
||||
#ifdef SOC_ECDSA_SUPPORT_EXPORT_PUBKEY
|
||||
RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_export_pubkey)
|
||||
#endif /* SOC_ECDSA_SUPPORT_EXPORT_PUBKEY */
|
||||
#endif /* SOC_ECDSA_SUPPORT_CURVE_P384 */
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Unlicense OR CC0-1.0
|
||||
*/
|
||||
@@ -10,14 +10,16 @@
|
||||
#define DS_KEY_BLOCK_2 1
|
||||
#define DS_KEY_BLOCK_3 2
|
||||
|
||||
/*
|
||||
* HMAC and ECDSA testcases cannot run together as block used for burning keys are overlapped
|
||||
*/
|
||||
|
||||
// efuse key blocks for ECDSA
|
||||
#define ECDSA_KEY_BLOCK_1 3
|
||||
#define ECDSA_KEY_BLOCK_2 4
|
||||
|
||||
// efuse key blocks for HMAC
|
||||
#define HMAC_KEY_BLOCK_1 4
|
||||
#define HMAC_KEY_BLOCK_2 5
|
||||
|
||||
/*
|
||||
* ECDSA and other peripheral testcases cannot run together as block used for burning keys are overlapped
|
||||
*/
|
||||
|
||||
// efuse key blocks for ECDSA
|
||||
#define ECDSA_KEY_BLOCK_1 0
|
||||
#define ECDSA_KEY_BLOCK_2 1
|
||||
#define ECDSA_KEY_BLOCK_3 2
|
||||
#define ECDSA_KEY_BLOCK_4 3
|
||||
|
||||
Reference in New Issue
Block a user