coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-09-13 14:22:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: ssl_helpers: update TEST_AVAILABLE_ECC and TEST_UNAVAILABLE_ECC

Browse Source 
Align to recent changes in TLS group ID related functions:
- 'mbedtls_ssl_get_ecp_group_id_from_tls_id' renamed to
  'mbedtls_ssl_is_tls_id_supported'.
- 'mbedtls_ssl_get_tls_id_from_ecp_group_id' renamed to
  'mbedtls_ssl_get_tls_id_from_ecp_group_id'.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2026-07-07 14:21:08 +02:00
parent d19ebc8c18
commit b1c673471f
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/include/test/ssl_helpers.h
View File

@ -727,23 +727,19 @@ int mbedtls_test_get_tls13_ticket(
mbedtls_ssl_set_hs_ecjpake_password(&ssl, pwd_string, pwd_len); \ mbedtls_ssl_set_hs_ecjpake_password(&ssl, pwd_string, pwd_len); \
TEST_EQUAL(ret, exp_ret_val) TEST_EQUAL(ret, exp_ret_val)
#define TEST_AVAILABLE_ECC(tls_id_, group_id_, psa_family_, psa_bits_) \ #define TEST_AVAILABLE_ECC(tls_id_, psa_family_, psa_bits_) \
TEST_EQUAL(mbedtls_ssl_get_ecp_group_id_from_tls_id(tls_id_), \ TEST_EQUAL(mbedtls_ssl_is_tls_id_supported(tls_id_), 1); \
group_id_); \ TEST_EQUAL(mbedtls_ssl_get_tls_id_from_curve_info(psa_family_, psa_bits_), tls_id_); \
TEST_EQUAL(mbedtls_ssl_get_tls_id_from_ecp_group_id(group_id_), \ TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \
tls_id_); \ &psa_type, &psa_bits), PSA_SUCCESS); \
TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \ TEST_EQUAL(psa_family_, PSA_KEY_TYPE_ECC_GET_FAMILY(psa_type)); \
&psa_type, &psa_bits), PSA_SUCCESS); \
TEST_EQUAL(psa_family_, PSA_KEY_TYPE_ECC_GET_FAMILY(psa_type)); \
TEST_EQUAL(psa_bits_, psa_bits); TEST_EQUAL(psa_bits_, psa_bits);
#define TEST_UNAVAILABLE_ECC(tls_id_, group_id_, psa_family_, psa_bits_) \ #define TEST_UNAVAILABLE_ECC(tls_id_, psa_family_, psa_bits_) \
TEST_EQUAL(mbedtls_ssl_get_ecp_group_id_from_tls_id(tls_id_), \ TEST_EQUAL(mbedtls_ssl_is_tls_id_supported(tls_id_), 0); \
MBEDTLS_ECP_DP_NONE); \ TEST_EQUAL(mbedtls_ssl_get_tls_id_from_curve_info(psa_family_, psa_bits_), 0); \
TEST_EQUAL(mbedtls_ssl_get_tls_id_from_ecp_group_id(group_id_), \ TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \
0); \ &psa_type, &psa_bits), \
TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \
&psa_type, &psa_bits), \
PSA_ERROR_NOT_SUPPORTED); PSA_ERROR_NOT_SUPPORTED);
/** /**

36
tests/suites/test_suite_ssl.function
View File

@ -4570,49 +4570,49 @@ void elliptic_curve_get_properties()
MD_OR_USE_PSA_INIT(); MD_OR_USE_PSA_INIT();
#if defined(PSA_WANT_ECC_SECP_R1_521) #if defined(PSA_WANT_ECC_SECP_R1_521)
TEST_AVAILABLE_ECC(25, MBEDTLS_ECP_DP_SECP521R1, PSA_ECC_FAMILY_SECP_R1, 521); TEST_AVAILABLE_ECC(25, PSA_ECC_FAMILY_SECP_R1, 521);
#else #else
TEST_UNAVAILABLE_ECC(25, MBEDTLS_ECP_DP_SECP521R1, PSA_ECC_FAMILY_SECP_R1, 521); TEST_UNAVAILABLE_ECC(25, PSA_ECC_FAMILY_SECP_R1, 521);
#endif #endif
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512) #if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
TEST_AVAILABLE_ECC(28, MBEDTLS_ECP_DP_BP512R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 512); TEST_AVAILABLE_ECC(28, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 512);
#else #else
TEST_UNAVAILABLE_ECC(28, MBEDTLS_ECP_DP_BP512R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 512); TEST_UNAVAILABLE_ECC(28, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 512);
#endif #endif
#if defined(PSA_WANT_ECC_SECP_R1_384) #if defined(PSA_WANT_ECC_SECP_R1_384)
TEST_AVAILABLE_ECC(24, MBEDTLS_ECP_DP_SECP384R1, PSA_ECC_FAMILY_SECP_R1, 384); TEST_AVAILABLE_ECC(24, PSA_ECC_FAMILY_SECP_R1, 384);
#else #else
TEST_UNAVAILABLE_ECC(24, MBEDTLS_ECP_DP_SECP384R1, PSA_ECC_FAMILY_SECP_R1, 384); TEST_UNAVAILABLE_ECC(24, PSA_ECC_FAMILY_SECP_R1, 384);
#endif #endif
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384) #if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
TEST_AVAILABLE_ECC(27, MBEDTLS_ECP_DP_BP384R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 384); TEST_AVAILABLE_ECC(27, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 384);
#else #else
TEST_UNAVAILABLE_ECC(27, MBEDTLS_ECP_DP_BP384R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 384); TEST_UNAVAILABLE_ECC(27, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 384);
#endif #endif
#if defined(PSA_WANT_ECC_SECP_R1_256) #if defined(PSA_WANT_ECC_SECP_R1_256)
TEST_AVAILABLE_ECC(23, MBEDTLS_ECP_DP_SECP256R1, PSA_ECC_FAMILY_SECP_R1, 256); TEST_AVAILABLE_ECC(23, PSA_ECC_FAMILY_SECP_R1, 256);
#else #else
TEST_UNAVAILABLE_ECC(23, MBEDTLS_ECP_DP_SECP256R1, PSA_ECC_FAMILY_SECP_R1, 256); TEST_UNAVAILABLE_ECC(23, PSA_ECC_FAMILY_SECP_R1, 256);
#endif #endif
#if defined(PSA_WANT_ECC_SECP_K1_256) #if defined(PSA_WANT_ECC_SECP_K1_256)
TEST_AVAILABLE_ECC(22, MBEDTLS_ECP_DP_SECP256K1, PSA_ECC_FAMILY_SECP_K1, 256); TEST_AVAILABLE_ECC(22, PSA_ECC_FAMILY_SECP_K1, 256);
#else #else
TEST_UNAVAILABLE_ECC(22, MBEDTLS_ECP_DP_SECP256K1, PSA_ECC_FAMILY_SECP_K1, 256); TEST_UNAVAILABLE_ECC(22, PSA_ECC_FAMILY_SECP_K1, 256);
#endif #endif
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256) #if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
TEST_AVAILABLE_ECC(26, MBEDTLS_ECP_DP_BP256R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 256); TEST_AVAILABLE_ECC(26, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 256);
#else #else
TEST_UNAVAILABLE_ECC(26, MBEDTLS_ECP_DP_BP256R1, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 256); TEST_UNAVAILABLE_ECC(26, PSA_ECC_FAMILY_BRAINPOOL_P_R1, 256);
#endif #endif
#if defined(PSA_WANT_ECC_MONTGOMERY_255) #if defined(PSA_WANT_ECC_MONTGOMERY_255)
TEST_AVAILABLE_ECC(29, MBEDTLS_ECP_DP_CURVE25519, PSA_ECC_FAMILY_MONTGOMERY, 255); TEST_AVAILABLE_ECC(29, PSA_ECC_FAMILY_MONTGOMERY, 255);
#else #else
TEST_UNAVAILABLE_ECC(29, MBEDTLS_ECP_DP_CURVE25519, PSA_ECC_FAMILY_MONTGOMERY, 255); TEST_UNAVAILABLE_ECC(29, PSA_ECC_FAMILY_MONTGOMERY, 255);
#endif #endif
#if defined(PSA_WANT_ECC_MONTGOMERY_448) #if defined(PSA_WANT_ECC_MONTGOMERY_448)
TEST_AVAILABLE_ECC(30, MBEDTLS_ECP_DP_CURVE448, PSA_ECC_FAMILY_MONTGOMERY, 448); TEST_AVAILABLE_ECC(30, PSA_ECC_FAMILY_MONTGOMERY, 448);
#else #else
TEST_UNAVAILABLE_ECC(30, MBEDTLS_ECP_DP_CURVE448, PSA_ECC_FAMILY_MONTGOMERY, 448); TEST_UNAVAILABLE_ECC(30, PSA_ECC_FAMILY_MONTGOMERY, 448);
#endif #endif
goto exit; goto exit;
exit: exit: