From 58195fbc1eae4f3890df4bca4ba52d75d6e37189 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sat, 19 Aug 2017 12:42:21 +0800 Subject: [PATCH] esp-idf v3: account for optional SHA256 when walking segments --- lib/lws-plat-esp32.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/lws-plat-esp32.c b/lib/lws-plat-esp32.c index d875e085..48688e71 100644 --- a/lib/lws-plat-esp32.c +++ b/lib/lws-plat-esp32.c @@ -1613,7 +1613,12 @@ lws_esp32_get_image_info(const esp_partition_t *part, struct lws_esp32_image *i, } hdr += (~hdr & 15) + 1; - i->romfs = hdr + 4; + if (eih.hash_appended) + hdr += 0x20; + +// lwsl_notice("romfs estimated at 0x%x\n", hdr); + + i->romfs = hdr + 0x4; spi_flash_read(hdr, &i->romfs_len, sizeof(i->romfs_len)); i->json = i->romfs + i->romfs_len + 4; spi_flash_read(i->json - 4, &i->json_len, sizeof(i->json_len));