From 30e01847adeabb71b321727cdf91aea204575689 Mon Sep 17 00:00:00 2001 From: Supreet Deshpande Date: Mon, 10 Dec 2018 17:16:38 +0530 Subject: [PATCH 1/2] bugfix/ota_magic_byte_issue: Fixes OTA magic byte error On enabling flash encryption, OTA fails with magic byte error in the second chunk if the http data is split into two or more chunks and first chunk is less than 16. --- components/app_update/esp_ota_ops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/app_update/esp_ota_ops.c b/components/app_update/esp_ota_ops.c index 6416b5d93f..74cf1a193b 100644 --- a/components/app_update/esp_ota_ops.c +++ b/components/app_update/esp_ota_ops.c @@ -145,8 +145,7 @@ esp_err_t esp_ota_write(esp_ota_handle_t handle, const void *data, size_t size) if (it->handle == handle) { // must erase the partition before writing to it assert(it->erased_size > 0 && "must erase the partition before writing to it"); - - if(it->wrote_size == 0 && size > 0 && data_bytes[0] != 0xE9) { + if(it->wrote_size == 0 && it->partial_bytes == 0 && size > 0 && data_bytes[0] != 0xE9) { ESP_LOGE(TAG, "OTA image has invalid magic byte (expected 0xE9, saw 0x%02x", data_bytes[0]); return ESP_ERR_OTA_VALIDATE_FAILED; } From 04aebc464c5f7e317bf15800193e6985fe828cba Mon Sep 17 00:00:00 2001 From: Supreet Deshpande Date: Mon, 17 Dec 2018 09:56:18 +0530 Subject: [PATCH 2/2] bugfix/ota_magic_byte_issue: Fix indent and replace constant by macro Replace 0xE9 by ESP_IMAGE_HEADER_MAGIC. --- components/app_update/esp_ota_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/app_update/esp_ota_ops.c b/components/app_update/esp_ota_ops.c index 74cf1a193b..d47638c723 100644 --- a/components/app_update/esp_ota_ops.c +++ b/components/app_update/esp_ota_ops.c @@ -145,7 +145,7 @@ esp_err_t esp_ota_write(esp_ota_handle_t handle, const void *data, size_t size) if (it->handle == handle) { // must erase the partition before writing to it assert(it->erased_size > 0 && "must erase the partition before writing to it"); - if(it->wrote_size == 0 && it->partial_bytes == 0 && size > 0 && data_bytes[0] != 0xE9) { + if (it->wrote_size == 0 && it->partial_bytes == 0 && size > 0 && data_bytes[0] != ESP_IMAGE_HEADER_MAGIC) { ESP_LOGE(TAG, "OTA image has invalid magic byte (expected 0xE9, saw 0x%02x", data_bytes[0]); return ESP_ERR_OTA_VALIDATE_FAILED; }