commit 516897a44a19c862227e08b8bc5a7ef95a3d4a72
author k-stachowiak <krzysiek.stachowiak@gmail.com> Wed Dec 19 17:07:02 2018 +0100
committer k-stachowiak <krzysiek.stachowiak@gmail.com> Wed Dec 19 17:34:58 2018 +0100
tree 32f228de454dde1c1a4741662f0b80a93d527ca5
parent 1a9df6bcb7d17d32d027659671da2727c9f5548c

Remove unnecessary parameter validation from the Cipher module

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index abf268f..2739975 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -1010,8 +1010,6 @@
     CIPHER_VALIDATE_RET( ilen == 0 || input != NULL );
     CIPHER_VALIDATE_RET( output != NULL );
     CIPHER_VALIDATE_RET( olen != NULL );
-    if( ctx->cipher_info == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
 
     if( ( ret = mbedtls_cipher_set_iv( ctx, iv, iv_len ) ) != 0 )
         return( ret );
@@ -1048,8 +1046,6 @@
     CIPHER_VALIDATE_RET( output != NULL );
     CIPHER_VALIDATE_RET( olen != NULL );
     CIPHER_VALIDATE_RET( tag_len == 0 || tag != NULL );
-    if( ctx->cipher_info == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
 
 #if defined(MBEDTLS_GCM_C)
     if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )
@@ -1105,8 +1101,6 @@
     CIPHER_VALIDATE_RET( output != NULL );
     CIPHER_VALIDATE_RET( olen != NULL );
     CIPHER_VALIDATE_RET( tag_len == 0 || tag != NULL );
-    if( ctx->cipher_info == NULL )
-        return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
 
 #if defined(MBEDTLS_GCM_C)
     if( MBEDTLS_MODE_GCM == ctx->cipher_info->mode )

tests/suites/test_suite_cipher.function

diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 16327c3..6073421 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -267,12 +267,6 @@
                               valid_buffer, valid_size,
                               valid_buffer, valid_size,
                               valid_buffer, &size_t_var ) );
-    TEST_ASSERT(
-        mbedtls_cipher_crypt( &invalid_ctx,
-                              valid_buffer, valid_size,
-                              valid_buffer, valid_size,
-                              valid_buffer, &size_t_var ) ==
-        MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
     TEST_INVALID_PARAM_RET(
         MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA,
         mbedtls_cipher_crypt( &valid_ctx,
@@ -308,14 +302,6 @@
                                      valid_buffer, valid_size,
                                      valid_buffer, &size_t_var,
                                      valid_buffer, valid_size ) );
-    TEST_ASSERT(
-        mbedtls_cipher_auth_encrypt( &invalid_ctx,
-                                     valid_buffer, valid_size,
-                                     valid_buffer, valid_size,
-                                     valid_buffer, valid_size,
-                                     valid_buffer, &size_t_var,
-                                     valid_buffer, valid_size ) ==
-        MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
     TEST_INVALID_PARAM_RET(
         MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA,
         mbedtls_cipher_auth_encrypt( &valid_ctx,
@@ -374,14 +360,6 @@
                                      valid_buffer, valid_size,
                                      valid_buffer, &size_t_var,
                                      valid_buffer, valid_size ) );
-    TEST_ASSERT(
-        mbedtls_cipher_auth_decrypt( &invalid_ctx,
-                                     valid_buffer, valid_size,
-                                     valid_buffer, valid_size,
-                                     valid_buffer, valid_size,
-                                     valid_buffer, &size_t_var,
-                                     valid_buffer, valid_size ) ==
-        MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
     TEST_INVALID_PARAM_RET(
         MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA,
         mbedtls_cipher_auth_decrypt( &valid_ctx,