adafruit-mirror/esp-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/update_esptool' into 'master'

Browse source 
tools: Update esptool submodule

Closes IDFGH-4600

See merge request espressif/esp-idf!12011
This commit is contained in:
Angus Gratton 2021-01-18 07:13:33 +08:00
commit e82fe93b3d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esptool_py/esptool

@ -1 +1 @@
Subproject commit 8270199920415049eea65990a1ca93a549113979
Subproject commit 692a0fce388744a071503216ae3f8a2907e9c608

4
examples/security/flash_encryption/example_test.py
View file

@ -35,8 +35,8 @@ def test_examples_security_flash_encryption(env, extra_data):
plain_data = binascii.unhexlify(plain_hex_str.replace(' ', ''))
# Emulate espsecure encrypt_flash_data command
EncryptFlashDataArgs = namedtuple('EncryptFlashDataArgs', ['output', 'plaintext_file', 'address', 'keyfile', 'flash_crypt_conf'])
args = EncryptFlashDataArgs(BytesIO(), BytesIO(plain_data), flash_addr, BytesIO(b'\x00' * 32), 0xF)
EncryptFlashDataArgs = namedtuple('EncryptFlashDataArgs', ['output', 'plaintext_file', 'address', 'keyfile', 'flash_crypt_conf', 'aes_xts'])
args = EncryptFlashDataArgs(BytesIO(), BytesIO(plain_data), flash_addr, BytesIO(b'\x00' * 32), 0xF, None)
espsecure.encrypt_flash_data(args)
expected_ciphertext = args.output.getvalue()