commit 57255d8aa09e44d81991e0359191e5f800e956c6
author Tianjie Xu <xunchang@google.com> Mon Oct 22 20:00:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 22 20:00:21 2018 -0700
tree 71581affea0fcb88009058fe67263214a6eda5c5
parent 3d5a941b0b1671c3ccc3dd25faa2cd7de738b0b0
parent 10c9282e0797b7edbe324d27f8fb6d48d134ab00

Merge "Recovery now expects public keys in zipfile" am: bfc7d43c00 am: 9008b2c7df
am: 10c9282e07

Change-Id: I7954d85378ff4616c1127dfe2b3e82b0d69b4e5e

install.cpp

diff --git a/install.cpp b/install.cpp
index e379ef3..42d2641 100644
--- a/install.cpp
+++ b/install.cpp
@@ -695,18 +695,18 @@
 }
 
 bool verify_package(const unsigned char* package_data, size_t package_size) {
-  static constexpr const char* PUBLIC_KEYS_FILE = "/res/keys";
-  std::vector<Certificate> loadedKeys;
-  if (!load_keys(PUBLIC_KEYS_FILE, loadedKeys)) {
+  static constexpr const char* CERTIFICATE_ZIP_FILE = "/system/etc/security/otacerts.zip";
+  std::vector<Certificate> loaded_keys = LoadKeysFromZipfile(CERTIFICATE_ZIP_FILE);
+  if (loaded_keys.empty()) {
     LOG(ERROR) << "Failed to load keys";
     return false;
   }
-  LOG(INFO) << loadedKeys.size() << " key(s) loaded from " << PUBLIC_KEYS_FILE;
+  LOG(INFO) << loaded_keys.size() << " key(s) loaded from " << CERTIFICATE_ZIP_FILE;
 
   // Verify package.
   ui->Print("Verifying update package...\n");
   auto t0 = std::chrono::system_clock::now();
-  int err = verify_file(package_data, package_size, loadedKeys,
+  int err = verify_file(package_data, package_size, loaded_keys,
                         std::bind(&RecoveryUI::SetProgress, ui, std::placeholders::_1));
   std::chrono::duration<double> duration = std::chrono::system_clock::now() - t0;
   ui->Print("Update package verification took %.1f s (result %d).\n", duration.count(), err);