Merge branch 'bugfix/mbedtls_tls1_3' into 'master'

mbedtls: Disable `MBEDTLS_DYNAMIC_BUFFER` when TLS 1.3 is enabled

See merge request espressif/esp-idf!17415
This commit is contained in:
Aditya Patwardhan
2022-03-12 16:24:14 +08:00
2 changed files with 3 additions and 2 deletions

View File

@@ -172,10 +172,10 @@ menu "mbedTLS"
default 4 if MBEDTLS_DEBUG_LEVEL_VERBOSE default 4 if MBEDTLS_DEBUG_LEVEL_VERBOSE
menu "mbedTLS v3.x related" menu "mbedTLS v3.x related"
# NOTE: MBEDTLS_DYNAMIC_BUFFER feature is not supported with TLS 1.3 yet. Ref: IDF-4762
config MBEDTLS_SSL_PROTO_TLS1_3 config MBEDTLS_SSL_PROTO_TLS1_3
bool "Support TLS 1.3 protocol" bool "Support TLS 1.3 protocol"
depends on MBEDTLS_TLS_ENABLED depends on MBEDTLS_TLS_ENABLED && MBEDTLS_SSL_KEEP_PEER_CERTIFICATE && !MBEDTLS_DYNAMIC_BUFFER
select MBEDTLS_HKDF_C select MBEDTLS_HKDF_C
default n default n

View File

@@ -8,6 +8,7 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <stdbool.h>
/* ToDo - Remove this once appropriate solution is available. /* ToDo - Remove this once appropriate solution is available.
We need to define this for the file as ssl_misc.h uses private structures from mbedtls, We need to define this for the file as ssl_misc.h uses private structures from mbedtls,
which are undefined if the following flag is not defined */ which are undefined if the following flag is not defined */