commit 6640b0d9a3d880ca4c90832efcdff9ac0ca8d488
author Hanno Becker <hanno.becker@arm.com> Tue Dec 18 09:45:17 2018 +0000
committer Hanno Becker <hanno.becker@arm.com> Tue Dec 18 09:53:14 2018 +0000
tree 9b11d4ed48f0ee715bdc2b949632462391ec5638
parent a034369eca145b9cdf132938d552ffcf812cd0c6

Undo deprecation of MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH

library/blowfish.c

diff --git a/library/blowfish.c b/library/blowfish.c
index e42bd2b..b3448c2 100644
--- a/library/blowfish.c
+++ b/library/blowfish.c
@@ -265,7 +265,7 @@
     unsigned char temp[MBEDTLS_BLOWFISH_BLOCKSIZE];
 
     if( length % MBEDTLS_BLOWFISH_BLOCKSIZE )
-        return( MBEDTLS_ERR_BLOWFISH_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH );
 
     if( mode == MBEDTLS_BLOWFISH_DECRYPT )
     {

library/error.c

diff --git a/library/error.c b/library/error.c
index a70db68..3be4175 100644
--- a/library/error.c
+++ b/library/error.c
@@ -674,6 +674,8 @@
 #if defined(MBEDTLS_BLOWFISH_C)
     if( use_ret == -(MBEDTLS_ERR_BLOWFISH_BAD_INPUT_DATA) )
         mbedtls_snprintf( buf, buflen, "BLOWFISH - Bad input data" );
+    if( use_ret == -(MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH) )
+        mbedtls_snprintf( buf, buflen, "BLOWFISH - Invalid data input length" );
     if( use_ret == -(MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED) )
         mbedtls_snprintf( buf, buflen, "BLOWFISH - Blowfish hardware accelerator failed" );
 #endif /* MBEDTLS_BLOWFISH_C */