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

library: replace mbedtls_ssl_get_tls_id_from_ecp_group_id

Browse Source 
Instead of retrieving the TLS ID using 'mbedtls_ecp_group_id', which
creates a dependency on the (now tf-psa-crypto private) 'ecp.h' header,
use PSA info to get the same result. Therefore rename the function as
'mbedtls_ssl_get_tls_id_from_curve_info'.

This new function has basically the opposite behavior than
'mbedtls_ssl_get_psa_curve_info_from_tls_id'.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2026-07-07 14:06:31 +02:00
parent cac52a43c9
commit 8a23cf2f14
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/ssl_misc.h
View File

@ -1536,13 +1536,14 @@ int mbedtls_ssl_get_psa_curve_info_from_tls_id(uint16_t tls_id,
int mbedtls_ssl_is_tls_id_supported(uint16_t tls_id); int mbedtls_ssl_is_tls_id_supported(uint16_t tls_id);
/** /**
* \brief Return TLS ID for the specified \c mbedtls_ecp_group_id. * \brief Return TLS ID for the specified curve.
* *
* \param grp_id The \c mbedtls_ecp_group_id ID to look for * \param family The \c psa_ecc_family_t for the TLS ID to look for.
* \return Proper TLS ID if the \c mbedtls_ecp_group_id is supported, * \param bits The bit size for the TLS ID to look for.
* \return Proper TLS ID if the specified EC group is supported,
* or 0 otherwise * or 0 otherwise
*/ */
uint16_t mbedtls_ssl_get_tls_id_from_ecp_group_id(mbedtls_ecp_group_id grp_id); uint16_t mbedtls_ssl_get_tls_id_from_curve_info(psa_ecc_family_t family, size_t bits);
#if defined(MBEDTLS_DEBUG_C) #if defined(MBEDTLS_DEBUG_C)
/** /**

8
library/ssl_tls.c
View File

@ -5876,11 +5876,11 @@ int mbedtls_ssl_is_tls_id_supported(uint16_t tls_id)
return 0; return 0;
} }
uint16_t mbedtls_ssl_get_tls_id_from_ecp_group_id(mbedtls_ecp_group_id grp_id) uint16_t mbedtls_ssl_get_tls_id_from_curve_info(psa_ecc_family_t family, size_t bits)
{ {
for (int i = 0; tls_id_match_table[i].ecp_group_id != MBEDTLS_ECP_DP_NONE; for (int i = 0; tls_id_match_table[i].tls_id != 0; i++) {
i++) { if ((tls_id_match_table[i].psa_family == family) &&
if (tls_id_match_table[i].ecp_group_id == grp_id) { (tls_id_match_table[i].bits == bits)) {
return tls_id_match_table[i].tls_id; return tls_id_match_table[i].tls_id;
} }
} }

3
library/ssl_tls12_client.c
View File

@ -1934,8 +1934,7 @@ start_processing:
MBEDTLS_SSL_CHK_BUF_READ_PTR(p, end, 3); MBEDTLS_SSL_CHK_BUF_READ_PTR(p, end, 3);
uint16_t read_tls_id = MBEDTLS_GET_UINT16_BE(p, 1); uint16_t read_tls_id = MBEDTLS_GET_UINT16_BE(p, 1);
uint16_t exp_tls_id = mbedtls_ssl_get_tls_id_from_ecp_group_id( uint16_t exp_tls_id = mbedtls_ssl_get_tls_id_from_curve_info(PSA_ECC_FAMILY_SECP_R1, 256);
MBEDTLS_ECP_DP_SECP256R1);
if (exp_tls_id == 0) { if (exp_tls_id == 0) {
return MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE; return MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;

3
library/ssl_tls12_server.c
View File

@ -2497,8 +2497,7 @@ static int ssl_prepare_server_key_exchange(mbedtls_ssl_context *ssl,
* However since we only support secp256r1 for now, we hardcode its * However since we only support secp256r1 for now, we hardcode its
* TLS ID here * TLS ID here
*/ */
uint16_t tls_id = mbedtls_ssl_get_tls_id_from_ecp_group_id( uint16_t tls_id = mbedtls_ssl_get_tls_id_from_curve_info(PSA_ECC_FAMILY_SECP_R1, 256);
MBEDTLS_ECP_DP_SECP256R1);
if (tls_id == 0) { if (tls_id == 0) {
return MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE; return MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
} }