Use mbedtls_platform_zeroize

Ron Eldor · Ron Eldor · commit 93e0f6493da2 · 2018-11-26T14:57:43.000+02:00
Rplace calls to `mbedtls_zeroize()` to `mbedtls_platform_zeroize()`.
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.c b/features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.c
@@ -22,22 +22,17 @@
 #if defined(MBEDTLS_CCM_ALT)
 #include <string.h>
 #include "mbedtls/platform.h"
+#include "mbedtls/platform_util.h"
 #include "mbedtls/aes.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;
-}
-
 void mbedtls_ccm_init( mbedtls_ccm_context *ctx )
 {
     memset( ctx, 0, sizeof( mbedtls_ccm_context ) );
 }
 
 void mbedtls_ccm_free( mbedtls_ccm_context *ctx )
 {
-    mbedtls_zeroize( ctx, sizeof( mbedtls_ccm_context ) );
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_ccm_context ) );
 }
 
 int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx,

Original file line number	Diff line number	Diff line change
`@@ -22,22 +22,17 @@`
`22`	`22`	`#if defined(MBEDTLS_CCM_ALT)`
`23`	`23`	`#include <string.h>`
`24`	`24`	`#include "mbedtls/platform.h"`
	`25`	`+#include "mbedtls/platform_util.h"`
`25`	`26`	`#include "mbedtls/aes.h"`
`26`	`27`
`27`		`-/* Implementation that should never be optimized out by the compiler */`
`28`		`-static void mbedtls_zeroize( void *v, size_t n ) {`
`29`		`- volatile unsigned char p = (unsigned char)v;`
`30`		`- while( n-- ) *p++ = 0;`
`31`		`-}`
`32`		`-`
`33`	`28`	`void mbedtls_ccm_init( mbedtls_ccm_context *ctx )`
`34`	`29`	`{`
`35`	`30`	`memset( ctx, 0, sizeof( mbedtls_ccm_context ) );`
`36`	`31`	`}`
`37`	`32`
`38`	`33`	`void mbedtls_ccm_free( mbedtls_ccm_context *ctx )`
`39`	`34`	`{`
`40`		`- mbedtls_zeroize( ctx, sizeof( mbedtls_ccm_context ) );`
	`35`	`+ mbedtls_platform_zeroize( ctx, sizeof( mbedtls_ccm_context ) );`
`41`	`36`	`}`
`42`	`37`
`43`	`38`	`int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx,`