From b00f38f91c22ae1e658e3a231ec5bc837b0f459f Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 24 Apr 2020 14:42:29 +1000 Subject: [PATCH] secure boot v2: Add anti-FI check that secure boot not enabled yet Prevent a fault from causing bootloader to trust the provided signature incorrectly. --- .../bootloader_support/src/esp32/secure_boot_signatures.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/bootloader_support/src/esp32/secure_boot_signatures.c b/components/bootloader_support/src/esp32/secure_boot_signatures.c index 7051de9e79..1ff4999b85 100644 --- a/components/bootloader_support/src/esp32/secure_boot_signatures.c +++ b/components/bootloader_support/src/esp32/secure_boot_signatures.c @@ -166,6 +166,8 @@ esp_err_t esp_secure_boot_verify_rsa_signature_block(const ets_secure_boot_signa return ESP_ERR_INVALID_STATE; } } + + ESP_FAULT_ASSERT(!ets_use_secure_boot_v2()); #endif memcpy(efuse_trusted_digest, sig_block_trusted_digest, DIGEST_LEN);