mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
dd10afb18d
This fixes the issue where multiline strings and strings with delimiters inside the nvs input csv file were incorrectly parsed, and adds back the ability to add comment lines anywhere in the CSV file. The issue stems from the move away from the python built in csv module to manual parsing, which was made after moving away from using the csv module to parse mfg data. This reverts back to using the csv module for parsing and writing csv data in both mfg_gen and nvs_partition_gen, fixes the original issue in mfg_gen and improves code quality which makes the code more readable and maintainable. Closes https://github.com/espressif/esp-idf/issues/7175
114 lines
3.2 KiB
C++
114 lines
3.2 KiB
C++
/*
|
|
* SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <cstring>
|
|
#include "nvs_encrypted_partition.hpp"
|
|
#include "nvs_types.hpp"
|
|
|
|
namespace nvs {
|
|
|
|
NVSEncryptedPartition::NVSEncryptedPartition(const esp_partition_t *partition)
|
|
: NVSPartition(partition) { }
|
|
|
|
esp_err_t NVSEncryptedPartition::init(nvs_sec_cfg_t* cfg)
|
|
{
|
|
uint8_t* eky = reinterpret_cast<uint8_t*>(cfg);
|
|
|
|
mbedtls_aes_xts_init(&mEctxt);
|
|
mbedtls_aes_xts_init(&mDctxt);
|
|
|
|
if (mbedtls_aes_xts_setkey_enc(&mEctxt, eky, 2 * NVS_KEY_SIZE * 8) != 0) {
|
|
return ESP_ERR_NVS_XTS_CFG_FAILED;
|
|
}
|
|
|
|
if (mbedtls_aes_xts_setkey_dec(&mDctxt, eky, 2 * NVS_KEY_SIZE * 8) != 0) {
|
|
return ESP_ERR_NVS_XTS_CFG_FAILED;
|
|
}
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
esp_err_t NVSEncryptedPartition::read(size_t src_offset, void* dst, size_t size)
|
|
{
|
|
/** Currently upper layer of NVS reads entries one by one even for variable size
|
|
* multi-entry data types. So length should always be equal to size of an entry.*/
|
|
if (size != sizeof(Item)) return ESP_ERR_INVALID_SIZE;
|
|
|
|
// read data
|
|
esp_err_t read_result = esp_partition_read(mESPPartition, src_offset, dst, size);
|
|
if (read_result != ESP_OK) {
|
|
return read_result;
|
|
}
|
|
|
|
// decrypt data
|
|
//sector num required as an arr by mbedtls. Should have been just uint64/32.
|
|
uint8_t data_unit[16];
|
|
|
|
uint32_t relAddr = src_offset;
|
|
|
|
memset(data_unit, 0, sizeof(data_unit));
|
|
|
|
memcpy(data_unit, &relAddr, sizeof(relAddr));
|
|
|
|
uint8_t *destination = reinterpret_cast<uint8_t*>(dst);
|
|
|
|
if (mbedtls_aes_crypt_xts(&mDctxt, MBEDTLS_AES_DECRYPT, size, data_unit, destination, destination) != 0) {
|
|
return ESP_ERR_NVS_XTS_DECR_FAILED;
|
|
}
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
esp_err_t NVSEncryptedPartition::write(size_t addr, const void* src, size_t size)
|
|
{
|
|
if (size % ESP_ENCRYPT_BLOCK_SIZE != 0) return ESP_ERR_INVALID_SIZE;
|
|
|
|
// copy data to buffer for encryption
|
|
uint8_t* buf = new (std::nothrow) uint8_t [size];
|
|
|
|
if (!buf) return ESP_ERR_NO_MEM;
|
|
|
|
memcpy(buf, src, size);
|
|
|
|
// encrypt data
|
|
uint8_t entrySize = sizeof(Item);
|
|
|
|
//sector num required as an arr by mbedtls. Should have been just uint64/32.
|
|
uint8_t data_unit[16];
|
|
|
|
/* Use relative address instead of absolute address (relocatable), so that host-generated
|
|
* encrypted nvs images can be used*/
|
|
uint32_t relAddr = addr;
|
|
|
|
memset(data_unit, 0, sizeof(data_unit));
|
|
|
|
for(uint8_t entry = 0; entry < (size/entrySize); entry++)
|
|
{
|
|
uint32_t offset = entry * entrySize;
|
|
uint32_t *addr_loc = (uint32_t*) &data_unit[0];
|
|
|
|
*addr_loc = relAddr + offset;
|
|
if (mbedtls_aes_crypt_xts(&mEctxt,
|
|
MBEDTLS_AES_ENCRYPT,
|
|
entrySize,
|
|
data_unit,
|
|
buf + offset,
|
|
buf + offset) != 0) {
|
|
delete [] buf;
|
|
return ESP_ERR_NVS_XTS_ENCR_FAILED;
|
|
}
|
|
}
|
|
|
|
// write data
|
|
esp_err_t result = esp_partition_write(mESPPartition, addr, buf, size);
|
|
|
|
delete [] buf;
|
|
|
|
return result;
|
|
}
|
|
|
|
} // nvs
|