TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-05-09 03:04:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

library: ssl: rework macro to define known TLS ID <-> group name list

Browse Source 
- let the macro be an initializer for the array of known TLS IDs, not
  a variable declarator;
- last item's group name is NULL, not an empty string
- change then name of the macro from MBEDTLS_TLS_ID_GROUP_NAME_TABLE to
  MBEDTLS_SSL_IANA_TLS_GROUPS_INFO
- define a new public structure "mbedtls_ssl_iana_tls_group_info_t" to
  hold each element of the table and that can be used the go over the
  list from user code.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
2026-01-27 00:36:17 +01:00
parent c87adb64f2
commit fb317afa9f
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/mbedtls/ssl.h
View File

@@ -3660,14 +3660,24 @@ void mbedtls_ssl_conf_psk_cb(mbedtls_ssl_config *conf,
#endif /* MBEDTLS_SSL_SRV_C */
#endif /* MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED */
/**
*\brief Define a TLS-ID <-> group-name table
/*
* This structure defines the correpondence between IANA's TLS-ID and its
* corresponding group name.
* This is used in macro #MBEDTLS_SSL_IANA_TLS_GROUPS_INFO to define the list
* of known TLS IDs and corresponding group names.
*/
#define MBEDTLS_TLS_ID_GROUP_NAME_TABLE(table_name) \
struct { \
uint16_t tls_id; \
const char *group_name; \
} table_name[] = { \
typedef struct {
uint16_t tls_id;
const char *group_name;
} mbedtls_ssl_iana_tls_group_info_t;
/*
* Initializer for a list of known "TLS ID" <-> "group name".
* Each entry is a structure of type mbedtls_ssl_iana_tls_group_info_t.
* The last entry has 'tls_id = 0' and 'group_name = NULL'.
*/
#define MBEDTLS_SSL_IANA_TLS_GROUPS_INFO \
{ \
{ MBEDTLS_SSL_IANA_TLS_GROUP_X25519, "x25519" }, \
{ MBEDTLS_SSL_IANA_TLS_GROUP_SECP256R1, "secp256r1" }, \
{ MBEDTLS_SSL_IANA_TLS_GROUP_SECP256K1, "secp256k1" }, \
@@ -3682,7 +3692,7 @@ void mbedtls_ssl_conf_psk_cb(mbedtls_ssl_config *conf,
{ MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE4096, "ffdhe4096" }, \
{ MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE6144, "ffdhe6144" }, \
{ MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE8192, "ffdhe8192" }, \
{ MBEDTLS_SSL_IANA_TLS_GROUP_NONE, "" } \
{ MBEDTLS_SSL_IANA_TLS_GROUP_NONE, NULL } \
}
/**

3
library/ssl_tls.c
View File

@@ -5850,7 +5850,8 @@ uint16_t mbedtls_ssl_get_tls_id_from_ecp_group_id(mbedtls_ecp_group_id grp_id)
}
#if defined(MBEDTLS_DEBUG_C)
static MBEDTLS_TLS_ID_GROUP_NAME_TABLE(tls_id_curve_name_table);
static
mbedtls_ssl_iana_tls_group_info_t tls_id_curve_name_table[] = MBEDTLS_SSL_IANA_TLS_GROUPS_INFO;
const char *mbedtls_ssl_get_curve_name_from_tls_id(uint16_t tls_id)
{

12
tests/suites/test_suite_ssl.function
View File

@@ -3596,13 +3596,17 @@ exit:;
/* BEGIN_CASE */
void test_mbedtls_tls_id_group_name_table(int group_id, char *group_name)
{
MBEDTLS_TLS_ID_GROUP_NAME_TABLE(test_table);
mbedtls_ssl_iana_tls_group_info_t test_table[] = MBEDTLS_SSL_IANA_TLS_GROUPS_INFO;
mbedtls_ssl_iana_tls_group_info_t *item;
const char *table_name = NULL;
size_t table_name_len = 0;
for (size_t i = 0; i < ARRAY_LENGTH(test_table); i++) {
if (test_table[i].tls_id == group_id) {
table_name = test_table[i].group_name;
/* Ensure that the list includes at least 1 valid entry. */
TEST_ASSERT(test_table[0].tls_id != MBEDTLS_SSL_IANA_TLS_GROUP_NONE);
for (item = &test_table[0]; item->tls_id != MBEDTLS_SSL_IANA_TLS_GROUP_NONE; item++) {
if (item->tls_id == group_id) {
table_name = item->group_name;
table_name_len = strlen(table_name);
}
}