alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-03 15:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootloader: Refactor secure boot digest generation

Browse Source
This commit is contained in:
Angus Gratton
2016-10-25 14:55:35 +11:00
parent 1cab448c73
commit f10cc7dc8e
3 changed files with 114 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/bootloader/src/main/bootloader_start.c
View File

@@ -256,6 +256,7 @@ void bootloader_main()
bootloader_state_t bs;
SpiFlashOpResult spiRet1,spiRet2;
esp_ota_select_entry_t sa,sb;
memset(&bs, 0, sizeof(bs));
ESP_LOGI(TAG, "compile time " __TIME__ );
@@ -329,16 +330,20 @@ void bootloader_main()
}
ESP_LOGI(TAG, "Loading app partition at offset %08x", load_part_pos);
if(fhdr.secure_boot_flag == 0x01) {
/* protect the 2nd_boot */
if(false == secure_boot()){
ESP_LOGE(TAG, "secure boot failed");
return;
/* Generate secure digest from this bootloader to protect future
modifications */
if (secure_boot_generate_bootloader_digest() == false){
ESP_LOGE(TAG, "Bootloader digest generation failed. SECURE BOOT IS NOT ENABLED.");
/* Allow booting to continue, as the failure is probably
due to user-configured EFUSEs for testing...
*/
}
}
if(fhdr.encrypt_flag == 0x01) {
/* encrypt flash */
/* encrypt flash */
if (false == flash_encrypt(&bs)) {
ESP_LOGE(TAG, "flash encrypt failed");
return;