mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-02-04 15:39:53 +00:00
Merge pull request #9915 from Harry-Ramsey/move-ssl-macros-development
Move MbedTLS Macros
This commit is contained in:
commit
2a992bf39b
@ -1 +1 @@
|
||||
Subproject commit 8296a73ce0cb31fadf411b6929a3201beece37a5
|
||||
Subproject commit 78f70ca80f9d382aa45209a2b6cd0775c69723d4
|
@ -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) && \
|
||||
|
@ -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"
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit df85eda50d5cd7dbbd06843eaf4ca2c5ee27a874
|
||||
Subproject commit d6031a2ad2e5f420ecc532bdd24c4998c9d6fc92
|
Loading…
x
Reference in New Issue
Block a user