espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 05:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/esp_https_client_compile_warning_v4.3' into 'release/v4.3'

Browse Source 
esp_https_ota: Fix build warning when CONFIG_OTA_ALLOW_HTTP is set (v4.3)

See merge request espressif/esp-idf!19981
This commit is contained in:
Mahavir Jain
2022-09-08 13:56:36 +08:00
parent 1dbab6dfc4 ead1587caf
commit b4d7495e0d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_https_ota/src/esp_https_ota.c
View File

@@ -163,7 +163,7 @@ static esp_err_t _ota_write(esp_https_ota_t *https_ota_handle, const void *buffe
static bool is_server_verification_enabled(esp_https_ota_config_t *ota_config) { static bool is_server_verification_enabled(esp_https_ota_config_t *ota_config) {
return (ota_config->http_config->cert_pem return (ota_config->http_config->cert_pem
|| ota_config->http_config->use_global_ca_store || ota_config->http_config->use_global_ca_store
|| !(ota_config->http_config->crt_bundle_attach == NULL)); || ota_config->http_config->crt_bundle_attach != NULL);
} }
esp_err_t esp_https_ota_begin(esp_https_ota_config_t *ota_config, esp_https_ota_handle_t *handle) esp_err_t esp_https_ota_begin(esp_https_ota_config_t *ota_config, esp_https_ota_handle_t *handle)
@@ -178,13 +178,15 @@ esp_err_t esp_https_ota_begin(esp_https_ota_config_t *ota_config, esp_https_ota_
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
#if !CONFIG_OTA_ALLOW_HTTP
if (!is_server_verification_enabled(ota_config)) { if (!is_server_verification_enabled(ota_config)) {
#if CONFIG_OTA_ALLOW_HTTP
ESP_LOGW(TAG, "Continuing with insecure option because CONFIG_OTA_ALLOW_HTTP is set.");
#else
ESP_LOGE(TAG, "No option for server verification is enabled in esp_http_client config."); ESP_LOGE(TAG, "No option for server verification is enabled in esp_http_client config.");
*handle = NULL; *handle = NULL;
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
}
#endif #endif
}
esp_https_ota_t *https_ota_handle = calloc(1, sizeof(esp_https_ota_t)); esp_https_ota_t *https_ota_handle = calloc(1, sizeof(esp_https_ota_t));
if (!https_ota_handle) { if (!https_ota_handle) {