commit c89e209dedbc6abd629791b36882d30918c00690
author Paul Elliott <paul.elliott@arm.com> Thu Dec 02 18:03:12 2021 +0000
committer Paul Elliott <paul.elliott@arm.com> Mon Dec 13 11:14:45 2021 +0000
tree 8929033cd130a775c4342649784fdf8aecebe16e
parent 8d7eef470ba41015e2713d533b5946d0111dc95d

Remove incorrect hashing

Incorrect interpretation of 'empty'

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

library/pkcs12.c

diff --git a/library/pkcs12.c b/library/pkcs12.c
index eadc9a0..cacf7db 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -264,7 +264,6 @@
 
     unsigned char diversifier[128];
     unsigned char salt_block[128], pwd_block[128], hash_block[128];
-    unsigned char empty_string[2] = { 0, 0 };
     unsigned char hash_output[MBEDTLS_MD_MAX_SIZE];
     unsigned char *p;
     unsigned char c;
@@ -331,24 +330,12 @@
             if( ( ret = mbedtls_md_update( &md_ctx, salt_block, v )) != 0 )
                 goto exit;
         }
-        else
-        {
-            if( ( ret = mbedtls_md_update( &md_ctx, empty_string,
-                                           sizeof( empty_string ) )) != 0 )
-                goto exit;
-        }
 
         if( use_password != 0)
         {
             if( ( ret = mbedtls_md_update( &md_ctx, pwd_block, v )) != 0 )
                 goto exit;
         }
-        else
-        {
-            if( ( ret = mbedtls_md_update( &md_ctx, empty_string,
-                                           sizeof( empty_string ) )) != 0 )
-                goto exit;
-        }
 
         if( ( ret = mbedtls_md_finish( &md_ctx, hash_output ) ) != 0 )
             goto exit;