Merge pull request #9218 from RonEld/use_platform_zeroize

Cruz Monrreal · web-flow · commit f9e840efbd2d · 2019-01-03T10:35:45.000-06:00
Change to mbedtls_platform_zeroize()
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/ecdh_alt.c b/features/cryptocell/FEATURE_CRYPTOCELL310/ecdh_alt.c
@@ -27,15 +27,10 @@
 #include "crys_ecpki_domain.h"
 #include "crys_ec_mont_api.h"
 #include "mbedtls/platform.h"
+#include "mbedtls/platform_util.h"
 #include "cc_internal.h"
 
 
-/* Implementation that should never be optimized out by the compiler */
-static void mbedtls_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = (unsigned char*)v;
-    while( n-- ) *p++ = 0;
-}
-
 #if defined (MBEDTLS_ECDH_GEN_PUBLIC_ALT)
 int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp_point *Q,
                      int ( *f_rng )( void *, unsigned char *, size_t ),
@@ -84,12 +79,12 @@ int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp
                                                             4*((((grp->nbits+7)/8)+3)/4) ) );
           if( ret != 0 )
           {
-              mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );
+              mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
               goto cleanup;
           }
 
           MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary( d, temp_buf, (grp->nbits+7)/8 ) );
-          mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );
+          mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
       }
 
       /* if CRYS_ECPKI_GetEcDomain returns NULL, then the given curve is either Montgomery 25519
@@ -124,7 +119,7 @@ int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp
 
     if ( pHeap )
     {
-        mbedtls_zeroize( pHeap, heapSize );
+        mbedtls_platform_zeroize( pHeap, heapSize );
         mbedtls_free( pHeap );
     }
 
@@ -190,7 +185,7 @@ int mbedtls_ecdh_compute_shared( mbedtls_ecp_group *grp, mbedtls_mpi *z,
                                                                          temp_buf,
                                                                          mbedtls_mpi_size( d ),
                                                                          &ecdhParams->privKey ) );
-        mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );
+        mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
         if ( ret != 0 )
         {
             goto cleanup;
@@ -241,13 +236,13 @@ int mbedtls_ecdh_compute_shared( mbedtls_ecp_group *grp, mbedtls_mpi *z,
 
     if ( pHeap )
     {
-        mbedtls_zeroize( pHeap, heapSize );
+        mbedtls_platform_zeroize( pHeap, heapSize );
         mbedtls_free ( pHeap );
     }
 
     if ( secret )
     {
-        mbedtls_zeroize( secret, secret_size_in_heap );
+        mbedtls_platform_zeroize( secret, secret_size_in_heap );
         mbedtls_free ( secret );
     }
 
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/ecdsa_alt.c b/features/cryptocell/FEATURE_CRYPTOCELL310/ecdsa_alt.c
@@ -27,14 +27,9 @@
 #include "crys_ecpki_domain.h"
 #include "crys_ec_edw_api.h"
 #include "mbedtls/platform.h"
+#include "mbedtls/platform_util.h"
 #include "cc_internal.h"
 
-/* Implementation that should never be optimized out by the compiler */
-static void mbedtls_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = (unsigned char*)v;
-    while( n-- ) *p++ = 0;
-}
-
 static CRYS_ECPKI_HASH_OpMode_t message_size_to_hash_mode( size_t blen )
 {
     CRYS_ECPKI_HASH_OpMode_t hash_mode;
@@ -110,7 +105,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
         if( CrysRet != CRYS_OK )
         {
             ret = convert_CrysError_to_mbedtls_err( CrysRet );
-            mbedtls_zeroize( temp_buf, sizeof(temp_buf) );
+            mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
             goto cleanup;
         }
 
@@ -123,7 +118,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
                                 blen,
                                 pSignature,
                                 &signature_size );
