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 'bugfix/cpp_header_rom_secure_boot' into 'master'

Browse Source 
Secure Boot: Fixes the cpp macro in esp32 secure boot rom functions.

Closes IDFGH-3998

See merge request espressif/esp-idf!10528
This commit is contained in:
Angus Gratton 2020-09-21 15:51:03 +08:00
commit 033f49f974
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/esp_rom/include/esp32/rom/secure_boot.h
View File

@ -81,11 +81,11 @@ typedef struct ets_secure_boot_signature ets_secure_boot_signature_t;
* *
* This function is used to verify the bootloader before burning its public key hash into Efuse. * This function is used to verify the bootloader before burning its public key hash into Efuse.
* Also, it is used to verify the app on loading the image on boot and on OTA. * Also, it is used to verify the app on loading the image on boot and on OTA.
* *
* @param sig The signature block flashed aligned 4096 bytes from the firmware. * @param sig The signature block flashed aligned 4096 bytes from the firmware.
* @param image_digest The SHA-256 Digest of the firmware to be verified * @param image_digest The SHA-256 Digest of the firmware to be verified
* @param trusted_key_digest The SHA-256 Digest of the public key (ets_rsa_pubkey_t) of a single signature block. * @param trusted_key_digest The SHA-256 Digest of the public key (ets_rsa_pubkey_t) of a single signature block.
* @param verified_digest RSA-PSS signature of image_digest. Pass an uninitialised array. * @param verified_digest RSA-PSS signature of image_digest. Pass an uninitialised array.
* *
* @return SBV2_SUCCESS if signature is valid * @return SBV2_SUCCESS if signature is valid
* SBV2_FAILED for failures. * SBV2_FAILED for failures.
@ -94,16 +94,16 @@ secure_boot_v2_status_t ets_secure_boot_verify_signature(const ets_secure_boot_s
/** @brief This function verifies the 1st stage bootloader. Implemented in the ROM. /** @brief This function verifies the 1st stage bootloader. Implemented in the ROM.
* Reboots post verification. It reads the Efuse key for verification of the public key. * Reboots post verification. It reads the Efuse key for verification of the public key.
* *
* This function is not used in the current workflow. * This function is not used in the current workflow.
* *
*/ */
void ets_secure_boot_verify_boot_bootloader(void); void ets_secure_boot_verify_boot_bootloader(void);
/** @brief Confirms if the secure boot V2 has been enabled. Implemented in the ROM. /** @brief Confirms if the secure boot V2 has been enabled. Implemented in the ROM.
* *
* In ESP32-ECO3 - It checks the value of ABS_DONE_1 in EFuse. * In ESP32-ECO3 - It checks the value of ABS_DONE_1 in EFuse.
* *
* @return true if is Secure boot v2 has been enabled * @return true if is Secure boot v2 has been enabled
* False if Secure boot v2 has not been enabled. * False if Secure boot v2 has not been enabled.
*/ */
@ -111,4 +111,8 @@ bool ets_use_secure_boot_v2(void);
#endif /* CONFIG_ESP32_REV_MIN_3 */ #endif /* CONFIG_ESP32_REV_MIN_3 */
#ifdef __cplusplus
}
#endif
#endif /* _ROM_SECURE_BOOT_H_ */ #endif /* _ROM_SECURE_BOOT_H_ */