commit d241f1cf17a10b56aa6c70c83e468014d1869db6
author Simon Butcher <simon.butcher@arm.com> Thu Oct 06 10:39:49 2016 +0100
committer Simon Butcher <simon.butcher@arm.com> Thu Oct 06 12:53:33 2016 +0100
tree 1b4dceb2e767a8e277fda61651a78fc59bf18323
parent b981b16379f3896422b5d8c9e9ad1ecae583c370

Fixes following review

Fixes issue of not zeroing entire block on reset and conditional compilation.

library/cmac.c

diff --git a/library/cmac.c b/library/cmac.c
index 7fc513a..9e4dc89 100644
--- a/library/cmac.c
+++ b/library/cmac.c
@@ -59,8 +59,7 @@
 #include <stdlib.h>
 #define mbedtls_calloc     calloc
 #define mbedtls_free       free
-#if defined(MBEDTLS_SELF_TEST) && ( defined(MBEDTLS_AES_C) || \
-        defined(MBEDTLS_DES_C) )
+#if defined(MBEDTLS_SELF_TEST)
 #include <stdio.h>
 #define mbedtls_printf     printf
 #endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C || MBEDTLS_DES_C */
@@ -388,8 +387,9 @@
     /* Reset the internal state */
     cmac_ctx->unprocessed_len = 0;
     mbedtls_zeroize( cmac_ctx->unprocessed_block,
-                     sizeof( cmac_ctx->unprocessed_len ) );
-    mbedtls_zeroize( cmac_ctx->state, MBEDTLS_CIPHER_BLKSIZE_MAX );
+                     sizeof( cmac_ctx->unprocessed_block ));
+    mbedtls_zeroize( cmac_ctx->state,
+                     sizeof( cmac_ctx->state ) );
     cmac_ctx->padding_flag = 1;
 
     return( 0 );