yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 15:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make psa_hmac_setup_internal more standalone

Browse source 
Call psa_hash_setup in psa_hmac_setup_internal rather than
psa_mac_init. This makes it easier to use psa_hmac_setup_internal on
its own (for the sake of using HMAC internally inside the library).
This commit is contained in:
Gilles Peskine 2018-07-12 17:07:52 +02:00 committed by itayzafrir
parent b8be288374
commit ff94abdf3a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/psa_crypto.c
View file

@ -1317,8 +1317,9 @@ static psa_status_t psa_mac_init( psa_mac_operation_t *operation,
#if defined(MBEDTLS_MD_C) #if defined(MBEDTLS_MD_C)
if( PSA_ALG_IS_HMAC( operation->alg ) ) if( PSA_ALG_IS_HMAC( operation->alg ) )
{ {
status = psa_hash_setup( &operation->ctx.hmac.hash_ctx, /* We'll set up the hash operation later in psa_hmac_setup_internal. */
PSA_ALG_HMAC_HASH( alg ) ); operation->ctx.hmac.hash_ctx.alg = 0;
status = PSA_SUCCESS;
} }
else else
#endif /* MBEDTLS_MD_C */ #endif /* MBEDTLS_MD_C */
@ -1423,8 +1424,10 @@ 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 );
/* The hash was started earlier in psa_mac_init. */
if( key_length > block_size ) if( key_length > block_size )
{ {
status = psa_hash_update( &hmac->hash_ctx, key, key_length ); status = psa_hash_update( &hmac->hash_ctx, key, key_length );