From ff62f44ad7bb8081880684e6bd0b559e0ff01ee6 Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Thu, 13 Dec 2018 15:53:41 +0000
Subject: [PATCH] Remove duplicated parameter check in CAMELLIA module
---
library/camellia.c | 2 --
tests/suites/test_suite_camellia.function | 9 ---------
2 files changed, 11 deletions(-)
diff --git a/library/camellia.c b/library/camellia.c
index 9ac394f9f..7fb8dc76e 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -355,7 +355,6 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx,
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 @@ int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx,
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 );
diff --git a/tests/suites/test_suite_camellia.function b/tests/suites/test_suite_camellia.function
index b4fa13eb8..5d70fa2c9 100644
--- a/tests/suites/test_suite_camellia.function
+++ b/tests/suites/test_suite_camellia.function
@@ -13,7 +13,6 @@ void camellia_invalid_param( )
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 @@ void camellia_invalid_param( )
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 @@ void camellia_invalid_param( )
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,