commit 0b5d48ebbf0faaabaa53ba681e9dd17764322eda
author Elena Uziunaite <elena.uziunaite@arm.com> Fri Jul 05 11:48:23 2024 +0100
committer Elena Uziunaite <elena.uziunaite@arm.com> Thu Jul 11 13:20:35 2024 +0300
tree 64d7432db8a772e93df8de510e43830b51c535dc
parent 1004c9cacb56c20da57cfbc8ab196e5d8bbeb4a7

Replace MBEDTLS_ECP_HAVE_CURVE* with PSA_WANT counterparts

Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index a2fd227..0e9e032 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5611,7 +5611,7 @@
  * about this list.
  */
 static const uint16_t ssl_preset_default_groups[] = {
-#if defined(MBEDTLS_ECP_HAVE_CURVE25519)
+#if defined(PSA_WANT_ECC_MONTGOMERY_255)
     MBEDTLS_SSL_IANA_TLS_GROUP_X25519,
 #endif
 #if defined(MBEDTLS_ECP_HAVE_SECP256R1)
@@ -5620,7 +5620,7 @@
 #if defined(MBEDTLS_ECP_HAVE_SECP384R1)
     MBEDTLS_SSL_IANA_TLS_GROUP_SECP384R1,
 #endif
-#if defined(MBEDTLS_ECP_HAVE_CURVE448)
+#if defined(PSA_WANT_ECC_MONTGOMERY_448)
     MBEDTLS_SSL_IANA_TLS_GROUP_X448,
 #endif
 #if defined(MBEDTLS_ECP_HAVE_SECP521R1)
@@ -6273,10 +6273,10 @@
 #if defined(MBEDTLS_ECP_HAVE_SECP192K1)
     { 18, MBEDTLS_ECP_DP_SECP192K1, PSA_ECC_FAMILY_SECP_K1, 192 },
 #endif
-#if defined(MBEDTLS_ECP_HAVE_CURVE25519)
+#if defined(PSA_WANT_ECC_MONTGOMERY_255)
     { 29, MBEDTLS_ECP_DP_CURVE25519, PSA_ECC_FAMILY_MONTGOMERY, 255 },
 #endif
-#if defined(MBEDTLS_ECP_HAVE_CURVE448)
+#if defined(PSA_WANT_ECC_MONTGOMERY_448)
     { 30, MBEDTLS_ECP_DP_CURVE448, PSA_ECC_FAMILY_MONTGOMERY, 448 },
 #endif
     { 0, MBEDTLS_ECP_DP_NONE, 0, 0 },