diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-15 01:09:32 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-15 01:09:32 +0000 |
| commit | c436955bb44411103e88c124726c10e5600f858b (patch) | |
| tree | 956db483ee8a76837425a81c0d3cb4dc24e27ef4 | |
| parent | 274a333e664a42313a588f08caa30372f277135b (diff) | |
| parent | b7faa6eed2c96972a5508eec70120ed925b79ebf (diff) | |
| download | extras-c436955bb44411103e88c124726c10e5600f858b.tar.gz | |
Snap for 8458482 from b7faa6eed2c96972a5508eec70120ed925b79ebf to tm-d1-release
Change-Id: I79caae88bb7f75f253cfc6469560cc3033b6ed61
| -rw-r--r-- | tests/kernel.config/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | verity/build_verity_metadata.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/kernel.config/AndroidTest.xml b/tests/kernel.config/AndroidTest.xml index 19da90af..78452e1c 100644 --- a/tests/kernel.config/AndroidTest.xml +++ b/tests/kernel.config/AndroidTest.xml @@ -26,7 +26,7 @@ </target_preparer> <!-- Make sure there is some data in the pstore then reboot --> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="echo HELLOWORLD >/dev/pmsg0" /> + <option name="run-command" value="if [ -e /dev/pmsg0 ] ; then echo HELLOWORLD > /dev/pmsg0; fi" /> <option name="throw-if-cmd-fail" value="true" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" /> diff --git a/verity/build_verity_metadata.py b/verity/build_verity_metadata.py index 7fc7b60f..a428f270 100644 --- a/verity/build_verity_metadata.py +++ b/verity/build_verity_metadata.py @@ -43,12 +43,12 @@ def build_metadata_block(verity_table, signature, verity_disable=False): magic = MAGIC_DISABLE if verity_disable else MAGIC_NUMBER block = struct.pack("II256sI", magic, VERSION, signature, table_len) block += verity_table - block = block.ljust(METADATA_SIZE, '\x00') + block = block.ljust(METADATA_SIZE, b'\x00') return block def sign_verity_table(table, signer_path, key_path, signer_args=None): - with tempfile.NamedTemporaryFile(mode='w', suffix='.table') as table_file: - with tempfile.NamedTemporaryFile(mode='r', suffix='.sig') as signature_file: + with tempfile.NamedTemporaryFile(mode='wb', suffix='.table') as table_file: + with tempfile.NamedTemporaryFile(mode='rb', suffix='.sig') as signature_file: table_file.write(table) table_file.flush() if signer_args is None: @@ -70,7 +70,7 @@ def build_verity_table(block_device, data_blocks, root_hash, salt): data_blocks, root_hash, salt) - return table + return table.encode() def build_verity_metadata(data_blocks, metadata_image, root_hash, salt, block_device, signer_path, signing_key, signer_args=None, |