commit 1a925bc0aab288f9911f4f1dfd76672c8c40c1be
author Simon Butcher <simon.butcher@arm.com> Mon May 14 13:58:22 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Mon May 14 17:49:48 2018 +0100
tree 7e056b07b7cacf6360a7bf6394b54f4bc915bdc6
parent cdd97fd63282779907a37b6a785bfbcf1b8fa964

Initial prototype and demonstrator for parameter validation

Adds a new configurable option for the parameter validation level.

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index b0aea00..dff424b 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -531,14 +531,7 @@
     unsigned int i;
     uint32_t *RK;
 
-#if !defined(MBEDTLS_AES_ROM_TABLES)
-    if( aes_init_done == 0 )
-    {
-        aes_gen_tables();
-        aes_init_done = 1;
-
-    }
-#endif
+    MBEDTLS_AES_VALIDATE( ctx != NULL && key != NULL );
 
     switch( keybits )
     {
@@ -548,6 +541,15 @@
         default : return( MBEDTLS_ERR_AES_INVALID_KEY_LENGTH );
     }
 
+#if !defined(MBEDTLS_AES_ROM_TABLES)
+    if( aes_init_done == 0 )
+    {
+        aes_gen_tables();
+        aes_init_done = 1;
+
+    }
+#endif
+
 #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16)
     if( aes_padlock_ace == -1 )
         aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE );