Update tests for non-interactive patching with encrypted keys

Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
This commit is contained in:
Andrew Gunnerson
2023-05-30 23:46:54 -04:00
parent 601c24222f
commit 6be4665557
3 changed files with 140 additions and 114 deletions
+54 -52
View File
@@ -1,52 +1,54 @@
-----BEGIN PRIVATE KEY-----
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
C2N4cxXcIba2WaeXocqQVlnTRxhf
-----END PRIVATE KEY-----
-----BEGIN ENCRYPTED PRIVATE KEY-----
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
4hfHGqVB+o9joq03K0eXhY4uHiFF34hjXA==
-----END ENCRYPTED PRIVATE KEY-----
+54 -52
View File
@@ -1,52 +1,54 @@
-----BEGIN PRIVATE KEY-----
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
Gwsn7qf/tXc2TkAJ1ut/DMGB758tTVo=
-----END PRIVATE KEY-----
-----BEGIN ENCRYPTED PRIVATE KEY-----
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
D0EOYpA1bBp8MAgQkZwwRr/kqf5u432Dmg==
-----END ENCRYPTED PRIVATE KEY-----
+32 -10
View File
@@ -23,6 +23,10 @@ import downloader
FILES_DIR = os.path.join(sys.path[0], 'files')
TEST_KEY_PREFIX = os.path.join(sys.path[0], 'keys', 'TEST_KEY_DO_NOT_USE_')
TEST_KEY_PASSPHRASE_AVB = \
'XltUCz36vqCNSzspPZxFMGXah3kLyrTXDwfmasgn6nL4CtZDw5OeeLwlmkDuV2Im'
TEST_KEY_PASSPHRASE_OTA = \
'7DsqL2Sk9T609OFpeVXwnrWHRrK3iazccxEDHWDqr5zJ9tgZkONhDvXhXuCQY76o'
PARTITIONS_TO_PRESERVE = set(sum(PARTITION_PRIORITIES.values(), ()))
@@ -234,16 +238,34 @@ def patch_image(input_file, output_file, stripped, extra_args=[]):
else:
preinit_args = []
avbroot.main.main([
'patch',
'--privkey-avb', TEST_KEY_PREFIX + 'avb.key',
'--privkey-ota', TEST_KEY_PREFIX + 'ota.key',
'--cert-ota', TEST_KEY_PREFIX + 'ota.crt',
'--input', input_file,
'--output', output_file,
*preinit_args,
*extra_args,
])
env = os.environ.copy()
env['PASSPHRASE_AVB'] = TEST_KEY_PASSPHRASE_AVB
with (
unittest.mock.patch('os.environ', env),
tempfile.NamedTemporaryFile('w+', delete=False) as f,
):
try:
f.write(TEST_KEY_PASSPHRASE_OTA)
f.write('\n')
# Needed for Windows
f.close()
avbroot.main.main([
'patch',
'--privkey-avb', TEST_KEY_PREFIX + 'avb.key',
'--privkey-ota', TEST_KEY_PREFIX + 'ota.key',
'--cert-ota', TEST_KEY_PREFIX + 'ota.crt',
'--passphrase-avb-env-var', 'PASSPHRASE_AVB',
'--passphrase-ota-file', f.name,
'--input', input_file,
'--output', output_file,
*preinit_args,
*extra_args,
])
except BaseException:
os.unlink(f.name)
raise
def extract_image(input_file, output_dir):