commit 2a992bf39b6d6cadc46009ede5ee08ed2b7c0fa7
author Ronald Cron <ronald.cron@arm.com> Tue Feb 04 10:25:05 2025 +0000
committer GitHub <noreply@github.com> Tue Feb 04 10:25:05 2025 +0000
tree 6876fc0e1d69cb545146146ad557d273f634b15d
parent 70fbf417600986750065896563563ce80229fbd1
parent 93a496e8772e6a6371487d317c1bc90affdbc76b

Merge pull request #9915 from Harry-Ramsey/move-ssl-macros-development

Move MbedTLS Macros

framework

diff --git a/framework b/framework
index 8296a73..78f70ca 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 8296a73ce0cb31fadf411b6929a3201beece37a5
+Subproject commit 78f70ca80f9d382aa45209a2b6cd0775c69723d4

include/mbedtls/check_config.h

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 0661359..819ea0a 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -174,6 +174,11 @@
         "but no key exchange methods defined with MBEDTLS_KEY_EXCHANGE_xxxx"
 #endif
 
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2) && \
+    !(defined(PSA_WANT_ALG_SHA_1) || defined(PSA_WANT_ALG_SHA_256) || defined(PSA_WANT_ALG_SHA_512))
+#error "MBEDTLS_SSL_PROTO_TLS1_2 defined, but not all prerequisites"
+#endif
+
 #if defined(MBEDTLS_SSL_EARLY_DATA) && \
     ( !defined(MBEDTLS_SSL_SESSION_TICKETS) || \
       ( !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED) && \

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 8c2ad47..9f91861 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -20,6 +20,7 @@
 
 #include "psa/crypto.h"
 #include "psa_util_internal.h"
+extern const mbedtls_error_pair_t psa_to_ssl_errors[7];
 
 #if defined(PSA_WANT_ALG_MD5)
 #include "mbedtls/md5.h"

tf-psa-crypto

diff --git a/tf-psa-crypto b/tf-psa-crypto
index df85eda..d6031a2 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit df85eda50d5cd7dbbd06843eaf4ca2c5ee27a874
+Subproject commit d6031a2ad2e5f420ecc532bdd24c4998c9d6fc92