alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-22 00:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

esp_https_ota: Update esp_https_ota() to support OTA updates with encrypted images

Browse Source
This commit is contained in:
Harshit Malpani
2022-03-02 10:01:42 +05:30
parent 8b5ad2ab4f
commit de2f915092
5 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_https_ota/include/esp_https_ota.h
View File

@@ -53,9 +53,9 @@ typedef struct {
* reads image data from HTTP stream and writes it to OTA partition and
* finishes HTTPS OTA Firmware upgrade operation.
* This API supports URL redirection, but if CA cert of URLs differ then it
* should be appended to `cert_pem` member of `config`.
* should be appended to `cert_pem` member of `ota_config->http_config`.
*
* @param[in] config pointer to esp_http_client_config_t structure.
* @param[in] ota_config pointer to esp_https_ota_config_t structure.
*
* @note This API handles the entire OTA operation, so if this API is being used
* then no other APIs from `esp_https_ota` component should be called.
@@ -72,7 +72,7 @@ typedef struct {
* - ESP_ERR_FLASH_OP_TIMEOUT or ESP_ERR_FLASH_OP_FAIL: Flash write failed.
* - For other return codes, refer OTA documentation in esp-idf's app_update component.
*/
esp_err_t esp_https_ota(const esp_http_client_config_t *config);
esp_err_t esp_https_ota(const esp_https_ota_config_t *ota_config);
/**
* @brief Start HTTPS OTA Firmware upgrade
@@ -99,7 +99,7 @@ esp_err_t esp_https_ota(const esp_http_client_config_t *config);
* - For other return codes, refer documentation in app_update component and esp_http_client
* component in esp-idf.
*/
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(const esp_https_ota_config_t *ota_config, esp_https_ota_handle_t *handle);
/**
* @brief Read image data from HTTP stream and write it to OTA partition

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

@@ -191,13 +191,13 @@ static esp_err_t _ota_write(esp_https_ota_t *https_ota_handle, const void *buffe
return err;
}
static bool is_server_verification_enabled(esp_https_ota_config_t *ota_config) {
static bool is_server_verification_enabled(const esp_https_ota_config_t *ota_config) {
return (ota_config->http_config->cert_pem
|| ota_config->http_config->use_global_ca_store
|| 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(const esp_https_ota_config_t *ota_config, esp_https_ota_handle_t *handle)
{
esp_err_t err;
@@ -648,19 +648,15 @@ int esp_https_ota_get_image_size(esp_https_ota_handle_t https_ota_handle)
return handle->image_length;
}
esp_err_t esp_https_ota(const esp_http_client_config_t *config)
esp_err_t esp_https_ota(const esp_https_ota_config_t *ota_config)
{
if (!config) {
ESP_LOGE(TAG, "esp_http_client config not found");
if (ota_config == NULL || ota_config->http_config == NULL) {
ESP_LOGE(TAG, "esp_https_ota: Invalid argument");
return ESP_ERR_INVALID_ARG;
}
esp_https_ota_config_t ota_config = {
.http_config = config,
};
esp_https_ota_handle_t https_ota_handle = NULL;
esp_err_t err = esp_https_ota_begin(&ota_config, &https_ota_handle);
esp_err_t err = esp_https_ota_begin(ota_config, &https_ota_handle);
if (https_ota_handle == NULL) {
return ESP_FAIL;
}