Merge "Fix wrong key indexes in package verification logs." am: 11563e2721 am: 6e88cc2db0 am: 2ac9924aa9
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933119
Change-Id: I8082eb049f167fae0ce556b5035e986a5d6541a5
diff --git a/otautil/verifier.cpp b/otautil/verifier.cpp
index 92b9faf..8a65566 100644
--- a/otautil/verifier.cpp
+++ b/otautil/verifier.cpp
@@ -257,8 +257,8 @@
// 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 @@
} else {
LOG(INFO) << "Unknown key type " << key.key_type;
}
- i++;
}
if (need_sha1) {