Skip to content

fix(nvs_sec_provider): add option to skip reset when nvs_keys is missing (IDFGH-16597) #17710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −0
Open

fix(nvs_sec_provider): add option to skip reset when nvs_keys is missing (IDFGH-16597) #17710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions components/nvs_sec_provider/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ menu "NVS Security Provider"

endchoice

config NVS_SEC_PROVIDER_ABORT_IF_NVS_KEYS_MISSING
bool "Ensure NVS keys partition presence on app startup"
depends on NVS_SEC_KEY_PROTECT_USING_FLASH_ENC
default y
help
If set (default), there is a check if the NVS keys partition is present.
App will call abort if the NVS keys partition is not present.

If not set, the app does not care if the NVS keys partition is present or not.
NVS encryption may not work if the NVS keys partition is not present.

config NVS_SEC_HMAC_EFUSE_KEY_ID
int "eFuse key ID storing the HMAC key"
depends on NVS_SEC_KEY_PROTECT_USING_HMAC
Expand Down
2 changes: 2 additions & 0 deletions components/nvs_sec_provider/nvs_sec_provider.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ ESP_SYSTEM_INIT_FN(nvs_sec_provider_register_flash_enc_scheme, SECONDARY, BIT(0)

if (sec_scheme_cfg.nvs_keys_part == NULL) {
ESP_EARLY_LOGE(TAG, "partition with subtype \"nvs_keys\" not found");
#ifdef CONFIG_NVS_SEC_PROVIDER_ABORT_IF_NVS_KEYS_MISSING
return ESP_FAIL;
#endif // CONFIG_NVS_SEC_PROVIDER_ABORT_IF_NVS_KEYS_MISSING
}

nvs_sec_scheme_t *sec_scheme_handle_out = NULL;
Expand Down