alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/skip_sha256_error_on_fpga' into 'master'

Browse Source 
bootloader: Skip a sha256 error on FPGA

See merge request espressif/esp-idf!10836
This commit is contained in:
Angus Gratton 2020-10-16 14:43:06 +08:00
commit a416452657
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/bootloader_support/src/esp_image_format.c
View File

@ -237,6 +237,12 @@ static esp_err_t image_load(esp_image_load_mode_t mode, const esp_partition_pos_
// No secure boot, but SHA-256 can be appended for basic corruption detection // No secure boot, but SHA-256 can be appended for basic corruption detection
if (sha_handle != NULL && !esp_cpu_in_ocd_debug_mode()) { if (sha_handle != NULL && !esp_cpu_in_ocd_debug_mode()) {
err = verify_simple_hash(sha_handle, data); err = verify_simple_hash(sha_handle, data);
#ifdef CONFIG_IDF_ENV_FPGA
if (err != ESP_OK) {
ESP_LOGW(TAG, "Ignoring invalid SHA-256 as running on FPGA");
err = ESP_OK;
}
#endif
sha_handle = NULL; // calling verify_simple_hash finishes sha_handle sha_handle = NULL; // calling verify_simple_hash finishes sha_handle
} }
#endif // SECURE_BOOT_CHECK_SIGNATURE #endif // SECURE_BOOT_CHECK_SIGNATURE