Refactor the assignment of CertVerifyResult::has_md2, etc.

net/cert/cert_verify_proc_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/cert_verify_proc_android.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 61 matching lines @@
       verify_result->verified_cert = verified_cert;
   }
 
   // Extract the algorithm information from the certs
   X509Certificate::OSCertHandles chain;
   const X509Certificate::OSCertHandles& intermediates =
       verify_result->verified_cert->GetIntermediateCertificates();
   chain.push_back(verify_result->verified_cert->os_cert_handle());
   chain.insert(chain.end(), intermediates.begin(), intermediates.end());
 
-  // If the chain successfully verified, ignore the trust anchor (the last
-  // certificate). Otherwise, assume the chain is partial. This is not entirely
-  // correct, as a full chain may have been constructed and then failed to
-  // validate. However, if that is the case, the more serious error will
-  // override any SHA-1 considerations.
-  size_t correction_for_root =
-      (status == android::CERT_VERIFY_STATUS_ANDROID_OK) ? 1 : 0;
-  for (size_t i = 0; i < chain.size() - correction_for_root; ++i) {
-    FillCertVerifyResultWeakSignature(chain[i], i == 0, verify_result);
-  }
-
   // Extract the public key hashes.
   for (size_t i = 0; i < verified_chain.size(); i++) {
     base::StringPiece spki_bytes;
     if (!asn1::ExtractSPKIFromDERCert(verified_chain[i], &spki_bytes))
       continue;
 
     HashValue sha1(HASH_VALUE_SHA1);
     base::SHA1HashBytes(reinterpret_cast<const uint8_t*>(spki_bytes.data()),
                         spki_bytes.size(), sha1.data());
     verify_result->public_key_hashes.push_back(sha1);
@@ skipping 62 matching lines @@
     NOTREACHED();
     return ERR_FAILED;
   }
   if (IsCertStatusError(verify_result->cert_status))
     return MapCertStatusToNetError(verify_result->cert_status);
 
   return OK;
 }
 
 }  // namespace net