diff --git a/components/app_update/esp_ota_ops.c b/components/app_update/esp_ota_ops.c index 96e32cecfe07..df5f2f1f32f6 100644 --- a/components/app_update/esp_ota_ops.c +++ b/components/app_update/esp_ota_ops.c @@ -46,10 +46,8 @@ typedef struct ota_ops_entry_ { const esp_partition_t *part; uint32_t erased_size; uint32_t wrote_size; -#ifdef CONFIG_FLASH_ENCRYPTION_ENABLED uint8_t partial_bytes; uint8_t partial_data[16]; -#endif LIST_ENTRY(ota_ops_entry_) entries; } ota_ops_entry_t; @@ -152,7 +150,6 @@ esp_err_t esp_ota_write(esp_ota_handle_t handle, const void *data, size_t size) return ESP_ERR_OTA_VALIDATE_FAILED; } -#ifdef CONFIG_FLASH_ENCRYPTION_ENABLED if (esp_flash_encryption_enabled()) { /* Can only write 16 byte blocks to flash, so need to cache anything else */ size_t copy_len; @@ -184,7 +181,6 @@ esp_err_t esp_ota_write(esp_ota_handle_t handle, const void *data, size_t size) memcpy(it->partial_data, data_bytes + size, it->partial_bytes); } } -#endif ret = esp_partition_write(it->part, it->wrote_size, data_bytes, size); if(ret == ESP_OK){ @@ -223,8 +219,7 @@ esp_err_t esp_ota_end(esp_ota_handle_t handle) goto cleanup; } -#ifdef CONFIG_FLASH_ENCRYPTION_ENABLED - if (it->partial_bytes > 0 && esp_flash_encryption_enabled()) { + if (it->partial_bytes > 0) { /* Write out last 16 bytes, if necessary */ ret = esp_partition_write(&it->part, it->wrote_size, it->partial_data, 16); if (ret != ESP_OK) { @@ -234,7 +229,6 @@ esp_err_t esp_ota_end(esp_ota_handle_t handle) it->wrote_size += 16; it->partial_bytes = 0; } -#endif if (esp_image_basic_verify(it->part->address, true, &image_size) != ESP_OK) { ret = ESP_ERR_OTA_VALIDATE_FAILED;