commit 7124fb63be173bec1f73af56e5a14328f51780d4
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue May 22 16:05:33 2018 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue May 22 16:05:33 2018 +0200
tree 9b2c3ff29370cbdbef891ca866f81cb0d2bc351b
parent a3712beb9bbfab89dc72c157e28d020a44206bb7

Use zeroize function from new platform_util

library/aria.c

diff --git a/library/aria.c b/library/aria.c
index 25beafc..e9bcd6d 100644
--- a/library/aria.c
+++ b/library/aria.c
@@ -48,16 +48,13 @@
 
 #if !defined(MBEDTLS_ARIA_ALT)
 
+#include "mbedtls/platform_util.h"
+
 #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
     !defined(inline) && !defined(__cplusplus)
 #define inline __inline
 #endif
 
-/* 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;
-}
-
 /*
  * 32-bit integer manipulation macros (little endian)
  */
@@ -494,7 +491,7 @@
     aria_rot128( ctx->rk[16], w[0], w[1], 19 );
 
     /* w holds enough info to reconstruct the round keys */
-    mbedtls_zeroize( w, sizeof( w ) );
+    mbedtls_platform_zeroize( w, sizeof( w ) );
 
     return( 0 );
 }
@@ -598,7 +595,7 @@
     if( ctx == NULL )
         return;
 
-    mbedtls_zeroize( ctx, sizeof( mbedtls_aria_context ) );
+    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_aria_context ) );
 }
 
 #if defined(MBEDTLS_CIPHER_MODE_CBC)