commit 99a507ee55e0969ee49c33584f0a6eeaf68c2f4c
author Dave Rodgman <dave.rodgman@arm.com> Tue Nov 22 16:54:54 2022 +0000
committer Dave Rodgman <dave.rodgman@arm.com> Tue Nov 22 17:32:44 2022 +0000
tree 197cbda234b02f6a03d3fb8ef3b0a8b46969af90
parent d22fb73e3ed52812e4c474df148064cd4abb9b71

Use mbedtls_xor in md

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/md.c

diff --git a/library/md.c b/library/md.c
index 8efcf10..9c161a5 100644
--- a/library/md.c
+++ b/library/md.c
@@ -633,7 +633,6 @@
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     unsigned char sum[MBEDTLS_MD_MAX_SIZE];
     unsigned char *ipad, *opad;
-    size_t i;
 
     if( ctx == NULL || ctx->md_info == NULL || ctx->hmac_ctx == NULL )
         return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
@@ -657,11 +656,8 @@
     memset( ipad, 0x36, ctx->md_info->block_size );
     memset( opad, 0x5C, ctx->md_info->block_size );
 
-    for( i = 0; i < keylen; i++ )
-    {
-        ipad[i] = (unsigned char)( ipad[i] ^ key[i] );
-        opad[i] = (unsigned char)( opad[i] ^ key[i] );
-    }
+    mbedtls_xor( ipad, ipad, key, keylen );
+    mbedtls_xor( opad, opad, key, keylen );
 
     if( ( ret = mbedtls_md_starts( ctx ) ) != 0 )
         goto cleanup;