commit 2fbe012f03987415417dabb758ace7de88949827
author Elena Uziunaite <elena.uziunaite@arm.com> Fri May 31 11:41:57 2024 +0100
committer Elena Uziunaite <elena.uziunaite@arm.com> Thu Jul 04 19:41:02 2024 +0100
tree 60d3de0fadc1883184521d02b0e463de14551e20
parent 4efd1645e81cf96444c16737cc8d965a7c1fc071

Replace MBEDTLS_MD_CAN_SHA3_256 with PSA_WANT_ALG_SHA3_256

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

library/md.c

diff --git a/library/md.c b/library/md.c
index 2586827..7e0465d 100644
--- a/library/md.c
+++ b/library/md.c
@@ -118,7 +118,7 @@
 };
 #endif
 
-#if defined(MBEDTLS_MD_CAN_SHA3_256)
+#if defined(PSA_WANT_ALG_SHA3_256)
 static const mbedtls_md_info_t mbedtls_sha3_256_info = {
     MD_INFO(MBEDTLS_MD_SHA3_256, 32, 136)
 };
@@ -171,7 +171,7 @@
         case MBEDTLS_MD_SHA3_224:
             return &mbedtls_sha3_224_info;
 #endif
-#if defined(MBEDTLS_MD_CAN_SHA3_256)
+#if defined(PSA_WANT_ALG_SHA3_256)
         case MBEDTLS_MD_SHA3_256:
             return &mbedtls_sha3_256_info;
 #endif
@@ -812,7 +812,7 @@
     MBEDTLS_MD_SHA3_224,
 #endif
 
-#if defined(MBEDTLS_MD_CAN_SHA3_256)
+#if defined(PSA_WANT_ALG_SHA3_256)
     MBEDTLS_MD_SHA3_256,
 #endif
 
@@ -863,7 +863,7 @@
 #if defined(MBEDTLS_MD_CAN_SHA3_224)
     { "SHA3-224", MBEDTLS_MD_SHA3_224 },
 #endif
-#if defined(MBEDTLS_MD_CAN_SHA3_256)
+#if defined(PSA_WANT_ALG_SHA3_256)
     { "SHA3-256", MBEDTLS_MD_SHA3_256 },
 #endif
 #if defined(MBEDTLS_MD_CAN_SHA3_384)

library/oid.c

diff --git a/library/oid.c b/library/oid.c
index 825fcee..972a859 100644
--- a/library/oid.c
+++ b/library/oid.c
@@ -767,7 +767,7 @@
         MBEDTLS_MD_SHA3_224,
     },
 #endif
-#if defined(MBEDTLS_MD_CAN_SHA3_256)
+#if defined(PSA_WANT_ALG_SHA3_256)
     {
         OID_DESCRIPTOR(MBEDTLS_OID_DIGEST_ALG_SHA3_256,    "id-sha3-256",    "SHA-3-256"),
         MBEDTLS_MD_SHA3_256,
@@ -845,12 +845,12 @@
         MBEDTLS_MD_SHA3_224,
     },
 #endif /* MBEDTLS_MD_CAN_SHA3_224 */
-#if defined(MBEDTLS_MD_CAN_SHA3_256)
+#if defined(PSA_WANT_ALG_SHA3_256)
     {
         OID_DESCRIPTOR(MBEDTLS_OID_HMAC_SHA3_256,    "hmacSHA3-256",    "HMAC-SHA3-256"),
         MBEDTLS_MD_SHA3_256,
     },
-#endif /* MBEDTLS_MD_CAN_SHA3_256 */
+#endif /* PSA_WANT_ALG_SHA3_256 */
 #if defined(MBEDTLS_MD_CAN_SHA3_384)
     {
         OID_DESCRIPTOR(MBEDTLS_OID_HMAC_SHA3_384,    "hmacSHA3-384",    "HMAC-SHA3-384"),