From 55d5ee1e79a42e21129b92106b52d910b9d4aaca 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 5d415ffeca..40cd89d49c 100644 --- a/components/app_update/esp_ota_ops.c +++ b/components/app_update/esp_ota_ops.c @@ -183,8 +183,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 1d4bb7cc4de6e20a1f88177985c53a460362b95d 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 40cd89d49c..6e8998d323 100644 --- a/components/app_update/esp_ota_ops.c +++ b/components/app_update/esp_ota_ops.c @@ -183,7 +183,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; }