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

Move MbedTLS Macros
Mbed-TLS · Feb 4, 2025 · 2a992bf · 2a992bf
2 parents 70fbf41 + 93a496e
commit 2a992bf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/framework b/framework
diff --git 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) && \

diff --git 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"

diff --git a/tf-psa-crypto b/tf-psa-crypto
+3 −3		.github/pull_request_template.md
+323 −157		scripts/check_names.py
+20 −0		configs/README.txt
+28 −0		configs/crypto-config-ccm-aes-sha256.h
+91 −0		configs/crypto-config-symmetric-only.h
+22 −0		configs/ext/README.md
+644 −0		configs/ext/crypto_config_profile_medium.h
+2 −2		drivers/builtin/include/mbedtls/asn1.h
+2 −2		drivers/builtin/include/mbedtls/asn1write.h
+3 −7		drivers/builtin/include/mbedtls/cipher.h
+1 −4		drivers/builtin/include/mbedtls/config_adjust_legacy_crypto.h
+2 −3		drivers/builtin/include/mbedtls/ecp.h
+3 −3		drivers/builtin/include/mbedtls/oid.h
+2 −2		drivers/builtin/src/asn1parse.c
+2 −2		drivers/builtin/src/asn1write.c
+0 −5		drivers/builtin/src/check_crypto_config.h
+0 −3		drivers/builtin/src/entropy_poll.c
+8 −8		drivers/builtin/src/oid.c
+0 −4		drivers/builtin/src/psa_util_internal.h
+1 −1		framework
+7 −0		tests/scripts/components-basic-checks.sh
+1 −1		tests/suites/test_suite_oid.function