AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix confusion between HMAC algorithm and the corresponding hash

Browse Source
This commit is contained in:
Gilles Peskine 2019-04-11 21:22:52 +02:00
parent 1e2730b9b1
commit f9ee633d33
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/psa_crypto.c
View File

@ -4052,7 +4052,7 @@ static psa_status_t psa_generator_hkdf_setup( psa_hkdf_generator_t *hkdf,
psa_status_t status; psa_status_t status;
status = psa_hmac_setup_internal( &hkdf->hmac, status = psa_hmac_setup_internal( &hkdf->hmac,
salt, salt_length, salt, salt_length,
PSA_ALG_HMAC_GET_HASH( hash_alg ) ); hash_alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
status = psa_hash_update( &hkdf->hmac.hash_ctx, secret, secret_length ); status = psa_hash_update( &hkdf->hmac.hash_ctx, secret, secret_length );
@ -4403,7 +4403,7 @@ static psa_status_t psa_hkdf_input( psa_hkdf_generator_t *hkdf,
{ {
status = psa_hmac_setup_internal( &hkdf->hmac, status = psa_hmac_setup_internal( &hkdf->hmac,
NULL, 0, NULL, 0,
PSA_ALG_HMAC( hash_alg ) ); hash_alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
hkdf->state = HKDF_STATE_STARTED; hkdf->state = HKDF_STATE_STARTED;