diff options
| author | Sen Jiang <senj@chromium.org> | 2015-10-27 10:55:21 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-10-27 14:53:19 -0700 |
| commit | f83692cb5a663d9d817a6c8ebe9f4c298f5932e3 (patch) | |
| tree | c2d4885e51f99a75ff70c921d5abe4aaee014eed | |
| parent | ce0ad8bc37d0612552368c81fe3aa914a235da75 (diff) | |
| download | chromite-f83692cb5a663d9d817a6c8ebe9f4c298f5932e3.tar.gz | |
paygen: Fix GenMetadataHash to pass out_hash_file to delta_generator.
delta_generator now needs out_hash_file flag to be passed when calculating
hash.
Just a quick fix here, will refactor to combine _GenPayloadHash and
_GenMetadataHash together later.
BUG=chromium:548257
TEST=./paygen_payload_lib_unittest
Change-Id: Ie3b9ec861cb9faa861200b1966aca178a7ecbac4
Reviewed-on: https://chromium-review.googlesource.com/309029
Commit-Ready: Alex Deymo <deymo@chromium.org>
Tested-by: Sen Jiang <senj@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
| -rw-r--r-- | lib/paygen/paygen_payload_lib.py | 3 | ||||
| -rw-r--r-- | lib/paygen/paygen_payload_lib_unittest.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/paygen/paygen_payload_lib.py b/lib/paygen/paygen_payload_lib.py index 72731157c..fc97be498 100644 --- a/lib/paygen/paygen_payload_lib.py +++ b/lib/paygen/paygen_payload_lib.py @@ -359,9 +359,11 @@ class _PaygenPayload(object): # How big will the signatures be. signature_sizes = [str(size) for size in self.PAYLOAD_SIGNATURE_SIZES_BYTES] + # The out_metadata_hash_file flag requires out_hash_file flag to be set. with tempfile.NamedTemporaryFile('rb') as metadata_hash_file: cmd = ['delta_generator', '-in_file=' + self.payload_file, + '-out_hash_file=/dev/null', '-out_metadata_hash_file=' + metadata_hash_file.name, '-signature_size=' + ':'.join(signature_sizes)] @@ -538,6 +540,7 @@ class _PaygenPayload(object): List of payload signatures, List of metadata signatures. """ # Create hashes to sign. + # TODO(senj): Calculate the two hashes in one shot. payload_hash = self._GenPayloadHash() metadata_hash = self._GenMetadataHash() diff --git a/lib/paygen/paygen_payload_lib_unittest.py b/lib/paygen/paygen_payload_lib_unittest.py index 9526998ed..68daf22b2 100644 --- a/lib/paygen/paygen_payload_lib_unittest.py +++ b/lib/paygen/paygen_payload_lib_unittest.py @@ -433,6 +433,7 @@ class PaygenPayloadLibBasicTest(PaygenPayloadLibTest): # Record the expected function calls. cmd = ['delta_generator', '-in_file=' + gen.payload_file, + '-out_hash_file=/dev/null', mox.IsA(str), '-signature_size=256'] gen._RunGeneratorCmd(cmd) |