commit ec0a7b510e3994640c5b56349386c070ffe28ed2
author Gilad Arnold <garnold@chromium.org> Sat May 04 00:24:58 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue May 07 00:03:15 2013 -0700
tree 33cb0c030c3326ccfaf665f9e424f630fcccc6a3
parent a06a1c3fec3d971599922ca9c048cee514921554

paycheck: use base64 encoding for SHA256 hashes throughout

Turns out we were using base64 when adding SHA256 data to a payload
report, but intermittently using hex encoding in error messages. This is
now fixed.

BUG=None
TEST=No mention of hex encoding in the code
TEST=gpylinted correctly
TEST=Passes unit tests

Change-Id: Id2dc2fcd154d4647cc1a076579dde7a789c09e40
Reviewed-on: https://gerrit.chromium.org/gerrit/50104
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>

host/lib/update_payload/applier.py

diff --git a/host/lib/update_payload/applier.py b/host/lib/update_payload/applier.py
index 3b7b1a6..cd9fd06 100644
--- a/host/lib/update_payload/applier.py
+++ b/host/lib/update_payload/applier.py
@@ -62,8 +62,8 @@
   actual_hash = hasher.digest()
   if actual_hash != expected_hash:
     raise PayloadError('%s hash (%s) not as expected (%s)' %
-                       (name, actual_hash.encode('hex'),
-                        expected_hash.encode('hex')))
+                       (name, common.FormatSha256(actual_hash),
+                        common.FormatSha256(expected_hash)))
 
 
 def _ReadExtents(file_obj, extents, block_size, max_length=-1):

host/lib/update_payload/checker.py

diff --git a/host/lib/update_payload/checker.py b/host/lib/update_payload/checker.py
index e1b08a1..13a0518 100644
--- a/host/lib/update_payload/checker.py
+++ b/host/lib/update_payload/checker.py
@@ -437,8 +437,8 @@
     signed_hash = signed_data[len(common.SIG_ASN1_HEADER):]
     if signed_hash != actual_hash:
       raise PayloadError('%s: signed hash (%s) different from actual (%s)' %
-                         (sig_name, signed_hash.encode('hex'),
-                          actual_hash.encode('hex')))
+                         (sig_name, common.FormatSha256(signed_hash),
+                          common.FormatSha256(actual_hash)))
 
   @staticmethod
   def _CheckBlocksFitLength(length, num_blocks, block_size, length_name,
@@ -837,8 +837,8 @@
       if op.data_sha256_hash != actual_hash.digest():
         raise PayloadError(
             '%s: data_sha256_hash (%s) does not match actual hash (%s)' %
-            (op_name, op.data_sha256_hash.encode('hex'),
-             actual_hash.hexdigest()))
+            (op_name, common.FormatSha256(op.data_sha256_hash),
+             common.FormatSha256(actual_hash.digest())))
     elif data_offset is not None:
       if allow_signature_in_extents:
         blob_hash_counts['signature'] += 1