lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Add signature algorithm length check

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu
2022-01-19 10:36:30 +08:00
parent a69269a711
commit 4131ec1260
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/ssl_misc.h
View File

@ -256,8 +256,11 @@
: ( MBEDTLS_SSL_IN_CONTENT_LEN ) \ : ( MBEDTLS_SSL_IN_CONTENT_LEN ) \
) )
/* Maximum size in bytes of list in sig-hash algorithm ext., RFC 5246 */ /* Maximum size in bytes of list in signature algorithms ext., RFC 5246/8446 */
#define MBEDTLS_SSL_MAX_SIG_HASH_ALG_LIST_LEN 65534 #define MBEDTLS_SSL_MAX_SIG_ALG_LIST_LEN 65534
/* Minimue size in bytes of list in signature algorithms ext., RFC 5246/8446 */
#define MBEDTLS_SSL_MIN_SIG_ALG_LIST_LEN 2
/* 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

9
library/ssl_tls.c
View File

@ -3160,7 +3160,7 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl )
{ {
const int *md; const int *md;
const int *sig_hashes = ssl->conf->sig_hashes; const int *sig_hashes = ssl->conf->sig_hashes;
size_t sig_algs_len = sizeof( uint16_t ); size_t sig_algs_len = 0;
uint16_t *p; uint16_t *p;
for( md = sig_hashes; *md != MBEDTLS_MD_NONE; md++ ) for( md = sig_hashes; *md != MBEDTLS_MD_NONE; md++ )
@ -3175,10 +3175,13 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl )
#endif #endif
} }
if( sig_algs_len == sizeof( uint16_t ) ) if( sig_algs_len < MBEDTLS_SSL_MIN_SIG_ALG_LIST_LEN ||
sig_algs_len > MBEDTLS_SSL_MAX_SIG_ALG_LIST_LEN )
{
return( MBEDTLS_ERR_SSL_BAD_CONFIG ); return( MBEDTLS_ERR_SSL_BAD_CONFIG );
}
ssl->handshake->sig_algs = mbedtls_calloc( 1, sig_algs_len ); ssl->handshake->sig_algs = mbedtls_calloc( 1, sig_algs_len + 2 );
if( ssl->handshake->sig_algs == NULL ) if( ssl->handshake->sig_algs == NULL )
return( MBEDTLS_ERR_SSL_ALLOC_FAILED ); return( MBEDTLS_ERR_SSL_ALLOC_FAILED );