Skip to content

Commit 3aaac6c

Browse files
committed
Merge branch 'bugfix/fix_build_failure_with_tls1_3_only' into 'master'
fix: Fixed build errors with TLS 1.3 only configuration See merge request espressif/esp-idf!32090
2 parents 346f31c + 61d1077 commit 3aaac6c

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

components/mbedtls/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ menu "mbedTLS"
771771

772772
config MBEDTLS_SSL_RENEGOTIATION
773773
bool "Support TLS renegotiation"
774-
depends on MBEDTLS_TLS_ENABLED
774+
depends on MBEDTLS_TLS_ENABLED && MBEDTLS_SSL_PROTO_TLS1_2
775775
default y
776776
help
777777
The two main uses of renegotiation are (1) refresh keys on long-lived

components/wpa_supplicant/esp_supplicant/src/crypto/tls_mbedtls.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ static uint16_t tls_sig_algs_for_suiteb[] = {
249249
#endif /* MBEDTLS_RSA_C && MBEDTLS_MD_CAN_SHA384 */
250250
#endif /* CONFIG_TLSV13 */
251251

252+
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
252253
#if defined(MBEDTLS_SHA512_C)
253254
#if defined(MBEDTLS_ECDSA_C)
254255
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA512),
@@ -259,6 +260,7 @@ static uint16_t tls_sig_algs_for_suiteb[] = {
259260
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA384),
260261
#endif
261262
#endif /* MBEDTLS_SHA512_C */
263+
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
262264
MBEDTLS_TLS_SIG_NONE
263265
};
264266

@@ -336,6 +338,7 @@ static uint16_t tls_sig_algs_for_eap[] = {
336338
#endif /* MBEDTLS_RSA_C && MBEDTLS_MD_CAN_SHA256 */
337339
#endif /* CONFIG_TLSV13 */
338340

341+
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
339342
#if defined(MBEDTLS_SHA512_C)
340343
#if defined(MBEDTLS_ECDSA_C)
341344
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_ECDSA, MBEDTLS_SSL_HASH_SHA512),
@@ -364,6 +367,7 @@ static uint16_t tls_sig_algs_for_eap[] = {
364367
MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG(MBEDTLS_SSL_SIG_RSA, MBEDTLS_SSL_HASH_SHA1),
365368
#endif
366369
#endif /* MBEDTLS_SHA1_C */
370+
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
367371
MBEDTLS_TLS_SIG_NONE
368372
};
369373

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
CONFIG_EXAMPLE_CONNECT_ETHERNET=y
2+
CONFIG_EXAMPLE_CONNECT_WIFI=n
3+
CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y
4+
CONFIG_EXAMPLE_ETH_PHY_IP101=y
5+
CONFIG_EXAMPLE_ETH_MDC_GPIO=23
6+
CONFIG_EXAMPLE_ETH_MDIO_GPIO=18
7+
CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5
8+
CONFIG_EXAMPLE_ETH_PHY_ADDR=1
9+
CONFIG_EXAMPLE_CONNECT_IPV6=y
10+
CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y
11+
CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH=y
12+
CONFIG_EXAMPLE_HTTP_ENDPOINT="httpbin.espressif.cn"
13+
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=n
14+
CONFIG_MBEDTLS_SSL_PROTO_TLS1_3=y

0 commit comments

Comments
 (0)