From a9f9335ee9a9758001bf7e51641642134b997033 Mon Sep 17 00:00:00 2001 From: Przemek Stekiel Date: Mon, 4 Apr 2022 17:32:30 +0200 Subject: [PATCH 1/2] ssl_tls13_generate_and_write_ecdh_key_exchange(): remove redundant check This check can be removed as if the buffer is too small for the key, then export will fail. Signed-off-by: Przemek Stekiel --- library/ssl_tls13_client.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index 3bb308c3a..a9b9b03c1 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -262,12 +262,6 @@ static int ssl_tls13_generate_and_write_ecdh_key_exchange( } - if( own_pubkey_len > (size_t)( end - buf ) ) - { - MBEDTLS_SSL_DEBUG_MSG( 1, ( "No space in the buffer for ECDH public key." ) ); - return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL ); - } - *out_len = own_pubkey_len; return( 0 ); From 8583627ece29fa26c29d8aea088066a97fac7f34 Mon Sep 17 00:00:00 2001 From: Przemek Stekiel Date: Tue, 5 Apr 2022 10:50:53 +0200 Subject: [PATCH 2/2] psa_ssl_status_to_mbedtls: add conversion of PSA_ERROR_BUFFER_TOO_SMALL Signed-off-by: Przemek Stekiel --- library/ssl_misc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 496478715..193f310c3 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -2222,6 +2222,8 @@ static inline int psa_ssl_status_to_mbedtls( psa_status_t status ) return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); case PSA_ERROR_BAD_STATE: return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); + case PSA_ERROR_BUFFER_TOO_SMALL: + return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL ); default: return( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED ); }