Merge branch 'contrib/github_pr_12813' into 'master'

fix(esp32): Fixed declaration issue (GitHub PR)

Closes IDFGH-11705 and IDFGH-11706

See merge request espressif/esp-idf!27969
This commit is contained in:
Mahavir Jain
2023-12-22 14:43:58 +08:00

View File

@@ -947,6 +947,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();
esp_err_t ret = ESP_FAIL;
#ifdef CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
esp_ota_img_states_t running_app_state;
ret = esp_ota_get_state_partition(running_app_part, &running_app_state);
@@ -961,7 +962,7 @@ esp_err_t esp_ota_revoke_secure_boot_public_key(esp_ota_secure_boot_public_key_i
#endif
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) {
ESP_LOGE(TAG, "Could not read the secure boot key digests from efuse. Aborting..");
return ESP_FAIL;