Skip to content

Commit e8932c9

Browse files
author
Catalin Ioana
committed
examples/wifi/scan: disabled Secure Boot, by default; prevent compiling the checking of bootloader signature
1 parent 5f7692e commit e8932c9

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

components/bootloader_support/src/esp_image_format.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,18 +167,17 @@ goto err;
167167
rewritten the header - rely on esptool.py having verified the bootloader at flashing time, instead.
168168
*/
169169
if (!is_bootloader) {
170-
//#ifdef CONFIG_SECURE_BOOT_ENABLED
171170
if (esp_secure_boot_enabled()) {
171+
#ifdef CONFIG_SECURE_BOOT_ENABLED
172172
// secure boot images have a signature appended
173173
err = verify_secure_boot_signature(sha_handle, data);
174-
//#else
174+
#endif // CONFIG_SECURE_BOOT_ENABLED
175175
} else {
176176
// No secure boot, but SHA-256 can be appended for basic corruption detection
177177
if (sha_handle != NULL) {
178178
err = verify_simple_hash(sha_handle, data);
179179
}
180180
}
181-
//#endif // CONFIG_SECURE_BOOT_ENABLED
182181
} else { // is_bootloader
183182
// bootloader may still have a sha256 digest handle open
184183
if (sha_handle != NULL) {

examples/wifi/scan/sdkconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ CONFIG_BOOTLOADER_VDDSDIO_BOOST=y
2626
#
2727
# Security features
2828
#
29-
CONFIG_SECURE_BOOT_ENABLED=y
30-
CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH=
31-
CONFIG_SECURE_BOOTLOADER_REFLASHABLE=y
32-
CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES=y
33-
CONFIG_SECURE_BOOT_SIGNING_KEY="secure_boot_signing_key.pem"
34-
CONFIG_SECURE_BOOT_INSECURE=
29+
CONFIG_SECURE_BOOT_ENABLED=
3530
CONFIG_FLASH_ENCRYPTION_ENABLED=
3631

3732
#

0 commit comments

Comments
 (0)