commit 346177255931fb1e3514e124a1f598715a5fe92d
author Paul Bakker <p.j.bakker@polarssl.org> Fri Jun 13 17:20:13 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Sat Jun 14 16:46:03 2014 +0200
tree da658994944be861b8b2a1001c9b759976276891
parent bbcb1ce7030575d708700ca205800e847d846402

Introduce polarssl_zeroize() instead of memset() for zeroization

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index b3d3b1d..cd5be92 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -62,6 +62,11 @@
 #define polarssl_free       free
 #endif
 
+/* Implementation that should never be optimized out by the compiler */
+static void polarssl_zeroize( void *v, size_t n ) {
+    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+}
+
 #if defined(POLARSSL_FS_IO)
 /*
  * Load all data from a file into a given buffer.
@@ -124,7 +129,7 @@
         ret = pk_parse_key( ctx, buf, n,
                 (const unsigned char *) pwd, strlen( pwd ) );
 
-    memset( buf, 0, n + 1 );
+    polarssl_zeroize( buf, n + 1 );
     polarssl_free( buf );
 
     return( ret );
@@ -144,7 +149,7 @@
 
     ret = pk_parse_public_key( ctx, buf, n );
 
-    memset( buf, 0, n + 1 );
+    polarssl_zeroize( buf, n + 1 );
     polarssl_free( buf );
 
     return( ret );