Merge branch 'bugfix/fe_example_test_args' into 'release/v4.2'

ci: fix flash encryption example test esptool args (4.2)

See merge request espressif/esp-idf!13539
This commit is contained in:
Angus Gratton 2021-05-19 06:58:48 +00:00
commit 71cddbdf8f

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, False)
espsecure.encrypt_flash_data(args)
expected_ciphertext = args.output.getvalue()