commit a6950b8ce7342c13c598f98e7ab1eb38144451c4
author Elena Uziunaite <elena.uziunaite@arm.com> Tue Jul 30 13:55:59 2024 +0100
committer Elena Uziunaite <elena.uziunaite@arm.com> Mon Sep 09 11:17:36 2024 +0100
tree 819dc76af18646466868bbfe0d36c019e044677c
parent 8c95999b3828f1b3e7a069e61c2b33b9f509e446

Replace MBEDTLS_PK_CAN_ECDSA_SOME with PSA_HAVE_ALG_SOME_ECDSA

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

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 0e7896c..862f09d 100644
--- a/tf-psa-crypto/drivers/builtin/src/oid.c
+++ b/tf-psa-crypto/drivers/builtin/src/oid.c
@@ -426,7 +426,7 @@
     },
 #endif /* PSA_WANT_ALG_SHA_1 */
 #endif /* MBEDTLS_RSA_C */
-#if defined(MBEDTLS_PK_CAN_ECDSA_SOME)
+#if defined(PSA_HAVE_ALG_SOME_ECDSA)
 #if defined(PSA_WANT_ALG_SHA_1)
     {
         OID_DESCRIPTOR(MBEDTLS_OID_ECDSA_SHA1,       "ecdsa-with-SHA1",      "ECDSA with SHA1"),
@@ -457,7 +457,7 @@
         MBEDTLS_MD_SHA512,   MBEDTLS_PK_ECDSA,
     },
 #endif /* PSA_WANT_ALG_SHA_512 */
-#endif /* MBEDTLS_PK_CAN_ECDSA_SOME */
+#endif /* PSA_HAVE_ALG_SOME_ECDSA */
 #if defined(MBEDTLS_RSA_C)
     {
         OID_DESCRIPTOR(MBEDTLS_OID_RSASSA_PSS,        "RSASSA-PSS",           "RSASSA-PSS"),

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

diff --git a/tf-psa-crypto/drivers/builtin/src/pk.c b/tf-psa-crypto/drivers/builtin/src/pk.c
index b97f438..28b4e7a 100644
--- a/tf-psa-crypto/drivers/builtin/src/pk.c
+++ b/tf-psa-crypto/drivers/builtin/src/pk.c
@@ -124,10 +124,10 @@
         case MBEDTLS_PK_ECKEY_DH:
             return &mbedtls_eckeydh_info;
 #endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY */
-#if defined(MBEDTLS_PK_CAN_ECDSA_SOME)
+#if defined(PSA_HAVE_ALG_SOME_ECDSA)
         case MBEDTLS_PK_ECDSA:
             return &mbedtls_ecdsa_info;
-#endif /* MBEDTLS_PK_CAN_ECDSA_SOME */
+#endif /* PSA_HAVE_ALG_SOME_ECDSA */
         /* MBEDTLS_PK_RSA_ALT omitted on purpose */
         default:
             return NULL;

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

diff --git a/tf-psa-crypto/drivers/builtin/src/pk_wrap.c b/tf-psa-crypto/drivers/builtin/src/pk_wrap.c
index a9153a2..950ba67 100644
--- a/tf-psa-crypto/drivers/builtin/src/pk_wrap.c
+++ b/tf-psa-crypto/drivers/builtin/src/pk_wrap.c
@@ -36,7 +36,7 @@
 #include "rsa_internal.h"
 #endif
 
-#if defined(MBEDTLS_PK_CAN_ECDSA_SOME)
+#if defined(PSA_HAVE_ALG_SOME_ECDSA)
 #include "mbedtls/asn1write.h"
 #include "mbedtls/asn1.h"
 #endif
@@ -1171,7 +1171,7 @@
     .debug_func = eckey_debug,            /* Same underlying key structure */
 };
 
-#if defined(MBEDTLS_PK_CAN_ECDSA_SOME)
+#if defined(PSA_HAVE_ALG_SOME_ECDSA)
 static int ecdsa_can_do(mbedtls_pk_type_t type)
 {
     return type == MBEDTLS_PK_ECDSA;
@@ -1262,7 +1262,7 @@
 #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
     .debug_func = eckey_debug,        /* Compatible key structures */
 };
-#endif /* MBEDTLS_PK_CAN_ECDSA_SOME */
+#endif /* PSA_HAVE_ALG_SOME_ECDSA */
 #endif /* PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY */
 
 #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)

tf-psa-crypto/drivers/builtin/src/pk_wrap.h

diff --git a/tf-psa-crypto/drivers/builtin/src/pk_wrap.h b/tf-psa-crypto/drivers/builtin/src/pk_wrap.h
index 5f5f6b0..976ef7f 100644
--- a/tf-psa-crypto/drivers/builtin/src/pk_wrap.h
+++ b/tf-psa-crypto/drivers/builtin/src/pk_wrap.h
@@ -113,7 +113,7 @@
 extern const mbedtls_pk_info_t mbedtls_eckeydh_info;
 #endif
 
-#if defined(MBEDTLS_PK_CAN_ECDSA_SOME)
+#if defined(PSA_HAVE_ALG_SOME_ECDSA)
 extern const mbedtls_pk_info_t mbedtls_ecdsa_info;
 #endif