feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Fix nvs_flash_generate_keys

Browse Source 
Merges https://github.com/espressif/esp-idf/pull/6478
This commit is contained in:
negativekelvin
2021-01-29 08:36:36 -07:00
committed by bot
parent 4a20f68f5c
commit 6ceee165b5
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/nvs_flash/src/nvs_api.cpp
View File

@@ -571,16 +571,24 @@ extern "C" esp_err_t nvs_flash_generate_keys(const esp_partition_t* partition, n
}
for(uint8_t cnt = 0; cnt < NVS_KEY_SIZE; cnt++) {
cfg->eky[cnt] = 0xff;
cfg->tky[cnt] = 0xee;
/* Adjacent 16-byte blocks should be different */
if (((cnt / 16) & 1) == 0) {
cfg->eky[cnt] = 0xff;
cfg->tky[cnt] = 0xee;
} else {
cfg->eky[cnt] = 0x99;
cfg->tky[cnt] = 0x88;
}
}
err = esp_partition_write(partition, 0, cfg->eky, NVS_KEY_SIZE);
/* Write without encryption */
err = esp_partition_write_raw(partition, 0, cfg->eky, NVS_KEY_SIZE);
if(err != ESP_OK) {
return err;
}
err = esp_partition_write(partition, NVS_KEY_SIZE, cfg->tky, NVS_KEY_SIZE);
/* Write without encryption */
err = esp_partition_write_raw(partition, NVS_KEY_SIZE, cfg->tky, NVS_KEY_SIZE);
if(err != ESP_OK) {
return err;
}