espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvs_part_gen: Update to make python version compatible

Browse Source 
(cherry picked from commit 3506b2d60792e5d4ed4f744b28f2da6733c6aae7)
This commit is contained in:
Shivani Tipnis
2018-10-08 10:32:09 +05:30
parent 24fa2342e8
commit 226b6929e5
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
View File

@@ -193,6 +193,7 @@ class Page(object):
data_val = data_bytes + (init_data_val * (data_len_needed - len(data_bytes))) data_val = data_bytes + (init_data_val * (data_len_needed - len(data_bytes)))
encr_data_ret = self.encrypt_entry(data_val, tweak_val, encr_key_input) encr_data_ret = self.encrypt_entry(data_val, tweak_val, encr_key_input)
#print("\n<<<\n")
encr_data_to_write = encr_data_to_write + encr_data_ret encr_data_to_write = encr_data_to_write + encr_data_ret
# Update values for encrypting next set of data bytes # Update values for encrypting next set of data bytes
start_idx = end_idx start_idx = end_idx
@@ -207,13 +208,24 @@ class Page(object):
if self.is_encrypt: if self.is_encrypt:
encr_data_ret = self.encrypt_data(data, entrycount,nvs_obj) encr_data_ret = self.encrypt_data(data, entrycount,nvs_obj)
encr_data[0:len(encr_data_ret)] = encr_data_ret if sys.version_info[0] < 3:
encr_data[0:len(encr_data_ret)] = encr_data_ret
else:
encr_data[0:len(encr_data_ret)] = encr_data_ret
data = encr_data data = encr_data
data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num) data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num)
start_idx = data_offset start_idx = data_offset
end_idx = data_offset + len(data) end_idx = data_offset + len(data)
self.page_buf[start_idx:end_idx] = data if not sys.version_info[0] < 3:
if type(data) == str:
self.page_buf[start_idx:end_idx] = data
else:
self.page_buf[start_idx:end_idx] = data
else:
self.page_buf[start_idx:end_idx] = data
# Set bitmap array for entries in current page # Set bitmap array for entries in current page
for i in range(0, entrycount): for i in range(0, entrycount):