Revert 150375 - Implement SHA-256 fingerprint support

net/base/ev_root_ca_metadata.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/base/ev_root_ca_metadata.h"
 
 #if defined(USE_NSS)
 #include <cert.h>
 #include <pkcs11n.h>
 #include <secerr.h>
@@ skipping 15 matching lines @@
   // kMaxOIDsPerCA is the number of OIDs that we can support per root CA. At
   // least one CA has different EV policies for businuss vs government
   // entities and, in the case of cross-signing, we might need to list another
   // CA's policy OID under the cross-signing root.
   static const size_t kMaxOIDsPerCA = 2;
   // This is the maximum length of an OID string (including the trailing NUL).
   static const size_t kMaxOIDLength = 32;
 
   // The SHA-1 fingerprint of the root CA certificate, used as a unique
   // identifier for a root CA certificate.
-  SHA1HashValue fingerprint;
+  SHA1Fingerprint fingerprint;
 
   // The EV policy OIDs of the root CA.
   const char policy_oids[kMaxOIDsPerCA][kMaxOIDLength];
 };
 
 static const EVMetadata ev_root_ca_metadata[] = {
   // AddTrust External CA Root
   // https://addtrustexternalcaroot-ev.comodoca.com
   { { { 0x02, 0xfa, 0xf3, 0xe2, 0x91, 0x43, 0x54, 0x68, 0x60, 0x78,
         0x57, 0x69, 0x4d, 0xf5, 0xe4, 0x5b, 0x68, 0x85, 0x18, 0x68 } },
@@ skipping 19 matching lines @@
   // AffirmTrust Premium
   // https://premium.affirmtrust.com:4432/
   { { { 0xd8, 0xa6, 0x33, 0x2c, 0xe0, 0x03, 0x6f, 0xb1, 0x85, 0xf6,
         0x63, 0x4f, 0x7d, 0x6a, 0x06, 0x65, 0x26, 0x32, 0x28, 0x27 } },
     {"1.3.6.1.4.1.34697.2.3", ""},
   },
   // AffirmTrust Premium ECC
   // https://premiumecc.affirmtrust.com:4433/
   { { { 0xb8, 0x23, 0x6b, 0x00, 0x2f, 0x1d, 0x16, 0x86, 0x53, 0x01,
         0x55, 0x6c, 0x11, 0xa4, 0x37, 0xca, 0xeb, 0xff, 0xc3, 0xbb } },
-    {"1.3.6.1.4.1.34697.2.4", ""},
+   {"1.3.6.1.4.1.34697.2.4", ""},
   },
   // CertPlus Class 2 Primary CA (KEYNECTIS)
   // https://www.keynectis.com/
   { { { 0x74, 0x20, 0x74, 0x41, 0x72, 0x9c, 0xdd, 0x92, 0xec, 0x79,
         0x31, 0xd8, 0x23, 0x10, 0x8d, 0xc2, 0x81, 0x92, 0xe2, 0xbb } },
     {"1.3.6.1.4.1.22234.2.5.2.3.1", ""},
   },
   // Certum Trusted Network CA
   // https://juice.certum.pl/
   { { { 0x07, 0xe0, 0x32, 0xe0, 0x20, 0xb7, 0x2c, 0x3f, 0x19, 0x2f,
@@ skipping 228 matching lines @@
     g_ev_root_ca_metadata = LAZY_INSTANCE_INITIALIZER;
 
 // static
 EVRootCAMetadata* EVRootCAMetadata::GetInstance() {
   return g_ev_root_ca_metadata.Pointer();
 }
 
 #if defined(USE_NSS)
 
 bool EVRootCAMetadata::GetPolicyOIDsForCA(
-    const SHA1HashValue& fingerprint,
+    const SHA1Fingerprint& fingerprint,
     std::vector<PolicyOID>* policy_oids) const {
   PolicyOIDMap::const_iterator iter = ev_policy_.find(fingerprint);
   if (iter == ev_policy_.end())
     return false;
   for (std::vector<PolicyOID>::const_iterator
        j = iter->second.begin(); j != iter->second.end(); ++j) {
     policy_oids->push_back(*j);
   }
   return true;
 }
 
 const EVRootCAMetadata::PolicyOID* EVRootCAMetadata::GetPolicyOIDs() const {
   return &policy_oids_[0];
 }
 
 int EVRootCAMetadata::NumPolicyOIDs() const {
   return policy_oids_.size();
 }
 
-bool EVRootCAMetadata::AddEVCA(const SHA1HashValue& fingerprint,
+bool EVRootCAMetadata::AddEVCA(const SHA1Fingerprint& fingerprint,
                                const char* policy) {
   if (ev_policy_.find(fingerprint) != ev_policy_.end())
     return false;
 
   PolicyOID oid;
   if (!RegisterOID(policy, &oid))
     return false;
 
   ev_policy_[fingerprint].push_back(oid);
   policy_oids_.push_back(oid);
 
   return true;
 }
 
-bool EVRootCAMetadata::RemoveEVCA(const SHA1HashValue& fingerprint) {
+bool EVRootCAMetadata::RemoveEVCA(const SHA1Fingerprint& fingerprint) {
   PolicyOIDMap::iterator it = ev_policy_.find(fingerprint);
   if (it == ev_policy_.end())
     return false;
   PolicyOID oid = it->second[0];
   ev_policy_.erase(it);
 
   std::vector<PolicyOID>::iterator it2 = std::find(
       policy_oids_.begin(), policy_oids_.end(), oid);
   if (it2 == policy_oids_.end())
     return false;
@@ skipping 38 matching lines @@
 
   for (ExtraEVCAMap::const_iterator i = extra_cas_.begin();
        i != extra_cas_.end(); i++) {
     if (i->second == policy_oid)
       return true;
   }
 
   return false;
 }
 
-bool EVRootCAMetadata::HasEVPolicyOID(const SHA1HashValue& fingerprint,
+bool EVRootCAMetadata::HasEVPolicyOID(const SHA1Fingerprint& fingerprint,
                                       PolicyOID policy_oid) const {
   for (size_t i = 0; i < arraysize(ev_root_ca_metadata); i++) {
     if (!fingerprint.Equals(ev_root_ca_metadata[i].fingerprint))
       continue;
     for (size_t j = 0; j < arraysize(ev_root_ca_metadata[i].policy_oids); j++) {
       if (ev_root_ca_metadata[i].policy_oids[j][0] == '\0')
         break;
       if (strcmp(policy_oid, ev_root_ca_metadata[i].policy_oids[j]) == 0)
         return true;
     }
     return false;
   }
 
   ExtraEVCAMap::const_iterator it = extra_cas_.find(fingerprint);
   return it != extra_cas_.end() && it->second == policy_oid;
 }
 
-bool EVRootCAMetadata::AddEVCA(const SHA1HashValue& fingerprint,
+bool EVRootCAMetadata::AddEVCA(const SHA1Fingerprint& fingerprint,
                                const char* policy) {
   for (size_t i = 0; i < arraysize(ev_root_ca_metadata); i++) {
     if (fingerprint.Equals(ev_root_ca_metadata[i].fingerprint))
       return false;
   }
 
   if (extra_cas_.find(fingerprint) != extra_cas_.end())
     return false;
 
   extra_cas_[fingerprint] = policy;
   return true;
 }
 
-bool EVRootCAMetadata::RemoveEVCA(const SHA1HashValue& fingerprint) {
+bool EVRootCAMetadata::RemoveEVCA(const SHA1Fingerprint& fingerprint) {
   ExtraEVCAMap::iterator it = extra_cas_.find(fingerprint);
   if (it == extra_cas_.end())
     return false;
   extra_cas_.erase(it);
   return true;
 }
 
 #else
 
 // These are just stub functions for platforms where we don't use this EV
 // metadata.
 
-bool EVRootCAMetadata::AddEVCA(const SHA1HashValue& fingerprint,
+bool EVRootCAMetadata::AddEVCA(const SHA1Fingerprint& fingerprint,
                                const char* policy) {
   return true;
 }
 
-bool EVRootCAMetadata::RemoveEVCA(const SHA1HashValue& fingerprint) {
+bool EVRootCAMetadata::RemoveEVCA(const SHA1Fingerprint& fingerprint) {
   return true;
 }
 
 #endif
 
 EVRootCAMetadata::EVRootCAMetadata() {
   // Constructs the object from the raw metadata in ev_root_ca_metadata.
 #if defined(USE_NSS)
   crypto::EnsureNSSInit();
 
@@ skipping 13 matching lines @@
       ev_policy_[metadata.fingerprint].push_back(policy);
       policy_oids_.push_back(policy);
     }
   }
 #endif
 }
 
 EVRootCAMetadata::~EVRootCAMetadata() { }
 
 }  // namespace net