commit 63ca260827c6ab0c6706a97ed22f0135d37032f1
author David Brown <david.brown@linaro.org> Tue Jan 26 11:51:12 2021 -0700
committer David Brown <david.brown@linaro.org> Tue Feb 16 13:24:19 2021 -0700
tree e3b87123197a12cc9d2d69dff783f7f7a595177d
parent 12f45f99da22e4f04414358bea195ff22e9a7fbb

Change psa_crypto.c ifdefs for cipher modes

Change to use the MBEDTLS_PSA_BUILTIN... macros defined by the cipher
modes.

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

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 40d28d9..c48b2f9 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3896,7 +3896,8 @@
     if( ret != 0 )
         goto exit;
 
-#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_CBC_NO_PADDING) || \
+    defined(MBEDTLS_PSA_BUILTIN_ALG_CBC_PKCS7)
     switch( alg )
     {
         case PSA_ALG_CBC_NO_PADDING:
@@ -3914,7 +3915,7 @@
     }
     if( ret != 0 )
         goto exit;
-#endif //MBEDTLS_CIPHER_MODE_WITH_PADDING
+#endif /* MBEDTLS_PSA_BUILTIN_ALG_CBC_NO_PADDING || MBEDTLS_PADDING_PKCS7 */
 
     operation->block_size = ( PSA_ALG_IS_STREAM_CIPHER( alg ) ? 1 :
                               PSA_BLOCK_CIPHER_BLOCK_LENGTH( slot->attr.type ) );