mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 03:00:34 +03:00
Merge branch 'feat/update_mbedtls_3.6.3_v5.4' into 'release/v5.4'
feat(component/mbedtls): update to upstream v3.6.3 (v5.4) See merge request espressif/esp-idf!38178
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
@@ -713,6 +713,8 @@ esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls_cfg_t
|
||||
return ESP_ERR_MBEDTLS_SSL_SET_HOSTNAME_FAILED;
|
||||
}
|
||||
free(use_host);
|
||||
} else {
|
||||
mbedtls_ssl_set_hostname(&tls->ssl, NULL);
|
||||
}
|
||||
|
||||
if ((ret = mbedtls_ssl_config_defaults(&tls->conf,
|
||||
@@ -789,7 +791,7 @@ esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls_cfg_t
|
||||
#endif
|
||||
#ifdef CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS
|
||||
} else if (cfg->client_session != NULL) {
|
||||
ESP_LOGD(TAG, "Resuing the saved client session");
|
||||
ESP_LOGD(TAG, "Reusing the saved client session");
|
||||
#endif
|
||||
} else {
|
||||
#ifdef CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY
|
||||
|
||||
@@ -1262,4 +1262,11 @@ menu "mbedTLS"
|
||||
which is added through vfs component for ESP32 based targets or by
|
||||
the host system when the target is Linux.
|
||||
|
||||
config MBEDTLS_ALLOW_WEAK_CERTIFICATE_VERIFICATION
|
||||
bool "Allow weak certificate verification"
|
||||
default n
|
||||
help
|
||||
This options allows weak certificate verification by skipping the hostname verification.
|
||||
It is not recommended to use this option.
|
||||
|
||||
endmenu # mbedTLS
|
||||
|
||||
Submodule components/mbedtls/mbedtls updated: 98fcfd6d2c...601990b1d8
@@ -2117,6 +2117,21 @@
|
||||
#undef MBEDTLS_ERROR_C
|
||||
#endif
|
||||
|
||||
/**
|
||||
* \def MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
|
||||
*
|
||||
* Caller: library/ssl_tls.c
|
||||
*
|
||||
* Allow weak certificate verification without a hostname.
|
||||
* This option is not recommended for production use.
|
||||
*/
|
||||
|
||||
#if CONFIG_MBEDTLS_ALLOW_WEAK_CERTIFICATE_VERIFICATION
|
||||
#define MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
|
||||
#else
|
||||
#undef MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
|
||||
#endif
|
||||
|
||||
/**
|
||||
* \def MBEDTLS_GCM_C
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user