commit f21639fc2fe67a7e2ad6a70c7f1377c1b6a76053
author gabor-mezei-arm <gabor.mezei@arm.com> Wed Aug 19 14:03:06 2020 +0200
committer gabor-mezei-arm <gabor.mezei@arm.com> Wed Sep 09 15:17:11 2020 +0200
tree 94063433e54ed44de04fae61e611e631d091f599
parent 5feba8dae17cb590811ccaf72facd4a4a32c5ae3

Zeroize internal buffers and variables in MD hashes

Zeroising of local buffers and variables which are used for calculations in
mbedtls_internal_md*_process() and mbedtls_internal_ripemd160_process()
functions to erase sensitive data from memory.
Checked all function for possible missing zeroisation in MD.

Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>

ChangeLog.d/zeroizations_of_sensitive_data_in_PKCS5_and_SHA.txt

diff --git a/ChangeLog.d/zeroizations_of_sensitive_data_in_PKCS5_and_SHA.txt b/ChangeLog.d/zeroizations_of_sensitive_data_in_PKCS5_and_SHA.txt
index f844561..320bb0e 100644
--- a/ChangeLog.d/zeroizations_of_sensitive_data_in_PKCS5_and_SHA.txt
+++ b/ChangeLog.d/zeroizations_of_sensitive_data_in_PKCS5_and_SHA.txt
@@ -1,5 +1,6 @@
 Security
    * Zeroising of local buffers and variables which are used for calculations
-     in mbedtls_pkcs5_pbkdf2_hmac() and mbedtls_internal_sha*_process()
+     in mbedtls_pkcs5_pbkdf2_hmac(), mbedtls_internal_sha*_process(),
+     mbedtls_internal_md*_process() and mbedtls_internal_ripemd160_process()
      functions to erase sensitive data from memory. Reported by
      Johan Malmgren and Johan Uppman Bruce from Sectra.

library/md2.c

diff --git a/library/md2.c b/library/md2.c
index cbdaaab..fdcb630 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -177,6 +177,9 @@
         t  = ctx->cksum[i];
     }
 
+    /* Zeroise variables to clear sensitive data from memory. */
+    mbedtls_platform_zeroize( &t, sizeof( t ) );
+
     return( 0 );
 }
 

library/md4.c

diff --git a/library/md4.c b/library/md4.c
index cb16dce..63bdcec 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -259,6 +259,13 @@
     ctx->state[2] += C;
     ctx->state[3] += D;
 
+    /* Zeroise variables to clear sensitive data from memory. */
+    mbedtls_platform_zeroize( &X, sizeof( X ) );
+    mbedtls_platform_zeroize( &A, sizeof( A ) );
+    mbedtls_platform_zeroize( &B, sizeof( B ) );
+    mbedtls_platform_zeroize( &C, sizeof( C ) );
+    mbedtls_platform_zeroize( &D, sizeof( D ) );
+
     return( 0 );
 }
 

library/md5.c

diff --git a/library/md5.c b/library/md5.c
index fe25925..df783c3 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -265,6 +265,13 @@
     ctx->state[2] += C;
     ctx->state[3] += D;
 
+    /* Zeroise variables to clear sensitive data from memory. */
+    mbedtls_platform_zeroize( &X, sizeof( X ) );
+    mbedtls_platform_zeroize( &A, sizeof( A ) );
+    mbedtls_platform_zeroize( &B, sizeof( B ) );
+    mbedtls_platform_zeroize( &C, sizeof( C ) );
+    mbedtls_platform_zeroize( &D, sizeof( D ) );
+
     return( 0 );
 }
 

library/ripemd160.c

diff --git a/library/ripemd160.c b/library/ripemd160.c
index 0b6efcb..b991b56 100644
--- a/library/ripemd160.c
+++ b/library/ripemd160.c
@@ -328,6 +328,19 @@
     ctx->state[4] = ctx->state[0] + B + Cp;
     ctx->state[0] = C;
 
+    /* Zeroise variables to clear sensitive data from memory. */
+    mbedtls_platform_zeroize( &A, sizeof( A ) );
+    mbedtls_platform_zeroize( &B, sizeof( B ) );
+    mbedtls_platform_zeroize( &C, sizeof( C ) );
+    mbedtls_platform_zeroize( &D, sizeof( D ) );
+    mbedtls_platform_zeroize( &E, sizeof( E ) );
+    mbedtls_platform_zeroize( &Ap, sizeof( Ap ) );
+    mbedtls_platform_zeroize( &Bp, sizeof( Bp ) );
+    mbedtls_platform_zeroize( &Cp, sizeof( Cp ) );
+    mbedtls_platform_zeroize( &Dp, sizeof( Dp ) );
+    mbedtls_platform_zeroize( &Ep, sizeof( Ep ) );
+    mbedtls_platform_zeroize( &X, sizeof( X ) );
+
     return( 0 );
 }