commit 1677cca54b51f0c82c6ec24825443ae0fc592a1f
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Dec 13 10:27:13 2018 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Dec 18 12:22:40 2018 +0100
tree 25983e9611b2ce630ec2a4af715fcfb8cb16cfbf
parent 191af1313ae192c8f0a9bf5eb3c892eefa42605f

Add parameter validation for AES-CFB functions

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index c15022b..b705290 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1287,7 +1287,17 @@
                        unsigned char *output )
 {
     int c;
-    size_t n = *iv_off;
+    size_t n;
+
+    AES_VALIDATE_RET( ctx != NULL );
+    AES_VALIDATE_RET( mode == MBEDTLS_AES_ENCRYPT ||
+                      mode == MBEDTLS_AES_DECRYPT );
+    AES_VALIDATE_RET( iv_off != NULL );
+    AES_VALIDATE_RET( iv != NULL );
+    AES_VALIDATE_RET( input != NULL );
+    AES_VALIDATE_RET( output != NULL );
+
+    n = *iv_off;
 
     if( mode == MBEDTLS_AES_DECRYPT )
     {
@@ -1334,6 +1344,12 @@
     unsigned char c;
     unsigned char ov[17];
 
+    AES_VALIDATE_RET( ctx != NULL );
+    AES_VALIDATE_RET( mode == MBEDTLS_AES_ENCRYPT ||
+                      mode == MBEDTLS_AES_DECRYPT );
+    AES_VALIDATE_RET( iv != NULL );
+    AES_VALIDATE_RET( input != NULL );
+    AES_VALIDATE_RET( output != NULL );
     while( length-- )
     {
         memcpy( ov, iv, 16 );