commit fb78c901389043d37a3076a745835084c63b8d7b
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu May 24 13:46:15 2018 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu May 24 16:54:57 2018 +0200
tree 7f750caa2ad03fda98198f8f523f53b327fe65a3
parent 3798b6be6be7a8a9b3ecd1f7e43df3a72382f365

Use recently-introduced platform_util module

library/chachapoly.c

diff --git a/library/chachapoly.c b/library/chachapoly.c
index de9e66c..5ce27f2 100644
--- a/library/chachapoly.c
+++ b/library/chachapoly.c
@@ -29,6 +29,8 @@
 #if defined(MBEDTLS_CHACHAPOLY_C)
 
 #include "mbedtls/chachapoly.h"
+#include "mbedtls/platform_util.h"
+
 #include <string.h>
 
 #if defined(MBEDTLS_SELF_TEST)
@@ -47,11 +49,6 @@
 #define CHACHAPOLY_STATE_CIPHERTEXT ( 2 ) /* Encrypting or decrypting */
 #define CHACHAPOLY_STATE_FINISHED   ( 3 )
 
-/* Implementation that should never be optimized out by the compiler */
-static void mbedtls_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
-}
-
 /**
  * \brief           Adds padding bytes (zeroes) to pad the AAD for Poly1305.
  *
@@ -170,7 +167,7 @@
     }
 
 cleanup:
-    mbedtls_zeroize( poly1305_key, 64U );
+    mbedtls_platform_zeroize( poly1305_key, 64U );
     return( result );
 }
 
@@ -355,7 +352,7 @@
 
     if( diff != 0 )
     {
-        mbedtls_zeroize( output, length );
+        mbedtls_platform_zeroize( output, length );
         return( MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED );
     }