From f3e424057f44e271db2648bc7bb963dcd4f94509 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 7 Jul 2026 14:21:08 +0200 Subject: [PATCH] tests: ssl_helpers: update TEST_AVAILABLE_ECC and TEST_UNAVAILABLE_ECC 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 --- tests/include/test/ssl_helpers.h | 26 +++++++++----------- tests/suites/test_suite_ssl.function | 36 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/tests/include/test/ssl_helpers.h b/tests/include/test/ssl_helpers.h index 21965b0c9a..aa664b07da 100644 --- a/tests/include/test/ssl_helpers.h +++ b/tests/include/test/ssl_helpers.h @@ -727,23 +727,19 @@ int mbedtls_test_get_tls13_ticket( mbedtls_ssl_set_hs_ecjpake_password(&ssl, pwd_string, pwd_len); \ TEST_EQUAL(ret, exp_ret_val) -#define TEST_AVAILABLE_ECC(tls_id_, group_id_, psa_family_, psa_bits_) \ - TEST_EQUAL(mbedtls_ssl_get_ecp_group_id_from_tls_id(tls_id_), \ - group_id_); \ - TEST_EQUAL(mbedtls_ssl_get_tls_id_from_ecp_group_id(group_id_), \ - tls_id_); \ - TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \ - &psa_type, &psa_bits), PSA_SUCCESS); \ - TEST_EQUAL(psa_family_, PSA_KEY_TYPE_ECC_GET_FAMILY(psa_type)); \ +#define TEST_AVAILABLE_ECC(tls_id_, psa_family_, psa_bits_) \ + TEST_EQUAL(mbedtls_ssl_is_tls_id_supported(tls_id_), 1); \ + TEST_EQUAL(mbedtls_ssl_get_tls_id_from_curve_info(psa_family_, psa_bits_), tls_id_); \ + TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \ + &psa_type, &psa_bits), PSA_SUCCESS); \ + TEST_EQUAL(psa_family_, PSA_KEY_TYPE_ECC_GET_FAMILY(psa_type)); \ TEST_EQUAL(psa_bits_, psa_bits); -#define TEST_UNAVAILABLE_ECC(tls_id_, group_id_, psa_family_, psa_bits_) \ - TEST_EQUAL(mbedtls_ssl_get_ecp_group_id_from_tls_id(tls_id_), \ - MBEDTLS_ECP_DP_NONE); \ - TEST_EQUAL(mbedtls_ssl_get_tls_id_from_ecp_group_id(group_id_), \ - 0); \ - TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \ - &psa_type, &psa_bits), \ +#define TEST_UNAVAILABLE_ECC(tls_id_, psa_family_, psa_bits_) \ + TEST_EQUAL(mbedtls_ssl_is_tls_id_supported(tls_id_), 0); \ + TEST_EQUAL(mbedtls_ssl_get_tls_id_from_curve_info(psa_family_, psa_bits_), 0); \ + TEST_EQUAL(mbedtls_ssl_get_psa_curve_info_from_tls_id(tls_id_, \ + &psa_type, &psa_bits), \ PSA_ERROR_NOT_SUPPORTED); /** diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function index c1cf9bab86..8cf30463f7 100644 --- a/tests/suites/test_suite_ssl.function +++ b/tests/suites/test_suite_ssl.function @@ -4570,49 +4570,49 @@ void elliptic_curve_get_properties() MD_OR_USE_PSA_INIT(); #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 - 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 #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 - 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 #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 - 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 #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 - 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 #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 - 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 #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 - 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 #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 - 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 #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 - TEST_UNAVAILABLE_ECC(29, MBEDTLS_ECP_DP_CURVE25519, PSA_ECC_FAMILY_MONTGOMERY, 255); + TEST_UNAVAILABLE_ECC(29, PSA_ECC_FAMILY_MONTGOMERY, 255); #endif #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 - TEST_UNAVAILABLE_ECC(30, MBEDTLS_ECP_DP_CURVE448, PSA_ECC_FAMILY_MONTGOMERY, 448); + TEST_UNAVAILABLE_ECC(30, PSA_ECC_FAMILY_MONTGOMERY, 448); #endif goto exit; exit: