From 6402c35ecafa72f6e1fe37673752b755dfb4d8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 14 Jan 2025 12:23:56 +0100 Subject: [PATCH] =?UTF-8?q?Remove=20internal=20helper=20mbedtls=5Fssl=5Fge?= =?UTF-8?q?t=5Fgroups()=20Signed-off-by:=20Manuel=20P=C3=A9gouri=C3=A9-Gon?= =?UTF-8?q?nard=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/ssl_client.c | 2 +- library/ssl_misc.h | 12 +----------- library/ssl_tls.c | 2 +- library/ssl_tls12_server.c | 2 +- library/ssl_tls13_client.c | 4 ++-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/library/ssl_client.c b/library/ssl_client.c index 823708173c..be4d621d6c 100644 --- a/library/ssl_client.c +++ b/library/ssl_client.c @@ -222,7 +222,7 @@ static int ssl_write_supported_groups_ext(mbedtls_ssl_context *ssl, unsigned char *p = buf; unsigned char *named_group_list; /* Start of named_group_list */ size_t named_group_list_len; /* Length of named_group_list */ - const uint16_t *group_list = mbedtls_ssl_get_groups(ssl); + const uint16_t *group_list = ssl->conf->group_list; *out_len = 0; diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 4d6ac2b6ec..9bdd104254 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -2267,16 +2267,6 @@ int mbedtls_ssl_get_handshake_transcript(mbedtls_ssl_context *ssl, size_t dst_len, size_t *olen); -/* - * Return supported groups. - * - * In future, invocations can be changed to ssl->conf->group_list. - */ -static inline const void *mbedtls_ssl_get_groups(const mbedtls_ssl_context *ssl) -{ - return ssl->conf->group_list; -} - /* * Helper functions for NamedGroup. */ @@ -2319,7 +2309,7 @@ static inline int mbedtls_ssl_tls13_named_group_is_ffdh(uint16_t named_group) static inline int mbedtls_ssl_named_group_is_offered( const mbedtls_ssl_context *ssl, uint16_t named_group) { - const uint16_t *group_list = mbedtls_ssl_get_groups(ssl); + const uint16_t *group_list = ssl->conf->group_list; if (group_list == NULL) { return 0; diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 9ea58330be..159f2c3205 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -6119,7 +6119,7 @@ unsigned char mbedtls_ssl_hash_from_md_alg(int md) */ int mbedtls_ssl_check_curve_tls_id(const mbedtls_ssl_context *ssl, uint16_t tls_id) { - const uint16_t *group_list = mbedtls_ssl_get_groups(ssl); + const uint16_t *group_list = ssl->conf->group_list; if (group_list == NULL) { return -1; diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c index 9e7c52c5e6..191031eac6 100644 --- a/library/ssl_tls12_server.c +++ b/library/ssl_tls12_server.c @@ -2966,7 +2966,7 @@ static int ssl_prepare_server_key_exchange(mbedtls_ssl_context *ssl, * } ServerECDHParams; */ uint16_t *curr_tls_id = ssl->handshake->curves_tls_id; - const uint16_t *group_list = mbedtls_ssl_get_groups(ssl); + const uint16_t *group_list = ssl->conf->group_list; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; size_t len = 0; diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index 919db7d465..9386801512 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -216,7 +216,7 @@ static int ssl_tls13_get_default_group_id(mbedtls_ssl_context *ssl, #if defined(PSA_WANT_ALG_ECDH) || defined(PSA_WANT_ALG_FFDH) - const uint16_t *group_list = mbedtls_ssl_get_groups(ssl); + const uint16_t *group_list = ssl->conf->group_list; /* Pick first available ECDHE group compatible with TLS 1.3 */ if (group_list == NULL) { return MBEDTLS_ERR_SSL_BAD_CONFIG; @@ -382,7 +382,7 @@ static int ssl_tls13_parse_hrr_key_share_ext(mbedtls_ssl_context *ssl, int selected_group; int found = 0; - const uint16_t *group_list = mbedtls_ssl_get_groups(ssl); + const uint16_t *group_list = ssl->conf->group_list; if (group_list == NULL) { return MBEDTLS_ERR_SSL_BAD_CONFIG; }