lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

fix various issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu
2022-05-05 11:14:19 +08:00
parent b0ac10b4a8
commit 6a2cd9ebf5
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/ssl_misc.h
View File

@ -586,7 +586,7 @@ struct mbedtls_ssl_handshake_params
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
int tls13_kex_modes; /*!< key exchange modes for TLS 1.3 */ int tls13_kex_modes; /*!< key exchange modes for TLS 1.3 */
/* Number of HelloRetryRequest messages received/sent from the server. */ /** Number of HelloRetryRequest messages received/sent from/to the server. */
int hello_retry_request_count; int hello_retry_request_count;
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
/** selected_group of key_share extension in HelloRetryRequest message. */ /** selected_group of key_share extension in HelloRetryRequest message. */

15
library/ssl_tls13_server.c
View File

@ -1380,7 +1380,7 @@ cleanup:
static int ssl_tls13_write_hello_retry_request_coordinate( static int ssl_tls13_write_hello_retry_request_coordinate(
mbedtls_ssl_context *ssl ) mbedtls_ssl_context *ssl )
{ {
int ret; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
if( ssl->handshake->hello_retry_request_count > 0 ) if( ssl->handshake->hello_retry_request_count > 0 )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "Too many HRRs" ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "Too many HRRs" ) );
@ -1404,7 +1404,7 @@ static int ssl_tls13_write_hello_retry_request_coordinate(
static int ssl_tls13_write_hello_retry_request( mbedtls_ssl_context *ssl ) static int ssl_tls13_write_hello_retry_request( mbedtls_ssl_context *ssl )
{ {
int ret; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
unsigned char *buf; unsigned char *buf;
size_t buf_len, msg_len; size_t buf_len, msg_len;
@ -1454,9 +1454,7 @@ int mbedtls_ssl_tls13_handshake_server_step( mbedtls_ssl_context *ssl )
{ {
/* start state */ /* start state */
case MBEDTLS_SSL_HELLO_REQUEST: case MBEDTLS_SSL_HELLO_REQUEST:
ssl->handshake->hello_retry_request_count = 0;
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_CLIENT_HELLO ); mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_CLIENT_HELLO );
ret = 0; ret = 0;
break; break;
@ -1472,7 +1470,6 @@ int mbedtls_ssl_tls13_handshake_server_step( mbedtls_ssl_context *ssl )
ret = ssl_tls13_write_server_hello( ssl ); ret = ssl_tls13_write_server_hello( ssl );
break; break;
<<<<<<< HEAD
case MBEDTLS_SSL_ENCRYPTED_EXTENSIONS: case MBEDTLS_SSL_ENCRYPTED_EXTENSIONS:
ret = ssl_tls13_write_encrypted_extensions( ssl ); ret = ssl_tls13_write_encrypted_extensions( ssl );
if( ret != 0 ) if( ret != 0 )
@ -1480,10 +1477,14 @@ int mbedtls_ssl_tls13_handshake_server_step( mbedtls_ssl_context *ssl )
MBEDTLS_SSL_DEBUG_RET( 1, "ssl_tls13_write_encrypted_extensions", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "ssl_tls13_write_encrypted_extensions", ret );
return( ret ); return( ret );
} }
=======
case MBEDTLS_SSL_HELLO_RETRY_REQUEST: case MBEDTLS_SSL_HELLO_RETRY_REQUEST:
ret = ssl_tls13_write_hello_retry_request( ssl ); ret = ssl_tls13_write_hello_retry_request( ssl );
>>>>>>> tls13:hrr:add empty frame work if( ret != 0 )
{
MBEDTLS_SSL_DEBUG_RET( 1, "ssl_tls13_write_hello_retry_request", ret );
return( ret );
}
break; break;
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)