diff options
| author | Cole Faust <colefaust@google.com> | 2022-04-14 21:45:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-14 21:45:36 +0000 |
| commit | bdc7bdab690adf1fecba86d03b12c3ca882d8e42 (patch) | |
| tree | 956db483ee8a76837425a81c0d3cb4dc24e27ef4 | |
| parent | a4766dc033c042800a51384b8c00c621d77fff9e (diff) | |
| parent | 583ce8b45d5b4aa849cf2748ec7a38c2a3e4cf8f (diff) | |
| download | extras-bdc7bdab690adf1fecba86d03b12c3ca882d8e42.tar.gz | |
Merge "Fix more issues with python3 conversion of build_verity_metadata.py" am: 4e69dcd3fa am: 8c15f1a834 am: 583ce8b45d
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888
Change-Id: Ie8ad4aad3dd9ef8ed8b914e370fd08f74735aeda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | verity/build_verity_metadata.py | 8 |
1 files changed, 4 insertions, 4 deletions
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, |