commit bed21b55a6525a173eedb8c6615743a340952ace
author Elena Uziunaite <elena.uziunaite@arm.com> Tue Aug 27 11:56:25 2024 +0100
committer Elena Uziunaite <elena.uziunaite@arm.com> Mon Sep 09 11:18:10 2024 +0100
tree 4a76c8a78047ea6357af04ec3a1d7caa114f224f
parent 39c7d5dc4bd1f9da65523f7aa96314159d79946e

Replace MBEDTLS_PK_CAN_ECDSA_VERIFY  with PSA_HAVE_ALG_ECDSA_VERIFY

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

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 6435783..31ec2fd 100644
--- a/tf-psa-crypto/drivers/builtin/src/pk_wrap.c
+++ b/tf-psa-crypto/drivers/builtin/src/pk_wrap.c
@@ -526,7 +526,7 @@
 #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
 }
 
-#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY)
+#if defined(PSA_HAVE_ALG_ECDSA_VERIFY)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
 /* Common helper for ECDSA verify using PSA functions. */
 static int ecdsa_verify_psa(unsigned char *key, size_t key_len,
@@ -679,7 +679,7 @@
     return ret;
 }
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
-#endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#endif /* PSA_HAVE_ALG_ECDSA_VERIFY */
 
 #if defined(PSA_HAVE_ALG_ECDSA_SIGN)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
@@ -1109,16 +1109,16 @@
     .name = "EC",
     .get_bitlen = eckey_get_bitlen,
     .can_do = eckey_can_do,
-#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY)
+#if defined(PSA_HAVE_ALG_ECDSA_VERIFY)
     .verify_func = ecdsa_verify_wrap,   /* Compatible key structures */
-#else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#else /* PSA_HAVE_ALG_ECDSA_VERIFY */
     .verify_func = NULL,
-#endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#endif /* PSA_HAVE_ALG_ECDSA_VERIFY */
 #if defined(PSA_HAVE_ALG_ECDSA_SIGN)
     .sign_func = ecdsa_sign_wrap,   /* Compatible key structures */
-#else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#else /* PSA_HAVE_ALG_ECDSA_VERIFY */
     .sign_func = NULL,
-#endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#endif /* PSA_HAVE_ALG_ECDSA_VERIFY */
 #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
     .verify_rs_func = eckey_verify_rs_wrap,
     .sign_rs_func = eckey_sign_rs_wrap,
@@ -1234,11 +1234,11 @@
     .name = "ECDSA",
     .get_bitlen = eckey_get_bitlen,     /* Compatible key structures */
     .can_do = ecdsa_can_do,
-#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY)
+#if defined(PSA_HAVE_ALG_ECDSA_VERIFY)
     .verify_func = ecdsa_verify_wrap,   /* Compatible key structures */
-#else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#else /* PSA_HAVE_ALG_ECDSA_VERIFY */
     .verify_func = NULL,
-#endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#endif /* PSA_HAVE_ALG_ECDSA_VERIFY */
 #if defined(PSA_HAVE_ALG_ECDSA_SIGN)
     .sign_func = ecdsa_sign_wrap,   /* Compatible key structures */
 #else /* PSA_HAVE_ALG_ECDSA_SIGN */
@@ -1426,11 +1426,11 @@
     .name = "Opaque",
     .get_bitlen = opaque_get_bitlen,
     .can_do = ecdsa_opaque_can_do,
-#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY)
+#if defined(PSA_HAVE_ALG_ECDSA_VERIFY)
     .verify_func = ecdsa_opaque_verify_wrap,
-#else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#else /* PSA_HAVE_ALG_ECDSA_VERIFY */
     .verify_func = NULL,
-#endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */
+#endif /* PSA_HAVE_ALG_ECDSA_VERIFY */
 #if defined(PSA_HAVE_ALG_ECDSA_SIGN)
     .sign_func = ecdsa_opaque_sign_wrap,
 #else /* PSA_HAVE_ALG_ECDSA_SIGN */