commit efba4b077b5f6017de20d50eeddb357ae771889e
author Ron Eldor <Ron.Eldor@arm.com> Mon Sep 25 18:22:32 2017 +0300
committer Ron Eldor <Ron.Eldor@arm.com> Thu Jun 21 14:03:14 2018 +0300
tree 42e9ede1a2ecfc4bff10979f9105e8a146ecea26
parent cf2305e513fc6aba9dc4bf46af72b4b4d3aee0a1

Fix after PR comments

1. Don't set IV onECB
2. Fix style issues
3. reduce number of tests

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 67c3d30..220fbab 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -215,15 +215,11 @@
                    const unsigned char *iv, size_t iv_len )
 {
     size_t actual_iv_size;
-    if( NULL == ctx || NULL == ctx->cipher_info ||
-        ( NULL == iv && ( ctx->cipher_info->mode != MBEDTLS_MODE_ECB ) ) )
+    if( NULL == ctx || NULL == ctx->cipher_info )
+        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
+    else if( NULL == iv && iv_len != 0  )
         return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
 
-    if ( ctx->cipher_info->mode == MBEDTLS_MODE_ECB  )
-    {
-            ctx->iv_size = 0;
-            return ( 0 );
-    }
     /* avoid buffer overflow in ctx->iv */
     if( iv_len > MBEDTLS_MAX_IV_LENGTH )
         return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
@@ -238,9 +234,11 @@
         if( actual_iv_size > iv_len )
             return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
     }
-
-    memcpy( ctx->iv, iv, actual_iv_size );
-    ctx->iv_size = actual_iv_size;
+    if ( actual_iv_size )
+    {
+        memcpy( ctx->iv, iv, actual_iv_size );
+        ctx->iv_size = actual_iv_size;
+    }
 
     return( 0 );
 }

library/cipher_wrap.c

diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index dc76af8..dbc5d3f 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -204,7 +204,7 @@
     MBEDTLS_MODE_ECB,
     128,
     "AES-128-ECB",
-    16,
+    0,
     0,
     16,
     &aes_info
@@ -215,7 +215,7 @@
     MBEDTLS_MODE_ECB,
     192,
     "AES-192-ECB",
-    16,
+    0,
     0,
     16,
     &aes_info
@@ -226,7 +226,7 @@
     MBEDTLS_MODE_ECB,
     256,
     "AES-256-ECB",
-    16,
+    0,
     0,
     16,
     &aes_info