diff --git a/ChangeLog b/ChangeLog
index 7a298ad27c..5a569a3898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,10 +35,8 @@ API Changes
      - MBEDTLS_ERR_ARIA_INVALID_KEY_LENGTH
      - MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH
      in favour of a new single error MBEDTLS_ERR_ARIA_BAD_INPUT_DATA.
-   * Deprecate the CAMELLIA error constants
-     - MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
-     - MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
-     in favour of a new single error MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA.
+   * Deprecate the CAMELLIA error MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
+     in favour a new generic error MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA.
    * Deprecate the Blowfish error constants
      - MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH
      - MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH
diff --git a/include/mbedtls/camellia.h b/include/mbedtls/camellia.h
index 93987bf70a..e52461281a 100644
--- a/include/mbedtls/camellia.h
+++ b/include/mbedtls/camellia.h
@@ -40,10 +40,11 @@
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 #define MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH   MBEDTLS_DEPRECATED_NUMERIC_CONSTANT( -0x0024 )
-#define MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH MBEDTLS_DEPRECATED_NUMERIC_CONSTANT( -0x0026 )
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
 #define MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA -0x0024 /**< Bad input data. */
 
+#define MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH -0x0026 /**< Invalid data input length. */
+
 /* MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED is deprecated and should not be used.
  */
 #define MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED              -0x0027  /**< Camellia hardware accelerator failed. */
diff --git a/include/mbedtls/error.h b/include/mbedtls/error.h
index a8f587ca67..c4883be656 100644
--- a/include/mbedtls/error.h
+++ b/include/mbedtls/error.h
@@ -54,7 +54,7 @@
  * BLOWFISH  2  0x0016-0x0016   0x0017-0x0017
  * THREADING 3  0x001A-0x001E
  * AES       5  0x0020-0x0022   0x0021-0x0025
- * CAMELLIA  2  0x0024-0x0024   0x0027-0x0027
+ * CAMELLIA  3  0x0024-0x0026   0x0027-0x0027
  * XTEA      2  0x0028-0x0028   0x0029-0x0029
  * BASE64    2  0x002A-0x002C
  * OID       1  0x002E-0x002E   0x000B-0x000B
diff --git a/library/camellia.c b/library/camellia.c
index 2fe0b77588..97c9f20d08 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -562,7 +562,7 @@ int mbedtls_camellia_crypt_cbc( mbedtls_camellia_context *ctx,
     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 )
     {
diff --git a/library/error.c b/library/error.c
index da1d5d4946..80f4948b9b 100644
--- a/library/error.c
+++ b/library/error.c
@@ -679,6 +679,8 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
 #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 */
diff --git a/tests/suites/test_suite_camellia.data b/tests/suites/test_suite_camellia.data
index efa7865345..190632ed37 100644
--- a/tests/suites/test_suite_camellia.data
+++ b/tests/suites/test_suite_camellia.data
@@ -191,10 +191,10 @@ Camellia-ECB Decrypt (Invalid key length)
 camellia_decrypt_ecb:"0123456789abcdeffedcba98765432":"0123456789abcdeffedcba9876543210":"67673138549669730857065648eabe43":MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA
 
 Camellia-256-CBC Encrypt (Invalid input length)
-camellia_encrypt_cbc:"0000000000000000000000000000000000000000000000000000000000000000":"00000000000000000000000000000000":"ffffffffffffffe000000000000000":"":MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA
+camellia_encrypt_cbc:"0000000000000000000000000000000000000000000000000000000000000000":"00000000000000000000000000000000":"ffffffffffffffe000000000000000":"":MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
 
 Camellia-256-CBC Decrypt (Invalid input length)
-camellia_decrypt_cbc:"0000000000000000000000000000000000000000000000000000000000000000":"00000000000000000000000000000000":"623a52fcea5d443e48d9181ab32c74":"":MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA
+camellia_decrypt_cbc:"0000000000000000000000000000000000000000000000000000000000000000":"00000000000000000000000000000000":"623a52fcea5d443e48d9181ab32c74":"":MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH
 
 Camellia Selftest
 depends_on:MBEDTLS_SELF_TEST