commit 110ea816ca2b6c74e68d2baecbc302a23b77f535
author David Brown <david.brown@linaro.org> Mon Mar 15 15:30:28 2021 -0600
committer David Brown <david.brown@linaro.org> Mon Mar 15 15:30:28 2021 -0600
tree c2012a4b1f653da3e32543fd68c4be45dbc0b876
parent 85537fa141ef4046b42650f37df2994ee5fd4f71

psa: Fix name of BRAINPOOL configs

These should be WANT_ECC_BRAINPOOL_P_... not WANT_ECC_BP_...  Change to
match.

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

include/mbedtls/config_psa.h

diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 8fb8153..74090af 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -411,26 +411,26 @@
 #endif /* !MBEDTLS_PSA_ACCEL_ECC_SECP_K1_256 */
 #endif /* PSA_WANT_ECC_SECP_K1_256 */
 
-#if defined(PSA_WANT_ECC_BP_R1_256)
-#if !defined(MBEDTLS_PSA_ACCEL_ECC_BP_R1_256)
+#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
+#if !defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256)
 #define MBEDTLS_ECP_DP_BP256R1_ENABLED
-#define MBEDTLS_PSA_BUILTIN_ECC_BP_R1_256 1
-#endif /* !MBEDTLS_PSA_ACCEL_ECC_BP_R1_256 */
-#endif /* PSA_WANT_ECC_BP_R1_256 */
+#define MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_256 1
+#endif /* !MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256 */
+#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_256 */
 
-#if defined(PSA_WANT_ECC_BP_R1_384)
-#if !defined(MBEDTLS_PSA_ACCEL_ECC_BP_R1_384)
+#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
+#if !defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_384)
 #define MBEDTLS_ECP_DP_BP384R1_ENABLED
-#define MBEDTLS_PSA_BUILTIN_ECC_BP_R1_384 1
-#endif /* !MBEDTLS_PSA_ACCEL_ECC_BP_R1_384 */
-#endif /* PSA_WANT_ECC_BP_R1_384 */
+#define MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_384 1
+#endif /* !MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_384 */
+#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_384 */
 
-#if defined(PSA_WANT_ECC_BP_R1_512)
-#if !defined(MBEDTLS_PSA_ACCEL_ECC_BP_R1_512)
+#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
+#if !defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_512)
 #define MBEDTLS_ECP_DP_BP512R1_ENABLED
-#define MBEDTLS_PSA_BUILTIN_ECC_BP_R1_512 1
-#endif /* !MBEDTLS_PSA_ACCEL_ECC_BP_R1_512 */
-#endif /* PSA_WANT_ECC_BP_R1_512 */
+#define MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_512 1
+#endif /* !MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_512 */
+#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_512 */
 
 #if defined(PSA_WANT_ECC_MONTGOMERY_255)
 #if !defined(MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_255)
@@ -663,18 +663,18 @@
 #endif
 
 #if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
-#define MBEDTLS_PSA_BUILTIN_ECC_BP_R1_256 1
-#define PSA_WANT_ECC_BP_R1_256
+#define MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_256 1
+#define PSA_WANT_ECC_BRAINPOOL_P_R1_256
 #endif
 
 #if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
-#define MBEDTLS_PSA_BUILTIN_ECC_BP_R1_384 1
-#define PSA_WANT_ECC_BP_R1_384
+#define MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_384 1
+#define PSA_WANT_ECC_BRAINPOOL_P_R1_384
 #endif
 
 #if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
-#define MBEDTLS_PSA_BUILTIN_ECC_BP_R1_512 1
-#define PSA_WANT_ECC_BP_R1_512
+#define MBEDTLS_PSA_BUILTIN_ECC_BRAINPOOL_P_R1_512 1
+#define PSA_WANT_ECC_BRAINPOOL_P_R1_512
 #endif
 
 #if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)

include/psa/crypto_config.h

diff --git a/include/psa/crypto_config.h b/include/psa/crypto_config.h
index f8d7a1b..22b5181 100644
--- a/include/psa/crypto_config.h
+++ b/include/psa/crypto_config.h
@@ -80,9 +80,9 @@
 #define PSA_WANT_ALG_TLS12_PSK_TO_MS            1
 #define PSA_WANT_ALG_XTS                        1
 
-#define PSA_WANT_ECC_BP_R1_256                  1
-#define PSA_WANT_ECC_BP_R1_384                  1
-#define PSA_WANT_ECC_BP_R1_512                  1
+#define PSA_WANT_ECC_BRAINPOOL_P_R1_256                  1
+#define PSA_WANT_ECC_BRAINPOOL_P_R1_384                  1
+#define PSA_WANT_ECC_BRAINPOOL_P_R1_512                  1
 #define PSA_WANT_ECC_MONTGOMERY_255             1
 #define PSA_WANT_ECC_MONTGOMERY_448             1
 #define PSA_WANT_ECC_SECP_K1_192                1