StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce OTA tools's dependency on brillo_update_payload" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-26 00:22:57 +00:00
committed by Gerrit Code Review
parent 8c3bb5b993 f6fe0a9c9c
commit fb4fb4b766
2 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/releasetools/ota_utils.py
View File

@@ -897,30 +897,7 @@ class PayloadGenerator(object):
""" """
assert isinstance(payload_signer, PayloadSigner) assert isinstance(payload_signer, PayloadSigner)
# 1. Generate hashes of the payload and metadata files. signed_payload_file = payload_signer.SignPayload(self.payload_file)
payload_sig_file = common.MakeTempFile(prefix="sig-", suffix=".bin")
metadata_sig_file = common.MakeTempFile(prefix="sig-", suffix=".bin")
cmd = ["brillo_update_payload", "hash",
"--unsigned_payload", self.payload_file,
"--signature_size", str(payload_signer.maximum_signature_size),
"--metadata_hash_file", metadata_sig_file,
"--payload_hash_file", payload_sig_file]
self._Run(cmd)
# 2. Sign the hashes.
signed_payload_sig_file = payload_signer.SignHashFile(payload_sig_file)
signed_metadata_sig_file = payload_signer.SignHashFile(metadata_sig_file)
# 3. Insert the signatures back into the payload file.
signed_payload_file = common.MakeTempFile(prefix="signed-payload-",
suffix=".bin")
cmd = ["brillo_update_payload", "sign",
"--unsigned_payload", self.payload_file,
"--payload", signed_payload_file,
"--signature_size", str(payload_signer.maximum_signature_size),
"--metadata_signature_file", signed_metadata_sig_file,
"--payload_signature_file", signed_payload_sig_file]
self._Run(cmd)
self.payload_file = signed_payload_file self.payload_file = signed_payload_file

23
tools/releasetools/payload_signer.py
View File

@@ -95,11 +95,11 @@ class PayloadSigner(object):
# 1. Generate hashes of the payload and metadata files. # 1. Generate hashes of the payload and metadata files.
payload_sig_file = common.MakeTempFile(prefix="sig-", suffix=".bin") payload_sig_file = common.MakeTempFile(prefix="sig-", suffix=".bin")
metadata_sig_file = common.MakeTempFile(prefix="sig-", suffix=".bin") metadata_sig_file = common.MakeTempFile(prefix="sig-", suffix=".bin")
cmd = ["brillo_update_payload", "hash", cmd = ["delta_generator",
"--unsigned_payload", unsigned_payload, "--in_file=" + unsigned_payload,
"--signature_size", str(self.maximum_signature_size), "--signature_size=" + str(self.maximum_signature_size),
"--metadata_hash_file", metadata_sig_file, "--out_metadata_hash_file=" + metadata_sig_file,
"--payload_hash_file", payload_sig_file] "--out_hash_file=" + payload_sig_file]
self._Run(cmd) self._Run(cmd)
# 2. Sign the hashes. # 2. Sign the hashes.
@@ -109,16 +109,15 @@ class PayloadSigner(object):
# 3. Insert the signatures back into the payload file. # 3. Insert the signatures back into the payload file.
signed_payload_file = common.MakeTempFile(prefix="signed-payload-", signed_payload_file = common.MakeTempFile(prefix="signed-payload-",
suffix=".bin") suffix=".bin")
cmd = ["brillo_update_payload", "sign", cmd = ["delta_generator",
"--unsigned_payload", unsigned_payload, "--in_file=" + unsigned_payload,
"--payload", signed_payload_file, "--out_file=" + signed_payload_file,
"--signature_size", str(self.maximum_signature_size), "--signature_size=" + str(self.maximum_signature_size),
"--metadata_signature_file", signed_metadata_sig_file, "--metadata_signature_file=" + signed_metadata_sig_file,
"--payload_signature_file", signed_payload_sig_file] "--payload_signature_file=" + signed_payload_sig_file]
self._Run(cmd) self._Run(cmd)
return signed_payload_file return signed_payload_file
def SignHashFile(self, in_file): def SignHashFile(self, in_file):
"""Signs the given input file. Returns the output filename.""" """Signs the given input file. Returns the output filename."""
out_file = common.MakeTempFile(prefix="signed-", suffix=".bin") out_file = common.MakeTempFile(prefix="signed-", suffix=".bin")