Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6581dc4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong key indexes in package verification logs." am: 11563e27 am:... 

Merge "Fix wrong key indexes in package verification logs." am: 11563e27 am: 6e88cc2d am: 2ac9924a

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933119

Change-Id: I8082eb049f167fae0ce556b5035e986a5d6541a5
parents 2c48bd47 2ac9924a

otautil/verifier.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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) {