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

psa_hmac_setup_internal: fix double call of psa_hash_setup

Browse Source 
In the common case (key no longer than the block size), psa_hash_setup
was being called twice in succession. With current implementations
this is just a small performance loss, but potentially with
alternative implementations this could have lead to a memory leak.
This commit is contained in:
Gilles Peskine 2018-07-17 16:22:47 +02:00 committed by itayzafrir
parent ff94abdf3a
commit 1e6bfdff5e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/psa_crypto.c
View File

@ -1424,12 +1424,11 @@ static psa_status_t psa_hmac_setup_internal( psa_hmac_internal_data *hmac,
if( block_size == 0 ) if( block_size == 0 )
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
status = psa_hash_setup( &hmac->hash_ctx, hash_alg );
if( status != PSA_SUCCESS )
return( status );
if( key_length > block_size ) if( key_length > block_size )
{ {
status = psa_hash_setup( &hmac->hash_ctx, hash_alg );
if( status != PSA_SUCCESS )
goto cleanup;
status = psa_hash_update( &hmac->hash_ctx, key, key_length ); status = psa_hash_update( &hmac->hash_ctx, key, key_length );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
goto cleanup; goto cleanup;