diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-29 20:08:20 +0100 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-29 20:08:20 +0100 |
commit | 6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0 (patch) | |
tree | a1402284b7822169d31a81672d7361a5d057b24d | |
parent | Merge "Move package verifier from libinstall to libotautil" am: 86df64785a (diff) | |
parent | Merge "Fix wrong key indexes in package verification logs." (diff) | |
download | android_bootable_recovery-6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0.tar android_bootable_recovery-6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0.tar.gz android_bootable_recovery-6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0.tar.bz2 android_bootable_recovery-6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0.tar.lz android_bootable_recovery-6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0.tar.xz android_bootable_recovery-6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0.tar.zst android_bootable_recovery-6e88cc2db000bbfb93a4dbe1d4743d69e067f8f0.zip |
-rw-r--r-- | otautil/verifier.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/otautil/verifier.cpp b/otautil/verifier.cpp index 92b9faf29..8a65566ec 100644 --- a/otautil/verifier.cpp +++ b/otautil/verifier.cpp @@ -257,8 +257,8 @@ int verify_file(VerifierInterface* package, const std::vector<Certificate>& keys // Check to make sure at least one of the keys matches the signature. Since any key can match, // we need to try each before determining a verification failure has happened. - size_t i = 0; - for (const auto& key : keys) { + for (size_t i = 0; i < keys.size(); i++) { + const auto& key = keys[i]; const uint8_t* hash; int hash_nid; switch (key.hash_len) { @@ -296,7 +296,6 @@ int verify_file(VerifierInterface* package, const std::vector<Certificate>& keys } else { LOG(INFO) << "Unknown key type " << key.key_type; } - i++; } if (need_sha1) { |