mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-06 21:40:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reserve end tag space at sig_algs_len init.

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-01-20 16:56:50 +08:00
parent a68dca24ee
commit 600ded7ea5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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 = 0; size_t sig_algs_len = sizeof( uint16_t );
size_t sig_algs_len_per_hash = 0; size_t sig_algs_len_per_hash = 0;
uint16_t *p; uint16_t *p;
@ -3176,7 +3176,8 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl )
if( mbedtls_ssl_hash_from_md_alg( *md ) == MBEDTLS_SSL_HASH_NONE ) if( mbedtls_ssl_hash_from_md_alg( *md ) == MBEDTLS_SSL_HASH_NONE )
continue; continue;
if( sig_algs_len > if( sig_algs_len >
( MBEDTLS_SSL_MAX_SIG_ALG_LIST_LEN - sig_algs_len_per_hash ) ) ( MBEDTLS_SSL_MAX_SIG_ALG_LIST_LEN + sizeof( uint16_t )
- sig_algs_len_per_hash ) )
{ {
return( MBEDTLS_ERR_SSL_BAD_CONFIG ); return( MBEDTLS_ERR_SSL_BAD_CONFIG );
} }
@ -3184,11 +3185,10 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl )
sig_algs_len += sig_algs_len_per_hash; sig_algs_len += sig_algs_len_per_hash;
} }
if( sig_algs_len < MBEDTLS_SSL_MIN_SIG_ALG_LIST_LEN ) if( sig_algs_len < MBEDTLS_SSL_MIN_SIG_ALG_LIST_LEN + sizeof( uint16_t ))
return( MBEDTLS_ERR_SSL_BAD_CONFIG ); return( MBEDTLS_ERR_SSL_BAD_CONFIG );
ssl->handshake->sig_algs = mbedtls_calloc( 1, ssl->handshake->sig_algs = mbedtls_calloc( 1, sig_algs_len );
sig_algs_len + sizeof( uint16_t ) );
if( ssl->handshake->sig_algs == NULL ) if( ssl->handshake->sig_algs == NULL )
return( MBEDTLS_ERR_SSL_ALLOC_FAILED ); return( MBEDTLS_ERR_SSL_ALLOC_FAILED );