commit 12ca50307f0335416fd445688a3ea58495f4fad9
author David Brown <david.brown@linaro.org> Thu Feb 11 11:02:00 2021 -0700
committer David Brown <david.brown@linaro.org> Tue Feb 16 13:26:20 2021 -0700
tree 85342c5e208a28324fcb37878b8ae65adec48ea3
parent db01e0271f12f135d3ad1aa1df36c36cf64294ce

Change some conditionals of PSA to use BUILTIN

Change a few conditionals in the psa library to be based on the
MBEDTLS_PSA_BUILTIN_KEY_TYPE_DES instead of the WANT macros.  Future
additions of HW acceleration will need to be mindful of these
definitions if any of this code is needed in those instances.

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 9b3305f..d7a14d3 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3875,7 +3875,7 @@
     if( ret != 0 )
         goto exit;
 
-#if defined(PSA_WANT_KEY_TYPE_DES)
+#if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DES)
     if( slot->attr.type == PSA_KEY_TYPE_DES && key_bits == 128 )
     {
         /* Two-key Triple-DES is 3-key Triple-DES with K1=K3 */
@@ -5095,7 +5095,7 @@
     status = psa_key_derivation_output_bytes( operation, data, bytes );
     if( status != PSA_SUCCESS )
         goto exit;
-#if defined(PSA_WANT_KEY_TYPE_DES)
+#if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DES)
     if( slot->attr.type == PSA_KEY_TYPE_DES )
         psa_des_set_key_parity( data, bytes );
 #endif /* PSA_WANT_KEY_TYPE_DES */
@@ -6029,7 +6029,7 @@
         if( status != PSA_SUCCESS )
             return( status );
 
-#if defined(PSA_WANT_KEY_TYPE_DES)
+#if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DES)
         if( type == PSA_KEY_TYPE_DES )
             psa_des_set_key_parity( key_buffer, key_buffer_size );
 #endif /* MBEDTLS_DES_C */