commit 93e21119b798544bc0c43cfc8c35e3c30800e0d3
author Jaeden Amero <jaeden.amero@arm.com> Wed Feb 20 13:57:28 2019 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Wed Feb 20 13:59:05 2019 +0000
tree 7f20f21c4dc535244b8bf0559767f52bc4f353d0
parent 72f40c6686f4276dd17c0f68e4dc4d374b74b4ca

psa: Be compatible with deprecated constants

In case the new constants aren't available yet in Mbed TLS, continue to
use the deprecated constants if they are available.

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 8c7dc1e..cfa07a6 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -158,13 +158,21 @@
         case MBEDTLS_ERR_ASN1_BUF_TOO_SMALL:
             return( PSA_ERROR_BUFFER_TOO_SMALL );
 
+#if defined(MBEDTLS_ERR_BLOWFISH_BAD_INPUT_DATA)
         case MBEDTLS_ERR_BLOWFISH_BAD_INPUT_DATA:
+#elif defined(MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH)
+        case MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH:
+#endif
         case MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH:
             return( PSA_ERROR_NOT_SUPPORTED );
         case MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED:
             return( PSA_ERROR_HARDWARE_FAILURE );
 
+#if defined(MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA)
         case MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA:
+#elif defined(MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH)
+        case MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH:
+#endif
         case MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH:
             return( PSA_ERROR_NOT_SUPPORTED );
         case MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED: