commit 8de6437bb630387d79cb8b71dda5aefbc6c7b48d
author David Brown <david.brown@linaro.org> Thu Feb 11 10:53:23 2021 -0700
committer David Brown <david.brown@linaro.org> Tue Feb 16 13:25:34 2021 -0700
tree 298a526007895b4cf8835249eba33a66f8297f4d
parent 7807bf740499fb785d687879c6ee85f0af80373a

Cleanup PSA CBC padding defines

Only define MBEDTLS_CIPHER_MODE_CBC if one of the CBC modes is requested
and everything isn't covered by an accelerated version.  This keeps this
from being defined in cases where everything needed would be
accelerated.

Signed-off-by: David Brown <david.brown@linaro.org>

include/mbedtls/config_psa.h

diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 1e63872..20eda77 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -331,13 +331,10 @@
 #define MBEDTLS_PSA_BUILTIN_ALG_ECB 1
 #endif
 
-#if defined(PSA_WANT_ALG_CBC_NO_PADDING) || defined(PSA_WANT_ALG_CBC_PKCS7)
-#define MBEDTLS_CIPHER_MODE_CBC
-#endif /* PSA_WANT_ALG_CBC_NO_PADDING || PSA_WANT_ALG_CBC_PKCS7 */
-
 #if defined(PSA_WANT_ALG_CBC_NO_PADDING)
 #if !defined(MBEDTLS_PSA_ACCEL_ALG_CBC_NO_PADDING) || \
     defined(PSA_HAVE_SOFT_BLOCK_CIPHER)
+#define MBEDTLS_CIPHER_MODE_CBC
 #define MBEDTLS_PSA_BUILTIN_ALG_CBC_NO_PADDING 1
 #endif
 #endif /* PSA_WANT_ALG_CBC_NO_PADDING */
@@ -345,6 +342,7 @@
 #if defined(PSA_WANT_ALG_CBC_PKCS7)
 #if !defined(MBEDTLS_PSA_ACCEL_ALG_CBC_PKCS7) || \
     defined(PSA_HAVE_SOFT_BLOCK_CIPHER)
+#define MBEDTLS_CIPHER_MODE_CBC
 #define MBEDTLS_PSA_BUILTIN_ALG_CBC_PKCS7 1
 #define MBEDTLS_CIPHER_PADDING_PKCS7
 #endif