commit 3fe496491e6c3d129470422199d51d7498533a7e
author Kelvin Zhang <zhangkelvin@google.com> Mon Oct 04 15:35:02 2021 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Oct 19 14:15:14 2021 -0700
tree 6de338346bda6e054b9c5659b6e4601f9c42c097
parent cc04de757c9087dab79b7c1fa48ad19f01fcdb82

Add UpdateAttempterIntegrationTesting

Test: th
Bug: 201099341

Change-Id: I46d5ad86e238d28b7c20ef6768ffadf0e6ab9177

payload_consumer/delta_performer.cc

diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index a383bf6..cc36a4e 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -265,7 +265,7 @@
 namespace {
 
 void LogPartitionInfoHash(const PartitionInfo& info, const string& tag) {
-  string sha256 = brillo::data_encoding::Base64Encode(info.hash());
+  string sha256 = HexEncode(info.hash());
   LOG(INFO) << "PartitionInfo " << tag << " sha256: " << sha256
             << " size: " << info.size();
 }
@@ -892,6 +892,7 @@
   if (public_key.empty()) {
     return {nullptr, false};
   }
+  LOG(INFO) << "Verifing using public key: " << public_key;
   return {PayloadVerifier::CreateInstance(public_key), true};
 }
 

payload_consumer/filesystem_verifier_action.cc

diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc
index 8b39f6d..0da3fba 100644
--- a/payload_consumer/filesystem_verifier_action.cc
+++ b/payload_consumer/filesystem_verifier_action.cc
@@ -434,7 +434,7 @@
   InstallPlan::Partition& partition =
       install_plan_.partitions[partition_index_];
   LOG(INFO) << "Hash of " << partition.name << ": "
-            << Base64Encode(hasher_->raw_hash());
+            << HexEncode(hasher_->raw_hash());
 
   switch (verifier_step_) {
     case VerifierStep::kVerifyTargetHash: