Skip to content

Commit de36c80

Browse files
committed
Merge branch 'fix/key_mgr_state_management' into 'master'
Fix incorrect key manager state management See merge request espressif/esp-idf!41796
2 parents d1b3fd1 + 854ec35 commit de36c80

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

components/esp_security/src/esp_key_mgr.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ static esp_err_t key_mgr_deploy_key_aes_mode(aes_deploy_config_t *config)
293293
}
294294

295295
key_mgr_hal_start();
296-
key_mgr_hal_continue();
297296

298297
// Step 2: Load phase
299298
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)
459458
}
460459

461460
key_mgr_hal_set_key_purpose(config->key_purpose);
461+
462462
key_mgr_hal_start();
463-
key_mgr_hal_continue();
463+
464464
key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD);
465465

466466
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)
629629

630630
// Set key purpose
631631
key_mgr_hal_set_key_purpose(config->key_purpose);
632+
632633
key_mgr_hal_start();
633-
key_mgr_hal_continue();
634634

635635
// Step 2: Load phase
636636
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)
805805
key_mgr_hal_set_key_purpose(config->key_purpose);
806806

807807
key_mgr_hal_start();
808-
key_mgr_hal_continue();
808+
809809
key_mgr_wait_for_state(ESP_KEY_MGR_STATE_LOAD);
810+
810811
key_mgr_hal_continue();
811812

812813
// No configuration for Random deploy mode

0 commit comments

Comments
 (0)