fix: Close the data file after reading the data

Closes https://github.com/espressif/esptool/pull/1074
This commit is contained in:
Stevan Stevic
2025-03-19 22:03:21 +01:00
committed by Radim Karniš
parent 36325fdf69
commit 807d02b0c5
12 changed files with 16 additions and 1 deletions

View File

@@ -229,6 +229,7 @@ def burn_key(esp, efuses, args):
raise esptool.FatalError("Unknown block name - %s" % (block_name))
num_bytes = efuse.bit_len // 8
data = datafile.read()
datafile.close()
revers_msg = None
if block_name in ("flash_encryption", "secure_boot_v1"):
revers_msg = "\tReversing the byte order"

View File

@@ -207,7 +207,11 @@ def burn_key(esp, efuses, args, digest=None):
print("Burn keys to blocks:")
for datafile, keypurpose in zip(datafile_list, keypurpose_list):
data = datafile if isinstance(datafile, bytes) else datafile.read()
if isinstance(datafile, bytes):
data = datafile
else:
data = datafile.read()
datafile.close()
if keypurpose == "XTS_AES_128_KEY_DERIVED_FROM_128_EFUSE_BITS":
efuse = efuses["BLOCK_KEY0_LOW_128"]

View File

@@ -251,6 +251,7 @@ def burn_key(esp, efuses, args, digest=None):
if digest is None:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -248,6 +248,7 @@ def burn_key(esp, efuses, args, digest=None):
data = b"\x00" * 8 + data
else:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -258,6 +258,7 @@ def burn_key(esp, efuses, args, digest=None):
if digest is None:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -315,6 +315,7 @@ def burn_key(esp, efuses, args, digest=None):
data = b"\x00" * 8 + data
else:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -262,6 +262,7 @@ def burn_key(esp, efuses, args, digest=None):
data = b"\x00" * 8 + data
else:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -246,6 +246,7 @@ def burn_key(esp, efuses, args, digest=None):
data = b"\x00" * 8 + data
else:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -244,6 +244,7 @@ def burn_key(esp, efuses, args, digest=None):
data = b"\x00" * 8 + data
else:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -315,6 +315,7 @@ def burn_key(esp, efuses, args, digest=None):
data = b"\x00" * 8 + data
else:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -367,6 +367,7 @@ def burn_key(esp, efuses, args, digest=None):
if digest is None:
data = datafile.read()
datafile.close()
else:
data = datafile

View File

@@ -368,6 +368,7 @@ def burn_key(esp, efuses, args, digest=None):
if digest is None:
data = datafile.read()
datafile.close()
else:
data = datafile