mirror of
https://github.com/Mbed-TLS/mbedtls-framework.git
synced 2026-09-11 12:49:54 +00:00
Merge pull request #9915 from Harry-Ramsey/move-ssl-macros-development
Move MbedTLS Macros
This commit is contained in:
+1
-1
Submodule framework updated: 8296a73ce0...78f70ca80f
@@ -174,6 +174,11 @@
|
|||||||
"but no key exchange methods defined with MBEDTLS_KEY_EXCHANGE_xxxx"
|
"but no key exchange methods defined with MBEDTLS_KEY_EXCHANGE_xxxx"
|
||||||
#endif
|
#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) && \
|
#if defined(MBEDTLS_SSL_EARLY_DATA) && \
|
||||||
( !defined(MBEDTLS_SSL_SESSION_TICKETS) || \
|
( !defined(MBEDTLS_SSL_SESSION_TICKETS) || \
|
||||||
( !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED) && \
|
( !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED) && \
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
|
|
||||||
#include "psa/crypto.h"
|
#include "psa/crypto.h"
|
||||||
#include "psa_util_internal.h"
|
#include "psa_util_internal.h"
|
||||||
|
extern const mbedtls_error_pair_t psa_to_ssl_errors[7];
|
||||||
|
|
||||||
#if defined(PSA_WANT_ALG_MD5)
|
#if defined(PSA_WANT_ALG_MD5)
|
||||||
#include "mbedtls/md5.h"
|
#include "mbedtls/md5.h"
|
||||||
|
|||||||
+1
-1
Submodule tf-psa-crypto updated: df85eda50d...d6031a2ad2
Reference in New Issue
Block a user