commit a363286c9f330d5083774b0a6533154f3cceea5e
author Elena Uziunaite <elena.uziunaite@arm.com> Thu Jul 04 13:52:43 2024 +0100
committer Elena Uziunaite <elena.uziunaite@arm.com> Mon Jul 15 11:24:49 2024 +0300
tree 461a849e4719c5c9217bd8c2ea77d53861e1163f
parent f974bff38c958f1f3ca997253f002a7b179952ab

Replace MBEDTLS_ECP_HAVE_SECP192R1 with PSA_WANT_ECC_SECP_R1_192

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

tf-psa-crypto/core/psa_util.c

diff --git a/tf-psa-crypto/core/psa_util.c b/tf-psa-crypto/core/psa_util.c
index 4ccc5b0..f74ea12 100644
--- a/tf-psa-crypto/core/psa_util.c
+++ b/tf-psa-crypto/core/psa_util.c
@@ -190,7 +190,7 @@
                                           size_t *bits)
 {
     switch (grpid) {
-#if defined(MBEDTLS_ECP_HAVE_SECP192R1)
+#if defined(PSA_WANT_ECC_SECP_R1_192)
         case MBEDTLS_ECP_DP_SECP192R1:
             *bits = 192;
             return PSA_ECC_FAMILY_SECP_R1;

tf-psa-crypto/drivers/builtin/src/oid.c

diff --git a/tf-psa-crypto/drivers/builtin/src/oid.c b/tf-psa-crypto/drivers/builtin/src/oid.c
index a182066..253c28f 100644
--- a/tf-psa-crypto/drivers/builtin/src/oid.c
+++ b/tf-psa-crypto/drivers/builtin/src/oid.c
@@ -542,12 +542,12 @@
 
 static const oid_ecp_grp_t oid_ecp_grp[] =
 {
-#if defined(MBEDTLS_ECP_HAVE_SECP192R1)
+#if defined(PSA_WANT_ECC_SECP_R1_192)
     {
         OID_DESCRIPTOR(MBEDTLS_OID_EC_GRP_SECP192R1, "secp192r1",    "secp192r1"),
         MBEDTLS_ECP_DP_SECP192R1,
     },
-#endif /* MBEDTLS_ECP_HAVE_SECP192R1 */
+#endif /* PSA_WANT_ECC_SECP_R1_192 */
 #if defined(MBEDTLS_ECP_HAVE_SECP224R1)
     {
         OID_DESCRIPTOR(MBEDTLS_OID_EC_GRP_SECP224R1, "secp224r1",    "secp224r1"),