commit c102e3ce4b6652b76bf0ca6520e04e3095a0cf41
author Gilles Peskine <Gilles.Peskine@arm.com> Mon Jun 11 17:38:53 2018 +0200
committer itayzafrir <itay.zafrir@arm.com> Wed Sep 12 16:13:49 2018 +0300
tree 50157aada9929858f7d8798a18e50cb176b93f08
parent e1bc6800cc60a7f1aa337276059fa15ef81b8f15

psa_hmac_start: simplify key_length logic in hash-the-key case

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 794af37..9fb80bb 100755
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1069,7 +1069,6 @@
     unsigned char ipad[PSA_CRYPTO_MD_BLOCK_SIZE];
     unsigned char *opad = operation->ctx.hmac.hmac_ctx;
     size_t i;
-    size_t sum_size = MBEDTLS_MD_MAX_SIZE;
     size_t block_size =
         PSA_HASH_BLOCK_SIZE( ( PSA_ALG_HMAC_HASH( alg ) ) );
     unsigned int digest_size =
@@ -1099,11 +1098,9 @@
         if( status != PSA_SUCCESS )
             return( status );
         status = psa_hash_finish( &operation->ctx.hmac.hash_ctx,
-                                  sum, sum_size, &sum_size);
+                                  sum, sizeof( sum ), &key_length );
         if( status != PSA_SUCCESS )
             return( status );
-
-        key_length = sum_size;
         key_ptr = sum;
     }