commit 938f9e9bdbff3e0cbb1f1f62520b72f543cc8b33
author Hanno Becker <hanno.becker@arm.com> Tue Dec 18 09:40:25 2018 +0000
committer Hanno Becker <hanno.becker@arm.com> Tue Dec 18 09:50:57 2018 +0000
tree f5ad021e36fc600400ffb7aa8363ce3582efa53b
parent 9dbefa1793e492b7e4e854a00717375efb4cf9c2

Undo deprecation of MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH

Merging MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH and
MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH is an API break.

library/camellia.c

diff --git a/library/camellia.c b/library/camellia.c
index 2fe0b77..97c9f20 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -562,7 +562,7 @@
     unsigned char temp[16];
 
     if( length % 16 )
-        return( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH );
 
     if( mode == MBEDTLS_CAMELLIA_DECRYPT )
     {

library/error.c

diff --git a/library/error.c b/library/error.c
index da1d5d4..80f4948 100644
--- a/library/error.c
+++ b/library/error.c
@@ -679,6 +679,8 @@
 #if defined(MBEDTLS_CAMELLIA_C)
     if( use_ret == -(MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA) )
         mbedtls_snprintf( buf, buflen, "CAMELLIA - Bad input data" );
+    if( use_ret == -(MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "CAMELLIA - Invalid data input length" );
     if( use_ret == -(MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED) )
         mbedtls_snprintf( buf, buflen, "CAMELLIA - Camellia hardware accelerator failed" );
 #endif /* MBEDTLS_CAMELLIA_C */