commit a56d3d9e758e27ba529ea6be561dc716bf5d3ce3
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Dec 04 00:47:07 2020 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Dec 07 10:08:10 2020 +0100
tree e8868d1605a137f5442198b0a22ab5e2187d0dca
parent e09aeb4923f17449be7b8cda9a998e5c31ba273c

cipher_auth_xxcrypt_ext: Make NIST_KW case more robust

Don't invoke classic NIST_KW in case PSA gains support for NIST_KW.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 5031092..119e796 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -1537,8 +1537,12 @@
     CIPHER_VALIDATE_RET( olen != NULL );
 
 #if defined(MBEDTLS_NIST_KW_C)
-    if( MBEDTLS_MODE_KW == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_KWP == ctx->cipher_info->mode )
+    if(
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+        ctx->psa_enabled == 0 &&
+#endif
+        ( MBEDTLS_MODE_KW == ctx->cipher_info->mode ||
+          MBEDTLS_MODE_KWP == ctx->cipher_info->mode ) )
     {
         mbedtls_nist_kw_mode_t mode = ( MBEDTLS_MODE_KW == ctx->cipher_info->mode ) ?
                                         MBEDTLS_KW_MODE_KW : MBEDTLS_KW_MODE_KWP;
@@ -1586,8 +1590,12 @@
     CIPHER_VALIDATE_RET( olen != NULL );
 
 #if defined(MBEDTLS_NIST_KW_C)
-    if( MBEDTLS_MODE_KW == ctx->cipher_info->mode ||
-        MBEDTLS_MODE_KWP == ctx->cipher_info->mode )
+    if(
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+        ctx->psa_enabled == 0 &&
+#endif
+        ( MBEDTLS_MODE_KW == ctx->cipher_info->mode ||
+          MBEDTLS_MODE_KWP == ctx->cipher_info->mode ) )
     {
         mbedtls_nist_kw_mode_t mode = ( MBEDTLS_MODE_KW == ctx->cipher_info->mode ) ?
                                         MBEDTLS_KW_MODE_KW : MBEDTLS_KW_MODE_KWP;