commit 84b8fc8213503caa34e3f1bf39fd7e58eabcc0f9
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Nov 28 20:07:20 2019 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Jan 30 12:27:14 2020 +0100
tree ad5f2d2bb066df702bc3dfb321c5f47b154013f7
parent 7b8efaffaa306407bf7ab0a2e9c9685dd1f4f353

Use psa_hash_compute in psa_hmac_setup_internal

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 9816668..84054a7 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -2737,14 +2737,8 @@
 
     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 );
-        if( status != PSA_SUCCESS )
-            goto cleanup;
-        status = psa_hash_finish( &hmac->hash_ctx,
-                                  ipad, sizeof( ipad ), &key_length );
+        status = psa_hash_compute( hash_alg, key, key_length,
+                                   ipad, sizeof( ipad ), &key_length );
         if( status != PSA_SUCCESS )
             goto cleanup;
     }