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

move overflow inside loop

Browse source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-01-20 16:28:27 +08:00
parent 8afd6e4308
commit a68dca24ee
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
library/ssl_tls.c
View file

@ -3161,27 +3161,34 @@ 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 = 0;
size_t sig_algs_len_per_hash = 0;
uint16_t *p; uint16_t *p;
#if defined(MBEDTLS_ECDSA_C)
sig_algs_len_per_hash += sizeof( uint16_t );
#endif
#if defined(MBEDTLS_RSA_C)
sig_algs_len_per_hash += sizeof( uint16_t );
#endif
for( md = sig_hashes; *md != MBEDTLS_MD_NONE; md++ ) for( md = sig_hashes; *md != MBEDTLS_MD_NONE; md++ )
{ {
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 defined(MBEDTLS_ECDSA_C) if( sig_algs_len >
sig_algs_len += sizeof( uint16_t ); ( MBEDTLS_SSL_MAX_SIG_ALG_LIST_LEN - sig_algs_len_per_hash ) )
#endif {
#if defined(MBEDTLS_RSA_C) return( MBEDTLS_ERR_SSL_BAD_CONFIG );
sig_algs_len += sizeof( uint16_t ); }
#endif
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 )
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 + 2 ); ssl->handshake->sig_algs = mbedtls_calloc( 1,
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 );