commit ff62f44ad7bb8081880684e6bd0b559e0ff01ee6
author Hanno Becker <hanno.becker@arm.com> Thu Dec 13 15:53:41 2018 +0000
committer Hanno Becker <hanno.becker@arm.com> Wed Dec 19 12:47:55 2018 +0000
tree b9ee62ad85bbb9bdfca4157b87476e43d6ebe088
parent e939de7247f15bdfe1fcabb9caf0482d59b95313

Remove duplicated parameter check in CAMELLIA module

library/camellia.c

diff --git a/library/camellia.c b/library/camellia.c
index 9ac394f..7fb8dc7 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -355,7 +355,6 @@
     uint32_t TK[20];
     CAMELLIA_VALIDATE_RET( ctx != NULL );
     CAMELLIA_VALIDATE_RET( key != NULL );
-    CAMELLIA_VALIDATE_RET( keybits == 128 || keybits == 192 || keybits == 256 );
 
     RK = ctx->rk;
 
@@ -462,7 +461,6 @@
     uint32_t *SK;
     CAMELLIA_VALIDATE_RET( ctx != NULL );
     CAMELLIA_VALIDATE_RET( key != NULL );
-    CAMELLIA_VALIDATE_RET( keybits == 128 || keybits == 192 || keybits == 256 );
 
     mbedtls_camellia_init( &cty );
 

tests/suites/test_suite_camellia.function

diff --git a/tests/suites/test_suite_camellia.function b/tests/suites/test_suite_camellia.function
index b4fa13e..5d70fa2 100644
--- a/tests/suites/test_suite_camellia.function
+++ b/tests/suites/test_suite_camellia.function
@@ -13,7 +13,6 @@
     mbedtls_camellia_context ctx;
     unsigned char buf[16] = { 0 };
     const size_t valid_keybits   = 128;
-    const size_t invalid_keybits = 42;
     const int invalid_mode = 42;
     const int valid_mode = MBEDTLS_CAMELLIA_ENCRYPT;
     size_t off;
@@ -30,10 +29,6 @@
                             mbedtls_camellia_setkey_enc( &ctx,
                                                          NULL,
                                                          valid_keybits ) );
-    TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
-                            mbedtls_camellia_setkey_enc( &ctx,
-                                                         buf,
-                                                         invalid_keybits ) );
 
     TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
                             mbedtls_camellia_setkey_dec( NULL,
@@ -43,10 +38,6 @@
                             mbedtls_camellia_setkey_dec( &ctx,
                                                          NULL,
                                                          valid_keybits ) );
-    TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
-                            mbedtls_camellia_setkey_dec( &ctx,
-                                                         buf,
-                                                         invalid_keybits ) );
 
     TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
                             mbedtls_camellia_crypt_ecb( NULL,