From 8de6437bb630387d79cb8b71dda5aefbc6c7b48d Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 11 Feb 2021 10:53:23 -0700 Subject: [PATCH] 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 --- include/mbedtls/config_psa.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h index 1e63872e2..20eda77e1 100644 --- a/include/mbedtls/config_psa.h +++ b/include/mbedtls/config_psa.h @@ -331,13 +331,10 @@ extern "C" { #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 @@ extern "C" { #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