Skip to content

Commit

Permalink
fix(bootloader_support): Fix image_length calculation when secure boo…
Browse files Browse the repository at this point in the history
…t v1 is enabled

Fixed the value of the image_length field of the image metadata populated by esp_image_verfiy()
to include the size of the signature sector when Secure Boot V1 is enabled.
  • Loading branch information
Harshal5 authored and mahavirj committed Feb 27, 2024
1 parent dcf187f commit 633b63d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion components/bootloader_support/src/esp_image_format.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,9 +980,13 @@ static esp_err_t verify_secure_boot_signature(bootloader_sha256_handle_t sha_han
return ESP_ERR_IMAGE_INVALID;
}

#if CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME || CONFIG_SECURE_SIGNED_APPS_ECDSA_V2_SCHEME
// Adjust image length result to include the appended signature
#if CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME || CONFIG_SECURE_SIGNED_APPS_ECDSA_V2_SCHEME
data->image_len = end - data->start_addr + sizeof(ets_secure_boot_signature_t);
#elif defined(CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME)
if (data->start_addr != ESP_BOOTLOADER_OFFSET) {
data->image_len = end - data->start_addr + sizeof(esp_secure_boot_sig_block_t);
}
#endif

#endif // SECURE_BOOT_CHECK_SIGNATURE
Expand Down

0 comments on commit 633b63d

Please sign in to comment.