espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-02 18:10:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/key_mgr_state_management' into 'master'

Browse Source 
Fix incorrect key manager state management

See merge request espressif/esp-idf!41796
This commit is contained in:
Harshal Patil
2025-09-12 17:09:52 +05:30
parent d1b3fd17db 854ec3590f
commit de36c80335
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp_security/src/esp_key_mgr.c
View File

@@ -293,7 +293,6 @@ static esp_err_t key_mgr_deploy_key_aes_mode(aes_deploy_config_t *config)
} }
key_mgr_hal_start(); key_mgr_hal_start();
key_mgr_hal_continue();
// Step 2: Load phase // Step 2: Load phase
key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD); key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD);
@@ -459,8 +458,9 @@ static esp_err_t key_mgr_recover_key(key_recovery_config_t *config)
} }
key_mgr_hal_set_key_purpose(config->key_purpose); key_mgr_hal_set_key_purpose(config->key_purpose);
key_mgr_hal_start(); key_mgr_hal_start();
key_mgr_hal_continue();
key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD); key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD);
if (config->key_purpose == ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_2 || config->key_purpose == ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_2) { if (config->key_purpose == ESP_KEY_MGR_KEY_PURPOSE_XTS_AES_256_2 || config->key_purpose == ESP_KEY_MGR_KEY_PURPOSE_PSRAM_256_2) {
@@ -629,8 +629,8 @@ static esp_err_t key_mgr_deploy_key_ecdh0_mode(ecdh0_deploy_config_t *config)
// Set key purpose // Set key purpose
key_mgr_hal_set_key_purpose(config->key_purpose); key_mgr_hal_set_key_purpose(config->key_purpose);
key_mgr_hal_start(); key_mgr_hal_start();
key_mgr_hal_continue();
// Step 2: Load phase // Step 2: Load phase
key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD); key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD);
@@ -805,8 +805,9 @@ static esp_err_t key_mgr_deploy_key_random_mode(random_deploy_config_t *config)
key_mgr_hal_set_key_purpose(config->key_purpose); key_mgr_hal_set_key_purpose(config->key_purpose);
key_mgr_hal_start(); key_mgr_hal_start();
key_mgr_hal_continue();
key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD); key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD);
key_mgr_hal_continue(); key_mgr_hal_continue();
// No configuration for Random deploy mode // No configuration for Random deploy mode