From 2173ad3b4543553383edd795e7fa04416d682ebc Mon Sep 17 00:00:00 2001 From: Tian Zhong Xing Date: Tue, 24 Jan 2017 18:30:13 +0800 Subject: [PATCH] bootloader_support: fix bug OTA & flash encryption incompatible ota data partition should be encrypted unconditionally when flash encrypt enable --- components/bootloader_support/src/flash_encrypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/bootloader_support/src/flash_encrypt.c b/components/bootloader_support/src/flash_encrypt.c index 8b9ca60cd1..8ba068d03b 100644 --- a/components/bootloader_support/src/flash_encrypt.c +++ b/components/bootloader_support/src/flash_encrypt.c @@ -285,6 +285,9 @@ static esp_err_t encrypt_partition(int index, const esp_partition_info_t *partit } else { should_encrypt = false; } + } else if (partition->type == PART_TYPE_DATA && partition->subtype == PART_SUBTYPE_DATA_OTA) { + /* check if we have ota data partition and the partition should be encrypted unconditionally */ + should_encrypt = true; } if (!should_encrypt) { -- 2.40.0