commit 2dfaf9ca23f6c36a3d6824e5572f04a2c75c4288
author John Durkop <john.durkop@fermatsoftware.com> Thu Sep 24 04:30:10 2020 -0700
committer John Durkop <john.durkop@fermatsoftware.com> Thu Sep 24 05:01:17 2020 -0700
tree f177a5835b13182b679d59d9f01fca8a7d85ca00
parent d8959390c522ff06843fb9f0401fa42b06309486

Update how MBEDTLS_PSA_CRYPTO_CONFIG is handled

Originally, MBEDTLS_PSA_CRYPTO_CONFIG was being used to allow
inclusion of mbedlts/config_psa.h, but that needed to be updated
so that mbedtls/config_psa.h is always included and the definitions
specific to PSA configuration are now guarded by
MBEDTLS_PSA_CRYPTO_CONFIG. This will allow for the standard setup
to continue working while new PSA configuration items to also work.

Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>

include/mbedtls/config_psa.h

diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 376834a..528e215 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -32,22 +32,25 @@
 extern "C" {
 #endif
 
-//#define PSA_WANT_ALG_ECDSA
-//#define MBEDTLS_PSA_ACCEL_ALG_ECDSA
-//#define PSA_WANT_ALG_ECDSA_DETERMINISTIC
-//#define MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC
+#if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
 
-#if defined(PSA_WANT_ALG_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)
+#if defined(PSA_WANT_ALG_ECDSA)
+#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)
 #define MBEDTLS_PSA_BUILTIN_ALG_ECDSA
-#else /* defined(PSA_WANT_ALG_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)*/
+#else /* !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) */
 #define MBEDTLS_ECDSA_C
-#endif /* defined(PSA_WANT_ALG_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)*/
+#endif /* !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) */
+#endif /* defined(PSA_WANT_ALG_ECDSA) */
 
-#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC)
+#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
+#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC)
 #define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA
-#else /* defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */
+#else /*  && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */
 #define MBEDTLS_ECDSA_DETERMINISTIC
-#endif /* defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */
+#endif /* !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */
+#endif /* defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) */
+
+#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
 
 #ifdef __cplusplus
 }