Skip to content

Commit 807d02b

Browse files
stevanStevicradimkarnis
authored andcommitted
fix: Close the data file after reading the data
Closes espressif#1074
1 parent 36325fd commit 807d02b

File tree

12 files changed

+16
-1
lines changed

12 files changed

+16
-1
lines changed

espefuse/efuse/esp32/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ def burn_key(esp, efuses, args):
229229
raise esptool.FatalError("Unknown block name - %s" % (block_name))
230230
num_bytes = efuse.bit_len // 8
231231
data = datafile.read()
232+
datafile.close()
232233
revers_msg = None
233234
if block_name in ("flash_encryption", "secure_boot_v1"):
234235
revers_msg = "\tReversing the byte order"

espefuse/efuse/esp32c2/operations.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,11 @@ def burn_key(esp, efuses, args, digest=None):
207207

208208
print("Burn keys to blocks:")
209209
for datafile, keypurpose in zip(datafile_list, keypurpose_list):
210-
data = datafile if isinstance(datafile, bytes) else datafile.read()
210+
if isinstance(datafile, bytes):
211+
data = datafile
212+
else:
213+
data = datafile.read()
214+
datafile.close()
211215

212216
if keypurpose == "XTS_AES_128_KEY_DERIVED_FROM_128_EFUSE_BITS":
213217
efuse = efuses["BLOCK_KEY0_LOW_128"]

espefuse/efuse/esp32c3/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ def burn_key(esp, efuses, args, digest=None):
251251

252252
if digest is None:
253253
data = datafile.read()
254+
datafile.close()
254255
else:
255256
data = datafile
256257

espefuse/efuse/esp32c5/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ def burn_key(esp, efuses, args, digest=None):
248248
data = b"\x00" * 8 + data
249249
else:
250250
data = datafile.read()
251+
datafile.close()
251252
else:
252253
data = datafile
253254

espefuse/efuse/esp32c6/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ def burn_key(esp, efuses, args, digest=None):
258258

259259
if digest is None:
260260
data = datafile.read()
261+
datafile.close()
261262
else:
262263
data = datafile
263264

espefuse/efuse/esp32c61/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ def burn_key(esp, efuses, args, digest=None):
315315
data = b"\x00" * 8 + data
316316
else:
317317
data = datafile.read()
318+
datafile.close()
318319
else:
319320
data = datafile
320321

espefuse/efuse/esp32h2/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ def burn_key(esp, efuses, args, digest=None):
262262
data = b"\x00" * 8 + data
263263
else:
264264
data = datafile.read()
265+
datafile.close()
265266
else:
266267
data = datafile
267268

espefuse/efuse/esp32h21/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ def burn_key(esp, efuses, args, digest=None):
246246
data = b"\x00" * 8 + data
247247
else:
248248
data = datafile.read()
249+
datafile.close()
249250
else:
250251
data = datafile
251252

espefuse/efuse/esp32h4/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ def burn_key(esp, efuses, args, digest=None):
244244
data = b"\x00" * 8 + data
245245
else:
246246
data = datafile.read()
247+
datafile.close()
247248
else:
248249
data = datafile
249250

espefuse/efuse/esp32p4/operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ def burn_key(esp, efuses, args, digest=None):
315315
data = b"\x00" * 8 + data
316316
else:
317317
data = datafile.read()
318+
datafile.close()
318319
else:
319320
data = datafile
320321

0 commit comments

Comments
 (0)