-        mbedtls_zeroize( temp_buf, sizeof(temp_buf) );
+        mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
         if( CrysRet != CRYS_OK )
         {
             ret = convert_CrysError_to_mbedtls_err( CrysRet );
@@ -145,13 +140,13 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
 
     if ( pHeap )
     {
-        mbedtls_zeroize( pHeap, heapSize );
+        mbedtls_platform_zeroize( pHeap, heapSize );
         mbedtls_free( pHeap );
     }
 
     if( pSignature )
     {
-        mbedtls_zeroize( pSignature, signature_size_for_heap );
+        mbedtls_platform_zeroize( pSignature, signature_size_for_heap );
         mbedtls_free( pSignature );
 
     }
@@ -232,13 +227,13 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
 
     if( pHeap )
     {
-        mbedtls_zeroize( pHeap, heapSize );
+        mbedtls_platform_zeroize( pHeap, heapSize );
         mbedtls_free( pHeap );
     }
 
     if( pSignature )
     {
-        mbedtls_zeroize( pSignature, signature_size );
+        mbedtls_platform_zeroize( pSignature, signature_size );
         mbedtls_free( pSignature );
 
     }
@@ -301,12 +296,12 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
         if ( CrysRet != CRYS_OK )
         {
             ret = convert_CrysError_to_mbedtls_err( CrysRet );
-            mbedtls_zeroize( temp_buf, sizeof(temp_buf) );
+            mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
             goto cleanup;
         }
 
         ret = mbedtls_mpi_read_binary( &ctx->d, temp_buf, (ctx->grp.nbits+7)/8 );
-        mbedtls_zeroize( temp_buf, sizeof(temp_buf) );
+        mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
         if ( ret != 0 )
         {
             goto cleanup;
@@ -319,7 +314,7 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
 cleanup:
     if ( pHeap )
     {
-        mbedtls_zeroize( pHeap, heapSize );
+        mbedtls_platform_zeroize( pHeap, heapSize );
         mbedtls_free ( pHeap );
     }
     return ( ret );

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,10 @@`
`27`	`27`	`#include "crys_ecpki_domain.h"`
`28`	`28`	`#include "crys_ec_mont_api.h"`
`29`	`29`	`#include "mbedtls/platform.h"`
	`30`	`+#include "mbedtls/platform_util.h"`
`30`	`31`	`#include "cc_internal.h"`
`31`	`32`
`32`	`33`
`33`		`-/* Implementation that should never be optimized out by the compiler */`
`34`		`-static void mbedtls_zeroize( void *v, size_t n ) {`
`35`		`- volatile unsigned char p = (unsigned char)v;`
`36`		`- while( n-- ) *p++ = 0;`
`37`		`-}`
`38`		`-`
`39`	`34`	`#if defined (MBEDTLS_ECDH_GEN_PUBLIC_ALT)`
`40`	`35`	`int mbedtls_ecdh_gen_public( mbedtls_ecp_group grp, mbedtls_mpi d, mbedtls_ecp_point *Q,`
`41`	`36`	`int ( f_rng )( void , unsigned char *, size_t ),`
`@@ -84,12 +79,12 @@ int mbedtls_ecdh_gen_public( mbedtls_ecp_group grp, mbedtls_mpi d, mbedtls_ecp`
`84`	`79`	`4*((((grp->nbits+7)/8)+3)/4) ) );`
`85`	`80`	`if( ret != 0 )`
`86`	`81`	`{`
`87`		`- mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );`
	`82`	`+ mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );`
`88`	`83`	`goto cleanup;`
`89`	`84`	`}`
`90`	`85`
`91`	`86`	`MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary( d, temp_buf, (grp->nbits+7)/8 ) );`
`92`		`- mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );`
	`87`	`+ mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );`
`93`	`88`	`}`
`94`	`89`
`95`	`90`	`/* if CRYS_ECPKI_GetEcDomain returns NULL, then the given curve is either Montgomery 25519`
`@@ -124,7 +119,7 @@ int mbedtls_ecdh_gen_public( mbedtls_ecp_group grp, mbedtls_mpi d, mbedtls_ecp`
`124`	`119`
`125`	`120`	`if ( pHeap )`
`126`	`121`	`{`
`127`		`- mbedtls_zeroize( pHeap, heapSize );`
	`122`	`+ mbedtls_platform_zeroize( pHeap, heapSize );`
`128`	`123`	`mbedtls_free( pHeap );`
`129`	`124`	`}`
`130`	`125`
`@@ -190,7 +185,7 @@ int mbedtls_ecdh_compute_shared( mbedtls_ecp_group grp, mbedtls_mpi z,`
`190`	`185`	`temp_buf,`
`191`	`186`	`mbedtls_mpi_size( d ),`
`192`	`187`	`&ecdhParams->privKey ) );`
`193`		`- mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );`
	`188`	`+ mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );`
`194`	`189`	`if ( ret != 0 )`
`195`	`190`	`{`
`196`	`191`	`goto cleanup;`
`@@ -241,13 +236,13 @@ int mbedtls_ecdh_compute_shared( mbedtls_ecp_group grp, mbedtls_mpi z,`
`241`	`236`
`242`	`237`	`if ( pHeap )`
`243`	`238`	`{`
`244`		`- mbedtls_zeroize( pHeap, heapSize );`
	`239`	`+ mbedtls_platform_zeroize( pHeap, heapSize );`
`245`	`240`	`mbedtls_free ( pHeap );`
`246`	`241`	`}`
`247`	`242`
`248`	`243`	`if ( secret )`
`249`	`244`	`{`
`250`		`- mbedtls_zeroize( secret, secret_size_in_heap );`
	`245`	`+ mbedtls_platform_zeroize( secret, secret_size_in_heap );`
`251`	`246`	`mbedtls_free ( secret );`
`252`	`247`	`}`
`253`	`248`
Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,9 @@`
`27`	`27`	`#include "crys_ecpki_domain.h"`
`28`	`28`	`#include "crys_ec_edw_api.h"`
`29`	`29`	`#include "mbedtls/platform.h"`
	`30`	`+#include "mbedtls/platform_util.h"`
`30`	`31`	`#include "cc_internal.h"`
`31`	`32`
`32`		`-/* Implementation that should never be optimized out by the compiler */`
`33`		`-static void mbedtls_zeroize( void *v, size_t n ) {`
`34`		`- volatile unsigned char p = (unsigned char)v;`
`35`		`- while( n-- ) *p++ = 0;`
`36`		`-}`
`37`		`-`
`38`	`33`	`static CRYS_ECPKI_HASH_OpMode_t message_size_to_hash_mode( size_t blen )`
`39`	`34`	`{`
`40`	`35`	`CRYS_ECPKI_HASH_OpMode_t hash_mode;`
`@@ -110,7 +105,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group grp, mbedtls_mpi r, mbedtls_mpi *s,`
`110`	`105`	`if( CrysRet != CRYS_OK )`
`111`	`106`	`{`
`112`	`107`	`ret = convert_CrysError_to_mbedtls_err( CrysRet );`
`113`		`- mbedtls_zeroize( temp_buf, sizeof(temp_buf) );`
	`108`	`+ mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );`
`114`	`109`	`goto cleanup;`
`115`	`110`	`}`
`116`	`111`
`@@ -123,7 +118,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group grp, mbedtls_mpi r, mbedtls_mpi *s,`
`123`	`118`	`blen,`
`124`	`119`	`pSignature,`
`125`	`120`	`&signature_size );`
`126`		`- mbedtls_zeroize( temp_buf, sizeof(temp_buf) );`
	`121`	`+ mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );`
`127`	`122`	`if( CrysRet != CRYS_OK )`
`128`	`123`	`{`
`129`	`124`	`ret = convert_CrysError_to_mbedtls_err( CrysRet );`
`@@ -145,13 +140,13 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group grp, mbedtls_mpi r, mbedtls_mpi *s,`
`145`	`140`
`146`	`141`	`if ( pHeap )`
`147`	`142`	`{`
`148`		`- mbedtls_zeroize( pHeap, heapSize );`
	`143`	`+ mbedtls_platform_zeroize( pHeap, heapSize );`
`149`	`144`	`mbedtls_free( pHeap );`
`150`	`145`	`}`
`151`	`146`
`152`	`147`	`if( pSignature )`
`153`	`148`	`{`
`154`		`- mbedtls_zeroize( pSignature, signature_size_for_heap );`
	`149`	`+ mbedtls_platform_zeroize( pSignature, signature_size_for_heap );`
`155`	`150`	`mbedtls_free( pSignature );`
`156`	`151`
`157`	`152`	`}`
`@@ -232,13 +227,13 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,`
`232`	`227`
`233`	`228`	`if( pHeap )`
`234`	`229`	`{`
`235`		`- mbedtls_zeroize( pHeap, heapSize );`
	`230`	`+ mbedtls_platform_zeroize( pHeap, heapSize );`
`236`	`231`	`mbedtls_free( pHeap );`
`237`	`232`	`}`
`238`	`233`
`239`	`234`	`if( pSignature )`
`240`	`235`	`{`
`241`		`- mbedtls_zeroize( pSignature, signature_size );`
	`236`	`+ mbedtls_platform_zeroize( pSignature, signature_size );`
`242`	`237`	`mbedtls_free( pSignature );`
`243`	`238`
`244`	`239`	`}`
`@@ -301,12 +296,12 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,`
`301`	`296`	`if ( CrysRet != CRYS_OK )`
`302`	`297`	`{`
`303`	`298`	`ret = convert_CrysError_to_mbedtls_err( CrysRet );`
`304`		`- mbedtls_zeroize( temp_buf, sizeof(temp_buf) );`
	`299`	`+ mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );`
`305`	`300`	`goto cleanup;`
`306`	`301`	`}`
`307`	`302`
`308`	`303`	`ret = mbedtls_mpi_read_binary( &ctx->d, temp_buf, (ctx->grp.nbits+7)/8 );`
`309`		`- mbedtls_zeroize( temp_buf, sizeof(temp_buf) );`
	`304`	`+ mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );`
`310`	`305`	`if ( ret != 0 )`
`311`	`306`	`{`
`312`	`307`	`goto cleanup;`
`@@ -319,7 +314,7 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,`
`319`	`314`	`cleanup:`
`320`	`315`	`if ( pHeap )`
`321`	`316`	`{`
`322`		`- mbedtls_zeroize( pHeap, heapSize );`
	`317`	`+ mbedtls_platform_zeroize( pHeap, heapSize );`
`323`	`318`	`mbedtls_free ( pHeap );`
`324`	`319`	`}`
`325`	`320`	`return ( ret );`