espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_12813_v5.2' into 'release/v5.2'

Browse Source 
fix(esp32): Fixed declaration issue (GitHub PR) (v5.2)

See merge request espressif/esp-idf!28081
This commit is contained in:
Jiang Jiang Jian
2023-12-28 17:37:20 +08:00
parent 33756fd210 7b32ba0763
commit 796065f6fb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/app_update/esp_ota_ops.c
View File

@ -965,6 +965,7 @@ esp_err_t esp_ota_revoke_secure_boot_public_key(esp_ota_secure_boot_public_key_i
} }
const esp_partition_t *running_app_part = esp_ota_get_running_partition(); const esp_partition_t *running_app_part = esp_ota_get_running_partition();
esp_err_t ret = ESP_FAIL;
#ifdef CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE #ifdef CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
esp_ota_img_states_t running_app_state; esp_ota_img_states_t running_app_state;
ret = esp_ota_get_state_partition(running_app_part, &running_app_state); ret = esp_ota_get_state_partition(running_app_part, &running_app_state);
@ -979,7 +980,7 @@ esp_err_t esp_ota_revoke_secure_boot_public_key(esp_ota_secure_boot_public_key_i
#endif #endif
esp_secure_boot_key_digests_t trusted_keys; esp_secure_boot_key_digests_t trusted_keys;
esp_err_t ret = esp_secure_boot_read_key_digests(&trusted_keys); ret = esp_secure_boot_read_key_digests(&trusted_keys);
if (ret != ESP_OK) { if (ret != ESP_OK) {
ESP_LOGE(TAG, "Could not read the secure boot key digests from efuse. Aborting.."); ESP_LOGE(TAG, "Could not read the secure boot key digests from efuse. Aborting..");
return ESP_FAIL; return ESP_FAIL;