|
|
@@ -196,8 +196,17 @@ static esp_err_t image_load(esp_image_load_mode_t mode, const esp_partition_pos_
|
|
|
if (!is_bootloader) {
|
|
|
#ifdef SECURE_BOOT_CHECK_SIGNATURE
|
|
|
// secure boot images have a signature appended
|
|
|
- err = verify_secure_boot_signature(sha_handle, data);
|
|
|
-#else
|
|
|
+#if defined(BOOTLOADER_BUILD) && !defined(CONFIG_SECURE_BOOT)
|
|
|
+ // If secure boot is not enabled in hardware, then
|
|
|
+ // skip the signature check in bootloader when the debugger is attached.
|
|
|
+ // This is done to allow for breakpoints in Flash.
|
|
|
+ if (!esp_cpu_in_ocd_debug_mode()) {
|
|
|
+#else // CONFIG_SECURE_BOOT
|
|
|
+ if (true) {
|
|
|
+#endif // end checking for JTAG
|
|
|
+ err = verify_secure_boot_signature(sha_handle, data);
|
|
|
+ }
|
|
|
+#else // SECURE_BOOT_CHECK_SIGNATURE
|
|
|
// No secure boot, but SHA-256 can be appended for basic corruption detection
|
|
|
if (sha_handle != NULL && !esp_cpu_in_ocd_debug_mode()) {
|
|
|
err = verify_simple_hash(sha_handle, data);
|