commit 0ea39e0ee49267df3f6dfcf412e2a4c97c85e98b
author John Durkop <john.durkop@fermatsoftware.com> Tue Oct 13 19:58:20 2020 -0700
committer John Durkop <john.durkop@fermatsoftware.com> Thu Oct 15 07:39:02 2020 -0700
tree 6ed6ea35ddac285100f5258b0b272369b2d09450
parent 7b453130e26d1579b93c254a986216c90c216c52

Correct use of MBEDTLS_PSA_BUILTIN_ALG_xxx in crypto library

The psa crypto library was generically using PSA_WANT_ALG_xxx, but
should have been using the correct MBEDTLS_PSA_BUILTIN_ALG_xxx
definition since that code is the builtin version. There were also
a couple of spots that needed to ensure the code block was enabled
for either ECDSA or DETERMINISTIC_ECDSA, not just one of them.

Fixed all the new ALG_ECDSA_DETERMINISTIC names to be
ALG_DETERMINISTIC_ECDSA instead.

Fixed test to use correct definitions.

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 87c092a..9a1a1ef 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -47,11 +47,11 @@
 #endif /* !MBEDTLS_PSA_ACCEL_ALG_ECDSA */
 #endif /* PSA_WANT_ALG_ECDSA */
 
-#if defined(PSA_WANT_ALG_ECDSA_DETERMINISTIC)
-#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC)
-#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA_DETERMINISTIC     1
+#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
+#if !defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA)
+#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA     1
 #define MBEDTLS_ECDSA_DETERMINISTIC
-#endif /* MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC */
+#endif /* MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA */
 #endif /* PSA_WANT_ALG_DETERMINISTIC_ECDSA */
 
 #else /* MBEDTLS_PSA_CRYPTO_CONFIG */
@@ -61,11 +61,11 @@
  * is not defined
  */
 #if defined(MBEDTLS_ECDSA_C)
-#define PSA_WANT_ALG_ECDSA
+#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA
 #endif /* MBEDTLS_ECDSA_C */
 
 #if defined(MBEDTLS_ECDSA_DETERMINISTIC)
-#define PSA_WANT_ALG_ECDSA_DETERMINISTIC
+#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA
 #endif /* MBEDTLS_ECDSA_DETERMINISTIC */
 
 #endif /* MBEDTLS_PSA_CRYPTO_CONFIG */

include/psa/crypto_config.h

diff --git a/include/psa/crypto_config.h b/include/psa/crypto_config.h
index 28702eb..8dbb18d 100644
--- a/include/psa/crypto_config.h
+++ b/include/psa/crypto_config.h
@@ -50,7 +50,7 @@
 #ifndef PSA_CRYPTO_CONFIG_H
 #define PSA_CRYPTO_CONFIG_H
 
-#define PSA_WANT_ALG_ECDSA                  1
-#define PSA_WANT_ALG_ECDSA_DETERMINISTIC    1
+#define PSA_WANT_ALG_ECDSA                      1
+#define PSA_WANT_ALG_DETERMINISTIC_ECDSA        1
 
 #endif /* PSA_CRYPTO_CONFIG_H */