espressif/mbedtls
1
0
Fork 0
mirror of https://github.com/espressif/mbedtls.git synced 2025-05-09 19:31:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of legacy_compression_methods in ssl_tls13_parse_client_hello()

Browse Source 
Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>
This commit is contained in:
Waleed Elmelegy 2024-06-19 15:09:48 +01:00
parent 41e0cdf8c1
commit 566ed54d6e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/ssl_tls13_server.c
View File

@ -1265,8 +1265,6 @@ static int ssl_tls13_parse_client_hello(mbedtls_ssl_context *ssl,
mbedtls_ssl_handshake_params *handshake = ssl->handshake; mbedtls_ssl_handshake_params *handshake = ssl->handshake;
int hrr_required = 0; int hrr_required = 0;
int no_usable_share_for_key_agreement = 0; int no_usable_share_for_key_agreement = 0;
unsigned char legacy_compression_methods_len;
unsigned char legacy_compression_methods;
#if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED) #if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED)
int got_psk = 0; int got_psk = 0;
@ -1364,19 +1362,17 @@ static int ssl_tls13_parse_client_hello(mbedtls_ssl_context *ssl,
p += cipher_suites_len; p += cipher_suites_len;
cipher_suites_end = p; cipher_suites_end = p;
legacy_compression_methods_len = *p; /* Check if we have enough data to for legacy_compression_methods
legacy_compression_methods = *(p+1); * and a length byte.
*/
if (legacy_compression_methods_len != 1 || legacy_compression_methods != 0) { MBEDTLS_SSL_CHK_BUF_READ_PTR(p, end, 1 + p[0]);
return SSL_CLIENT_HELLO_TLS1_2;
}
/* /*
* Search for the supported versions extension and parse it to determine * Search for the supported versions extension and parse it to determine
* if the client supports TLS 1.3. * if the client supports TLS 1.3.
*/ */
ret = mbedtls_ssl_tls13_is_supported_versions_ext_present_in_exts( ret = mbedtls_ssl_tls13_is_supported_versions_ext_present_in_exts(
ssl, p + 2, end, ssl, p + 1 + p[0], end,
&supported_versions_data, &supported_versions_data_end); &supported_versions_data, &supported_versions_data_end);
if (ret < 0) { if (ret < 0) {
MBEDTLS_SSL_DEBUG_RET(1, MBEDTLS_SSL_DEBUG_RET(1,