commit b66a991f0425922540c70935cb9bb43177df9900
author Elena Uziunaite <elena.uziunaite@arm.com> Fri May 10 14:25:58 2024 +0100
committer Elena Uziunaite <elena.uziunaite@arm.com> Thu Jul 18 14:31:59 2024 +0300
tree 201fbb50c0cc97202c7697a0daff6f27d4d61939
parent 7ab9867fa7e6d27f3129f719cc0073a0e01a6de2

Replace MBEDTLS_MD_CAN_MD5 with PSA_WANT_ALG_MD5

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

library/ssl_ciphersuites.c

diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c
index 8e8dd6c..0dde8c4 100644
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@@ -1331,7 +1331,7 @@
 
 #if defined(MBEDTLS_CIPHER_NULL_CIPHER)
 #if defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED)
-#if defined(MBEDTLS_MD_CAN_MD5)
+#if defined(PSA_WANT_ALG_MD5)
     { MBEDTLS_TLS_RSA_WITH_NULL_MD5, "TLS-RSA-WITH-NULL-MD5",
       MBEDTLS_CIPHER_NULL, MBEDTLS_MD_MD5, MBEDTLS_KEY_EXCHANGE_RSA,
       MBEDTLS_CIPHERSUITE_WEAK,

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 3f2973e..b1ae119 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -22,7 +22,7 @@
 #include "psa_util_internal.h"
 #endif
 
-#if defined(MBEDTLS_MD_CAN_MD5)
+#if defined(PSA_WANT_ALG_MD5)
 #include "mbedtls/md5.h"
 #endif
 
@@ -2517,7 +2517,7 @@
     unsigned char sig = MBEDTLS_BYTE_0(sig_alg);
 
     switch (hash) {
-#if defined(MBEDTLS_MD_CAN_MD5)
+#if defined(PSA_WANT_ALG_MD5)
         case MBEDTLS_SSL_HASH_MD5:
             break;
 #endif

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index f0adbc9..97212e9 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6132,7 +6132,7 @@
 mbedtls_md_type_t mbedtls_ssl_md_alg_from_hash(unsigned char hash)
 {
     switch (hash) {
-#if defined(MBEDTLS_MD_CAN_MD5)
+#if defined(PSA_WANT_ALG_MD5)
         case MBEDTLS_SSL_HASH_MD5:
             return MBEDTLS_MD_MD5;
 #endif
@@ -6167,7 +6167,7 @@
 unsigned char mbedtls_ssl_hash_from_md_alg(int md)
 {
     switch (md) {
-#if defined(MBEDTLS_MD_CAN_MD5)
+#if defined(PSA_WANT_ALG_MD5)
         case MBEDTLS_MD_MD5:
             return MBEDTLS_SSL_HASH_MD5;
 #endif

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index 199c4fb..34b6a5a 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -129,7 +129,7 @@
 static inline const char *md_type_to_string(mbedtls_md_type_t md_alg)
 {
     switch (md_alg) {
-#if defined(MBEDTLS_MD_CAN_MD5)
+#if defined(PSA_WANT_ALG_MD5)
         case MBEDTLS_MD_MD5:
             return "MD5";
 #endif