mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/anti_rollback_check_regression' into 'master' 

fix(bootloader_support): check the secure version only for app image

See merge request espressif/esp-idf!29102
pull/13253/head
Mahavir Jain 2024-02-20 17:13:12 +08:00
rodzic 1253ab6e27 c33b9e1426
commit 277c925e6a
1 zmienionych plików z 6 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
components/bootloader_support/src/esp_image_format.c
Wyświetl plik

@ -688,12 +688,16 @@ static esp_err_t process_segment_data(int segment, intptr_t load_addr, uint32_t
#endif #endif
} }
uint32_t *dest = (uint32_t *)load_addr; uint32_t *dest = (uint32_t *)load_addr;
#endif #endif // BOOTLOADER_BUILD
const uint32_t *src = data; const uint32_t *src = data;
#if CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK #if CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK
if (segment == 0) { // Case I: Bootloader verifying application
// Case II: Bootloader verifying bootloader
// Anti-rollback check should handle only Case I from above.
if (segment == 0 && metadata->start_addr != ESP_BOOTLOADER_OFFSET) {
ESP_LOGD(TAG, "additional anti-rollback check 0x%"PRIx32, data_addr);
// The esp_app_desc_t structure is located in DROM and is always in segment #0. // The esp_app_desc_t structure is located in DROM and is always in segment #0.
size_t len = process_esp_app_desc_data(src, sha_handle, checksum, metadata); size_t len = process_esp_app_desc_data(src, sha_handle, checksum, metadata);
data_len -= len; data_len -= len;