commit 7b01244b993a9d53dfab1937aa333ab30d69ee77
author Ron Eldor <Ron.Eldor@arm.com> Mon Sep 25 17:03:12 2017 +0300
committer Simon Butcher <simon.butcher@arm.com> Mon Jul 23 18:02:09 2018 +0100
tree 12ea8835dcdf6ffdee770ad970d807fc2251e480
parent 7d728bd70e6a8d129ee07813da1538de1bf95cb2

Add tests for mbedtls_cipher_crypt API

1. Add tests for 'mbedtls_cipher_crypt()' API
2. Resolves #1091, by ignoring IV when the cipher mode is MBEDTLS_MODE_ECB

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 7ae6c4a..2771b05 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -237,10 +237,15 @@
                    const unsigned char *iv, size_t iv_len )
 {
     size_t actual_iv_size;
-
-    if( NULL == ctx || NULL == ctx->cipher_info || NULL == iv )
+    if( NULL == ctx || NULL == ctx->cipher_info ||
+        ( NULL == iv && ( ctx->cipher_info->mode != MBEDTLS_MODE_ECB ) ) )
         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 );