yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update mbedtls_ssl_handshake_free()

Browse source 
Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
This commit is contained in:
Xiaofei Bai 2022-01-28 08:52:13 +00:00
parent f5b4d25cfa
commit 6d42bb430c
3 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/ssl_misc.h
View file

@ -267,7 +267,7 @@
/* Maximum size in bytes of list in supported elliptic curve ext., RFC 4492 */ /* Maximum size in bytes of list in supported elliptic curve ext., RFC 4492 */
#define MBEDTLS_SSL_MAX_CURVE_LIST_LEN 65535 #define MBEDTLS_SSL_MAX_CURVE_LIST_LEN 65535
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) #if defined(MBEDTLS_X509_CRT_PARSE_C)
#define MBEDTLS_RECEIVED_SIG_ALGS_SIZE 20 #define MBEDTLS_RECEIVED_SIG_ALGS_SIZE 20
#endif #endif

9
library/ssl_tls.c
View file

@ -5579,7 +5579,14 @@ void mbedtls_ssl_handshake_free( mbedtls_ssl_context *ssl )
mbedtls_free( (void*) handshake->sig_algs ); mbedtls_free( (void*) handshake->sig_algs );
handshake->sig_algs = NULL; handshake->sig_algs = NULL;
#endif /* MBEDTLS_DEPRECATED_REMOVED */ #endif /* MBEDTLS_DEPRECATED_REMOVED */
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
if( ssl->handshake->certificate_request_context )
{
mbedtls_free( (void*) handshake->certificate_request_context );
}
handshake->certificate_request_context = NULL;
handshake->certificate_request_context_len = 0;
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */ #endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */
#if defined(MBEDTLS_SSL_ASYNC_PRIVATE) #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)

31
library/ssl_tls13_client.c
View file

@ -1473,7 +1473,7 @@ static int ssl_tls13_parse_certificate_request( mbedtls_ssl_context *ssl,
mbedtls_ssl_handshake_params *handshake = ssl->handshake; mbedtls_ssl_handshake_params *handshake = ssl->handshake;
handshake->certificate_request_context = handshake->certificate_request_context =
mbedtls_calloc( 1, certificate_request_context_len); mbedtls_calloc( 1, certificate_request_context_len );
if( handshake->certificate_request_context == NULL ) if( handshake->certificate_request_context == NULL )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) );
@ -1523,7 +1523,11 @@ static int ssl_tls13_parse_certificate_request( mbedtls_ssl_context *ssl,
{ {
MBEDTLS_SSL_DEBUG_MSG( 3, MBEDTLS_SSL_DEBUG_MSG( 3,
( "Duplicate signature algorithms extensions found" ) ); ( "Duplicate signature algorithms extensions found" ) );
goto error; MBEDTLS_SSL_PEND_FATAL_ALERT(
MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR,
MBEDTLS_ERR_SSL_DECODE_ERROR );
mbedtls_ssl_handshake_free( ssl );
return( MBEDTLS_ERR_SSL_DECODE_ERROR );
} }
break; break;
@ -1541,24 +1545,27 @@ static int ssl_tls13_parse_certificate_request( mbedtls_ssl_context *ssl,
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, MBEDTLS_SSL_DEBUG_MSG( 1,
( "Signature algorithms extension length misaligned" ) ); ( "Signature algorithms extension length misaligned" ) );
goto error; MBEDTLS_SSL_PEND_FATAL_ALERT( MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR,
MBEDTLS_ERR_SSL_DECODE_ERROR );
mbedtls_ssl_handshake_free( ssl );
return( MBEDTLS_ERR_SSL_DECODE_ERROR );
} }
/* Check that we found signature algorithms extension */ /* Check that we found signature algorithms extension */
if( ! sig_alg_ext_found ) if( ! sig_alg_ext_found )
{ {
MBEDTLS_SSL_DEBUG_MSG( 3, MBEDTLS_SSL_DEBUG_MSG( 3,
( "no signature algorithms extension found" ) ); ( "no signature algorithms extension found" ) );
goto error; MBEDTLS_SSL_DEBUG_MSG( 1,
( "Signature algorithms extension length misaligned" ) );
MBEDTLS_SSL_PEND_FATAL_ALERT( MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR,
MBEDTLS_ERR_SSL_DECODE_ERROR );
mbedtls_ssl_handshake_free( ssl );
return( MBEDTLS_ERR_SSL_DECODE_ERROR );
} }
ssl->client_auth = 1; ssl->client_auth = 1;
return( 0 ); return( 0 );
error:
MBEDTLS_SSL_PEND_FATAL_ALERT( MBEDTLS_SSL_ALERT_MSG_DECODE_ERROR,
MBEDTLS_ERR_SSL_DECODE_ERROR );
mbedtls_free( ssl->handshake->certificate_request_context );
return( MBEDTLS_ERR_SSL_DECODE_ERROR );
} }
/* /*