commit f9ee633d33368ce9414c89dd9a0d774737ffa518
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Apr 11 21:22:52 2019 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Apr 11 21:22:52 2019 +0200
tree cdb7b94987f6d6a8133a6fe73adb8d0c2f74ff14
parent 1e2730b9b123cbb8e1ec7b608a289543485070ed

Fix confusion between HMAC algorithm and the corresponding hash

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index f6b034e..149d135 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -4052,7 +4052,7 @@
     psa_status_t status;
     status = psa_hmac_setup_internal( &hkdf->hmac,
                                       salt, salt_length,
-                                      PSA_ALG_HMAC_GET_HASH( hash_alg ) );
+                                      hash_alg );
     if( status != PSA_SUCCESS )
         return( status );
     status = psa_hash_update( &hkdf->hmac.hash_ctx, secret, secret_length );
@@ -4403,7 +4403,7 @@
             {
                 status = psa_hmac_setup_internal( &hkdf->hmac,
                                                   NULL, 0,
-                                                  PSA_ALG_HMAC( hash_alg ) );
+                                                  hash_alg );
                 if( status != PSA_SUCCESS )
                     return( status );
                 hkdf->state = HKDF_STATE_STARTED;