Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Fix bug xTaskCreate with function ref #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Y��IA))��->!�Pb4k��J�ʬHe���toȡ��K�/��؆��r��fM��D;��|(E
17 changes: 10 additions & 7 deletions components/bootloader_support/src/esp_image_format.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <soc/cpu.h>
#include <esp_image_format.h>
#include <esp_secure_boot.h>
#define LOG_LOCAL_LEVEL ESP_LOG_ERROR
#include <esp_log.h>
#include <bootloader_flash.h>
#include <bootloader_random.h>
Expand Down Expand Up @@ -166,15 +167,17 @@ goto err;
rewritten the header - rely on esptool.py having verified the bootloader at flashing time, instead.
*/
if (!is_bootloader) {
if (esp_secure_boot_enabled()) {
#ifdef CONFIG_SECURE_BOOT_ENABLED
// secure boot images have a signature appended
err = verify_secure_boot_signature(sha_handle, data);
#else
// No secure boot, but SHA-256 can be appended for basic corruption detection
if (sha_handle != NULL) {
err = verify_simple_hash(sha_handle, data);
}
// secure boot images have a signature appended
err = verify_secure_boot_signature(sha_handle, data);
#endif // CONFIG_SECURE_BOOT_ENABLED
} else {
// No secure boot, but SHA-256 can be appended for basic corruption detection
if (sha_handle != NULL) {
err = verify_simple_hash(sha_handle, data);
}
}
} else { // is_bootloader
// bootloader may still have a sha256 digest handle open
if (sha_handle != NULL) {
Expand Down
1 change: 1 addition & 0 deletions components/esp32/ld/esp32.spiram.rom-functions-iram.ld
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
*lib_a-mktime.o(.literal .text .literal.* .text.*)
*lib_a-syswrite.o(.literal .text .literal.* .text.*)
*lib_a-tzset_r.o(.literal .text .literal.* .text.*)
*lib_a-sysgettod.o(.literal .text .literal.* .text.*)
*lib_a-tzset.o(.literal .text .literal.* .text.*)
*lib_a-toupper.o(.literal .text .literal.* .text.*)
*lib_a-tolower.o(.literal .text .literal.* .text.*)
Expand Down
2 changes: 1 addition & 1 deletion examples/peripherals/gpio/main/gpio_example_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void app_main()
//create a queue to handle gpio event from isr
gpio_evt_queue = xQueueCreate(10, sizeof(uint32_t));
//start gpio task
xTaskCreate(gpio_task_example, "gpio_task_example", 2048, NULL, 10, NULL);
xTaskCreate(&gpio_task_example, "gpio_task_example", 2048, NULL, 10, NULL);

//install gpio isr service
gpio_install_isr_service(ESP_INTR_FLAG_DEFAULT);
Expand Down
5 changes: 5 additions & 0 deletions examples/wifi/scan/secure_boot_signing_key.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEICMyAIK9+SQEoSM06ju1q2PHfyQf34uN0J6WS0OFwP9OoAoGCCqGSM49
AwEHoUQDQgAEWc/nSUEpKYnULT4h7AVQYjRr6AK5SpzKrEhlgpmjdBBvyKHFBopL
oS+5nNiGlPdym8YYZk3THReXRDv+/3woRQ==
-----END EC PRIVATE KEY-----
1 change: 1 addition & 0 deletions examples/wifi/scan/signature_verification_key.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Y��IA))��->!�Pb4k��J�ʬHe���toȡ��K�/��؆��r��fM��D;��|(E