Revert "net: rework the EV metadata"

This reverts commit r126641.

Shared build unhappy.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126646 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 171 insertions, 347 deletions

diff --git a/net/base/cert_test_util.cc b/net/base/cert_test_util.cc
index cdfd6b0..cce160d 100644
--- a/net/base/cert_test_util.cc
+++ b/net/base/cert_test_util.cc
@@ -7,9 +7,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "net/base/ev_root_ca_metadata.h"
 #include "net/base/x509_certificate.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
@@ -52,16 +50,4 @@ scoped_refptr<X509Certificate> ImportCertFromFile(
   return certs_in_file[0];
 }
 
-ScopedTestEVPolicy::ScopedTestEVPolicy(EVRootCAMetadata* ev_root_ca_metadata,
-                                       const SHA1Fingerprint& fingerprint,
-                                       const char* policy)
-    : fingerprint_(fingerprint),
-      ev_root_ca_metadata_(ev_root_ca_metadata) {
-  EXPECT_TRUE(ev_root_ca_metadata->AddEVCA(fingerprint, policy));
-}
-
-ScopedTestEVPolicy::~ScopedTestEVPolicy() {
-  EXPECT_TRUE(ev_root_ca_metadata_->RemoveEVCA(fingerprint_));
-}
-
 }  // namespace net
diff --git a/net/base/cert_test_util.h b/net/base/cert_test_util.h
index 15ceb58..4078acc 100644
--- a/net/base/cert_test_util.h
+++ b/net/base/cert_test_util.h
@@ -9,15 +9,12 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "net/base/x509_cert_types.h"
 #include "net/base/x509_certificate.h"
 
 class FilePath;
 
 namespace net {
 
-class EVRootCAMetadata;
-
 // Returns a FilePath object representing the src/net/data/ssl/certificates
 // directory in the source tree.
 FilePath GetTestCertsDirectory();
@@ -33,23 +30,6 @@ CertificateList CreateCertificateListFromFile(const FilePath& certs_dir,
 scoped_refptr<X509Certificate> ImportCertFromFile(const FilePath& certs_dir,
                                                   const std::string& cert_file);
 
-// ScopedTestEVPolicy causes certificates marked with |policy|, issued from a
-// root with the given fingerprint, to be treated as EV. |policy| is expressed
-// as a string of dotted numbers: i.e. "1.2.3.4".
-// This should only be used in unittests as adding a CA twice causes a CHECK
-// failure.
-class ScopedTestEVPolicy {
- public:
-  ScopedTestEVPolicy(EVRootCAMetadata* ev_root_ca_metadata,
-                     const SHA1Fingerprint& fingerprint,
-                     const char* policy);
-  ~ScopedTestEVPolicy();
-
- private:
-  SHA1Fingerprint fingerprint_;
-  EVRootCAMetadata* const ev_root_ca_metadata_;
-};
-
 }  // namespace net
 
 #endif  // NET_BASE_CERT_TEST_UTIL_H_
diff --git a/net/base/ev_root_ca_metadata.cc b/net/base/ev_root_ca_metadata.cc
index 6a6aba6..b387912 100644
--- a/net/base/ev_root_ca_metadata.cc
+++ b/net/base/ev_root_ca_metadata.cc
@@ -15,28 +15,17 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#if defined(USE_NSS)
-#include "crypto/nss_util.h"
-#endif
 
 namespace net {
 
 // Raw metadata.
 struct EVMetadata {
-  // 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.
   SHA1Fingerprint fingerprint;
 
   // The EV policy OIDs of the root CA.
-  const char policy_oids[kMaxOIDsPerCA][kMaxOIDLength];
+  const char* policy_oids[3];
 };
 
 static const EVMetadata ev_root_ca_metadata[] = {
@@ -49,127 +38,128 @@ static const EVMetadata ev_root_ca_metadata[] = {
       // This is the Network Solutions EV OID. However, this root
       // cross-certifies NetSol and so we need it here too.
       "1.3.6.1.4.1.782.1.2.1.8.1",
+      NULL,
     },
   },
   // AffirmTrust Commercial
   // https://commercial.affirmtrust.com/
   { { { 0xf9, 0xb5, 0xb6, 0x32, 0x45, 0x5f, 0x9c, 0xbe, 0xec, 0x57,
         0x5f, 0x80, 0xdc, 0xe9, 0x6e, 0x2c, 0xc7, 0xb2, 0x78, 0xb7 } },
-    {"1.3.6.1.4.1.34697.2.1", ""},
+    {"1.3.6.1.4.1.34697.2.1", NULL},
   },
   // AffirmTrust Networking
   // https://networking.affirmtrust.com:4431
   { { { 0x29, 0x36, 0x21, 0x02, 0x8b, 0x20, 0xed, 0x02, 0xf5, 0x66,
         0xc5, 0x32, 0xd1, 0xd6, 0xed, 0x90, 0x9f, 0x45, 0x00, 0x2f } },
-    {"1.3.6.1.4.1.34697.2.2", ""},
+    {"1.3.6.1.4.1.34697.2.2", NULL},
   },
   // 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", ""},
+    {"1.3.6.1.4.1.34697.2.3", NULL},
   },
   // 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", NULL},
   },
   // 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", ""},
+    {"1.3.6.1.4.1.22234.2.5.2.3.1", NULL},
   },
   // Certum Trusted Network CA
   // https://juice.certum.pl/
   { { { 0x07, 0xe0, 0x32, 0xe0, 0x20, 0xb7, 0x2c, 0x3f, 0x19, 0x2f,
         0x06, 0x28, 0xa2, 0x59, 0x3a, 0x19, 0xa7, 0x0f, 0x06, 0x9e } },
-    {"1.2.616.1.113527.2.5.1.1", ""},
+    {"1.2.616.1.113527.2.5.1.1", NULL},
   },
   // COMODO Certification Authority
   // https://secure.comodo.com/
   { { { 0x66, 0x31, 0xbf, 0x9e, 0xf7, 0x4f, 0x9e, 0xb6, 0xc9, 0xd5,
         0xa6, 0x0c, 0xba, 0x6a, 0xbe, 0xd1, 0xf7, 0xbd, 0xef, 0x7b } },
-    {"1.3.6.1.4.1.6449.1.2.1.5.1", ""},
+    {"1.3.6.1.4.1.6449.1.2.1.5.1", NULL},
   },
   // COMODO Certification Authority (reissued certificate with NotBefore of Jan
   // 1 00:00:00 2011 GMT)
   // https://secure.comodo.com/
   { { { 0xee, 0x86, 0x93, 0x87, 0xff, 0xfd, 0x83, 0x49, 0xab, 0x5a,
         0xd1, 0x43, 0x22, 0x58, 0x87, 0x89, 0xa4, 0x57, 0xb0, 0x12 } },
-    {"1.3.6.1.4.1.6449.1.2.1.5.1", ""},
+    {"1.3.6.1.4.1.6449.1.2.1.5.1", NULL},
   },
   // COMODO ECC Certification Authority
   // https://comodoecccertificationauthority-ev.comodoca.com/
   { { { 0x9f, 0x74, 0x4e, 0x9f, 0x2b, 0x4d, 0xba, 0xec, 0x0f, 0x31,
         0x2c, 0x50, 0xb6, 0x56, 0x3b, 0x8e, 0x2d, 0x93, 0xc3, 0x11 } },
-    {"1.3.6.1.4.1.6449.1.2.1.5.1", ""},
+    {"1.3.6.1.4.1.6449.1.2.1.5.1", NULL},
   },
   // Cybertrust Global Root
   // https://evup.cybertrust.ne.jp/ctj-ev-upgrader/evseal.gif
   { { { 0x5f, 0x43, 0xe5, 0xb1, 0xbf, 0xf8, 0x78, 0x8c, 0xac, 0x1c,
         0xc7, 0xca, 0x4a, 0x9a, 0xc6, 0x22, 0x2b, 0xcc, 0x34, 0xc6 } },
-    {"1.3.6.1.4.1.6334.1.100.1", ""},
+    {"1.3.6.1.4.1.6334.1.100.1", NULL},
   },
   // DigiCert High Assurance EV Root CA
   // https://www.digicert.com
   { { { 0x5f, 0xb7, 0xee, 0x06, 0x33, 0xe2, 0x59, 0xdb, 0xad, 0x0c,
         0x4c, 0x9a, 0xe6, 0xd3, 0x8f, 0x1a, 0x61, 0xc7, 0xdc, 0x25 } },
-    {"2.16.840.1.114412.2.1", ""},
+    {"2.16.840.1.114412.2.1", NULL},
   },
   // Entrust.net Secure Server Certification Authority
   // https://www.entrust.net/
   { { { 0x99, 0xa6, 0x9b, 0xe6, 0x1a, 0xfe, 0x88, 0x6b, 0x4d, 0x2b,
         0x82, 0x00, 0x7c, 0xb8, 0x54, 0xfc, 0x31, 0x7e, 0x15, 0x39 } },
-    {"2.16.840.1.114028.10.1.2", ""},
+    {"2.16.840.1.114028.10.1.2", NULL},
   },
   // Entrust Root Certification Authority
   // https://www.entrust.net/
   { { { 0xb3, 0x1e, 0xb1, 0xb7, 0x40, 0xe3, 0x6c, 0x84, 0x02, 0xda,
         0xdc, 0x37, 0xd4, 0x4d, 0xf5, 0xd4, 0x67, 0x49, 0x52, 0xf9 } },
-    {"2.16.840.1.114028.10.1.2", ""},
+    {"2.16.840.1.114028.10.1.2", NULL},
   },
   // Equifax Secure Certificate Authority (GeoTrust)
   // https://www.geotrust.com/
   { { { 0xd2, 0x32, 0x09, 0xad, 0x23, 0xd3, 0x14, 0x23, 0x21, 0x74,
         0xe4, 0x0d, 0x7f, 0x9d, 0x62, 0x13, 0x97, 0x86, 0x63, 0x3a } },
-    {"1.3.6.1.4.1.14370.1.6", ""},
+    {"1.3.6.1.4.1.14370.1.6", NULL},
   },
   // GeoTrust Primary Certification Authority
   // https://www.geotrust.com/
   { { { 0x32, 0x3c, 0x11, 0x8e, 0x1b, 0xf7, 0xb8, 0xb6, 0x52, 0x54,
         0xe2, 0xe2, 0x10, 0x0d, 0xd6, 0x02, 0x90, 0x37, 0xf0, 0x96 } },
-    {"1.3.6.1.4.1.14370.1.6", ""},
+    {"1.3.6.1.4.1.14370.1.6", NULL},
   },
   // GlobalSign Root CA - R2
   // https://www.globalsign.com/
   { { { 0x75, 0xe0, 0xab, 0xb6, 0x13, 0x85, 0x12, 0x27, 0x1c, 0x04,
         0xf8, 0x5f, 0xdd, 0xde, 0x38, 0xe4, 0xb7, 0x24, 0x2e, 0xfe } },
-    {"1.3.6.1.4.1.4146.1.1", ""},
+    {"1.3.6.1.4.1.4146.1.1", NULL},
   },
   // GlobalSign Root CA
   { { { 0xb1, 0xbc, 0x96, 0x8b, 0xd4, 0xf4, 0x9d, 0x62, 0x2a, 0xa8,
         0x9a, 0x81, 0xf2, 0x15, 0x01, 0x52, 0xa4, 0x1d, 0x82, 0x9c } },
-    {"1.3.6.1.4.1.4146.1.1", ""},
+    {"1.3.6.1.4.1.4146.1.1", NULL},
   },
   // GlobalSign Root CA - R3
   // https://2029.globalsign.com/
   { { { 0xd6, 0x9b, 0x56, 0x11, 0x48, 0xf0, 0x1c, 0x77, 0xc5, 0x45,
         0x78, 0xc1, 0x09, 0x26, 0xdf, 0x5b, 0x85, 0x69, 0x76, 0xad } },
-    {"1.3.6.1.4.1.4146.1.1", ""},
+    {"1.3.6.1.4.1.4146.1.1", NULL},
   },
   // Go Daddy Class 2 Certification Authority
   // https://www.godaddy.com/
   { { { 0x27, 0x96, 0xba, 0xe6, 0x3f, 0x18, 0x01, 0xe2, 0x77, 0x26,
         0x1b, 0xa0, 0xd7, 0x77, 0x70, 0x02, 0x8f, 0x20, 0xee, 0xe4 } },
-    {"2.16.840.1.114413.1.7.23.3", ""},
+    {"2.16.840.1.114413.1.7.23.3", NULL},
   },
   // GTE CyberTrust Global Root
   // https://www.cybertrust.ne.jp/
   { { { 0x97, 0x81, 0x79, 0x50, 0xd8, 0x1c, 0x96, 0x70, 0xcc, 0x34,
         0xd8, 0x09, 0xcf, 0x79, 0x44, 0x31, 0x36, 0x7e, 0xf4, 0x74 } },
-    {"1.3.6.1.4.1.6334.1.100.1", ""},
+    {"1.3.6.1.4.1.6334.1.100.1", NULL},
   },
   // Izenpe.com
   // The first OID is for businesses and the second for government entities.
@@ -178,85 +168,85 @@ static const EVMetadata ev_root_ca_metadata[] = {
   // https://servicios1.izenpe.com
   { { { 0x2f, 0x78, 0x3d, 0x25, 0x52, 0x18, 0xa7, 0x4a, 0x65, 0x39,
         0x71, 0xb5, 0x2c, 0xa2, 0x9c, 0x45, 0x15, 0x6f, 0xe9, 0x19} },
-    {"1.3.6.1.4.1.14777.6.1.1", "1.3.6.1.4.1.14777.6.1.2"},
+    {"1.3.6.1.4.1.14777.6.1.1", "1.3.6.1.4.1.14777.6.1.2", NULL},
   },
   //  Network Solutions Certificate Authority
   //  https://www.networksolutions.com/website-packages/index.jsp
   { { { 0x74, 0xf8, 0xa3, 0xc3, 0xef, 0xe7, 0xb3, 0x90, 0x06, 0x4b,
         0x83, 0x90, 0x3c, 0x21, 0x64, 0x60, 0x20, 0xe5, 0xdf, 0xce } },
-    {"1.3.6.1.4.1.782.1.2.1.8.1", ""},
+    {"1.3.6.1.4.1.782.1.2.1.8.1", NULL},
   },
   //  Network Solutions Certificate Authority (reissued certificate with
   //  NotBefore of Jan  1 00:00:00 2011 GMT).
   //  https://www.networksolutions.com/website-packages/index.jsp
   { { { 0x71, 0x89, 0x9a, 0x67, 0xbf, 0x33, 0xaf, 0x31, 0xbe, 0xfd,
         0xc0, 0x71, 0xf8, 0xf7, 0x33, 0xb1, 0x83, 0x85, 0x63, 0x32 } },
-    {"1.3.6.1.4.1.782.1.2.1.8.1", ""},
+    {"1.3.6.1.4.1.782.1.2.1.8.1", NULL},
   },
   // QuoVadis Root CA 2
   // https://www.quovadis.bm/
   { { { 0xca, 0x3a, 0xfb, 0xcf, 0x12, 0x40, 0x36, 0x4b, 0x44, 0xb2,
         0x16, 0x20, 0x88, 0x80, 0x48, 0x39, 0x19, 0x93, 0x7c, 0xf7 } },
-    {"1.3.6.1.4.1.8024.0.2.100.1.2", ""},
+    {"1.3.6.1.4.1.8024.0.2.100.1.2", NULL},
   },
   // SecureTrust CA, SecureTrust Corporation
   // https://www.securetrust.com
   // https://www.trustwave.com/
   { { { 0x87, 0x82, 0xc6, 0xc3, 0x04, 0x35, 0x3b, 0xcf, 0xd2, 0x96,
         0x92, 0xd2, 0x59, 0x3e, 0x7d, 0x44, 0xd9, 0x34, 0xff, 0x11 } },
-    {"2.16.840.1.114404.1.1.2.4.1", ""},
+    {"2.16.840.1.114404.1.1.2.4.1", NULL},
   },
   // Secure Global CA, SecureTrust Corporation
   { { { 0x3a, 0x44, 0x73, 0x5a, 0xe5, 0x81, 0x90, 0x1f, 0x24, 0x86,
         0x61, 0x46, 0x1e, 0x3b, 0x9c, 0xc4, 0x5f, 0xf5, 0x3a, 0x1b } },
-    {"2.16.840.1.114404.1.1.2.4.1", ""},
+    {"2.16.840.1.114404.1.1.2.4.1", NULL},
   },
   // Security Communication RootCA1
   // https://www.secomtrust.net/contact/form.html
   { { { 0x36, 0xb1, 0x2b, 0x49, 0xf9, 0x81, 0x9e, 0xd7, 0x4c, 0x9e,
         0xbc, 0x38, 0x0f, 0xc6, 0x56, 0x8f, 0x5d, 0xac, 0xb2, 0xf7 } },
-    {"1.2.392.200091.100.721.1", ""},
+    {"1.2.392.200091.100.721.1", NULL},
   },
   // Security Communication EV RootCA1
   // https://www.secomtrust.net/contact/form.html
   { { { 0xfe, 0xb8, 0xc4, 0x32, 0xdc, 0xf9, 0x76, 0x9a, 0xce, 0xae,
         0x3d, 0xd8, 0x90, 0x8f, 0xfd, 0x28, 0x86, 0x65, 0x64, 0x7d } },
-    {"1.2.392.200091.100.721.1", ""},
+    {"1.2.392.200091.100.721.1", NULL},
   },
   // StartCom Certification Authority
   // https://www.startssl.com/
   { { { 0x3e, 0x2b, 0xf7, 0xf2, 0x03, 0x1b, 0x96, 0xf3, 0x8c, 0xe6,
         0xc4, 0xd8, 0xa8, 0x5d, 0x3e, 0x2d, 0x58, 0x47, 0x6a, 0x0f } },
-    {"1.3.6.1.4.1.23223.1.1.1", ""},
+    {"1.3.6.1.4.1.23223.1.1.1", NULL},
   },
   // Starfield Class 2 Certification Authority
   // https://www.starfieldtech.com/
   { { { 0xad, 0x7e, 0x1c, 0x28, 0xb0, 0x64, 0xef, 0x8f, 0x60, 0x03,
         0x40, 0x20, 0x14, 0xc3, 0xd0, 0xe3, 0x37, 0x0e, 0xb5, 0x8a } },
-    {"2.16.840.1.114414.1.7.23.3", ""},
+    {"2.16.840.1.114414.1.7.23.3", NULL},
   },
   // SwissSign Gold CA - G2
   // https://testevg2.swisssign.net/
   { { { 0xd8, 0xc5, 0x38, 0x8a, 0xb7, 0x30, 0x1b, 0x1b, 0x6e, 0xd4,
         0x7a, 0xe6, 0x45, 0x25, 0x3a, 0x6f, 0x9f, 0x1a, 0x27, 0x61 } },
-    {"2.16.756.1.89.1.2.1.1", ""},
+    {"2.16.756.1.89.1.2.1.1", NULL},
   },
   // Thawte Premium Server CA
   // https://www.thawte.com/
   { { { 0x62, 0x7f, 0x8d, 0x78, 0x27, 0x65, 0x63, 0x99, 0xd2, 0x7d,
         0x7f, 0x90, 0x44, 0xc9, 0xfe, 0xb3, 0xf3, 0x3e, 0xfa, 0x9a } },
-    {"2.16.840.1.113733.1.7.48.1", ""},
+    {"2.16.840.1.113733.1.7.48.1", NULL},
   },
   // thawte Primary Root CA
   // https://www.thawte.com/
   { { { 0x91, 0xc6, 0xd6, 0xee, 0x3e, 0x8a, 0xc8, 0x63, 0x84, 0xe5,
         0x48, 0xc2, 0x99, 0x29, 0x5c, 0x75, 0x6c, 0x81, 0x7b, 0x81 } },
-    {"2.16.840.1.113733.1.7.48.1", ""},
+    {"2.16.840.1.113733.1.7.48.1", NULL},
   },
   // UTN - DATACorp SGC
   { { { 0x58, 0x11, 0x9f, 0x0e, 0x12, 0x82, 0x87, 0xea, 0x50, 0xfd,
         0xd9, 0x87, 0x45, 0x6f, 0x4f, 0x78, 0xdc, 0xfa, 0xd6, 0xd4 } },
-    {"1.3.6.1.4.1.6449.1.2.1.5.1", ""},
+    {"1.3.6.1.4.1.6449.1.2.1.5.1", NULL},
   },
   // UTN-USERFirst-Hardware
   { { { 0x04, 0x83, 0xed, 0x33, 0x99, 0xac, 0x36, 0x08, 0x05, 0x87,
@@ -266,38 +256,71 @@ static const EVMetadata ev_root_ca_metadata[] = {
       // This is the Network Solutions EV OID. However, this root
       // cross-certifies NetSol and so we need it here too.
       "1.3.6.1.4.1.782.1.2.1.8.1",
+      NULL,
     },
   },
   // ValiCert Class 2 Policy Validation Authority
   { { { 0x31, 0x7a, 0x2a, 0xd0, 0x7f, 0x2b, 0x33, 0x5e, 0xf5, 0xa1,
         0xc3, 0x4e, 0x4b, 0x57, 0xe8, 0xb7, 0xd8, 0xf1, 0xfc, 0xa6 } },
-    {"2.16.840.1.114413.1.7.23.3", "2.16.840.1.114414.1.7.23.3"},
+    {"2.16.840.1.114413.1.7.23.3", "2.16.840.1.114414.1.7.23.3", NULL},
   },
   // VeriSign Class 3 Public Primary Certification Authority
   // https://www.verisign.com/
   { { { 0x74, 0x2c, 0x31, 0x92, 0xe6, 0x07, 0xe4, 0x24, 0xeb, 0x45,
         0x49, 0x54, 0x2b, 0xe1, 0xbb, 0xc5, 0x3e, 0x61, 0x74, 0xe2 } },
-    {"2.16.840.1.113733.1.7.23.6", ""},
+    {"2.16.840.1.113733.1.7.23.6", NULL},
   },
   // VeriSign Class 3 Public Primary Certification Authority - G5
   // https://www.verisign.com/
   { { { 0x4e, 0xb6, 0xd5, 0x78, 0x49, 0x9b, 0x1c, 0xcf, 0x5f, 0x58,
         0x1e, 0xad, 0x56, 0xbe, 0x3d, 0x9b, 0x67, 0x44, 0xa5, 0xe5 } },
-    {"2.16.840.1.113733.1.7.23.6", ""},
+    {"2.16.840.1.113733.1.7.23.6", NULL},
   },
   // Wells Fargo WellsSecure Public Root Certificate Authority
   // https://nerys.wellsfargo.com/test.html
   { { { 0xe7, 0xb4, 0xf6, 0x9d, 0x61, 0xec, 0x90, 0x69, 0xdb, 0x7e,
         0x90, 0xa7, 0x40, 0x1a, 0x3c, 0xf4, 0x7d, 0x4f, 0xe8, 0xee } },
-    {"2.16.840.1.114171.500.9", ""},
+    {"2.16.840.1.114171.500.9", NULL},
   },
   // XRamp Global Certification Authority
   { { { 0xb8, 0x01, 0x86, 0xd1, 0xeb, 0x9c, 0x86, 0xa5, 0x41, 0x04,
         0xcf, 0x30, 0x54, 0xf3, 0x4c, 0x52, 0xb7, 0xe5, 0x58, 0xc6 } },
-    {"2.16.840.1.114404.1.1.2.4.1", ""},
+    {"2.16.840.1.114404.1.1.2.4.1", NULL},
   }
 };
 
+#if defined(OS_WIN)
+// static
+const EVRootCAMetadata::PolicyOID EVRootCAMetadata::policy_oids_[] = {
+  // The OIDs must be sorted in ascending order.
+  "1.2.392.200091.100.721.1",
+  "1.2.616.1.113527.2.5.1.1",
+  "1.3.6.1.4.1.14370.1.6",
+  "1.3.6.1.4.1.14777.6.1.1",
+  "1.3.6.1.4.1.14777.6.1.2",
+  "1.3.6.1.4.1.22234.2.5.2.3.1",
+  "1.3.6.1.4.1.23223.1.1.1",
+  "1.3.6.1.4.1.34697.2.1",
+  "1.3.6.1.4.1.34697.2.2",
+  "1.3.6.1.4.1.34697.2.3",
+  "1.3.6.1.4.1.34697.2.4",
+  "1.3.6.1.4.1.4146.1.1",
+  "1.3.6.1.4.1.6334.1.100.1",
+  "1.3.6.1.4.1.6449.1.2.1.5.1",
+  "1.3.6.1.4.1.782.1.2.1.8.1",
+  "1.3.6.1.4.1.8024.0.2.100.1.2",
+  "2.16.756.1.89.1.2.1.1",
+  "2.16.840.1.113733.1.7.23.6",
+  "2.16.840.1.113733.1.7.48.1",
+  "2.16.840.1.114028.10.1.2",
+  "2.16.840.1.114171.500.9",
+  "2.16.840.1.114404.1.1.2.4.1",
+  "2.16.840.1.114412.2.1",
+  "2.16.840.1.114413.1.7.23.3",
+  "2.16.840.1.114414.1.7.23.3",
+};
+#endif
+
 static base::LazyInstance<EVRootCAMetadata>::Leaky
     g_ev_root_ca_metadata = LAZY_INSTANCE_INITIALIZER;
 
@@ -306,12 +329,10 @@ EVRootCAMetadata* EVRootCAMetadata::GetInstance() {
   return g_ev_root_ca_metadata.Pointer();
 }
 
-#if defined(USE_NSS)
-
 bool EVRootCAMetadata::GetPolicyOIDsForCA(
     const SHA1Fingerprint& fingerprint,
     std::vector<PolicyOID>* policy_oids) const {
-  PolicyOIDMap::const_iterator iter = ev_policy_.find(fingerprint);
+  PolicyOidMap::const_iterator iter = ev_policy_.find(fingerprint);
   if (iter == ev_policy_.end())
     return false;
   for (std::vector<PolicyOID>::const_iterator
@@ -321,169 +342,110 @@ bool EVRootCAMetadata::GetPolicyOIDsForCA(
   return true;
 }
 
-const EVRootCAMetadata::PolicyOID* EVRootCAMetadata::GetPolicyOIDs() const {
-  return &policy_oids_[0];
+#if defined(OS_WIN)
+static int PolicyOIDCmp(const void* keyval, const void* datum) {
+  const char* oid1 = reinterpret_cast<const char*>(keyval);
+  const char* const* oid2 = reinterpret_cast<const char* const*>(datum);
+  return strcmp(oid1, *oid2);
 }
 
-int EVRootCAMetadata::NumPolicyOIDs() const {
-  return policy_oids_.size();
-}
-
-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 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;
-  policy_oids_.erase(it2);
-  return true;
-}
-
-// static
-bool EVRootCAMetadata::RegisterOID(const char* policy,
-                                   PolicyOID* out) {
-  PRUint8 buf[64];
-  SECItem oid_item;
-  oid_item.data = buf;
-  oid_item.len = sizeof(buf);
-  SECStatus status = SEC_StringToOID(NULL, &oid_item, policy, 0);
-  if (status != SECSuccess)
-    return false;
-
-  // Register the OID.
-  SECOidData od;
-  od.oid.len = oid_item.len;
-  od.oid.data = oid_item.data;
-  od.offset = SEC_OID_UNKNOWN;
-  od.desc = policy;
-  od.mechanism = CKM_INVALID_MECHANISM;
-  od.supportedExtension = INVALID_CERT_EXTENSION;
-  *out = SECOID_AddEntry(&od);
-  return *out != SEC_OID_UNKNOWN;
+bool EVRootCAMetadata::IsEVPolicyOID(PolicyOID policy_oid) const {
+  return bsearch(policy_oid, &policy_oids_[0], num_policy_oids_,
+                 sizeof(PolicyOID), PolicyOIDCmp) != NULL;
 }
-
-#elif defined(OS_WIN)
-
+#else
 bool EVRootCAMetadata::IsEVPolicyOID(PolicyOID policy_oid) const {
-  for (size_t i = 0; i < arraysize(ev_root_ca_metadata); i++) {
-    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;
-    }
-  }
-
-  for (ExtraEVCAMap::const_iterator i = extra_cas_.begin();
-       i != extra_cas_.end(); i++) {
-    if (i->second == policy_oid)
+  for (size_t i = 0; i < policy_oids_.size(); ++i) {
+    if (PolicyOIDsAreEqual(policy_oid, policy_oids_[i]))
       return true;
   }
-
   return false;
 }
+#endif
 
 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;
-    }
+  std::vector<PolicyOID> ev_policy_oids;
+  if (!GetPolicyOIDsForCA(fingerprint, &ev_policy_oids))
     return false;
+  for (std::vector<PolicyOID>::const_iterator
+       i = ev_policy_oids.begin(); i != ev_policy_oids.end(); ++i) {
+    if (PolicyOIDsAreEqual(*i, policy_oid))
+      return true;
   }
-
-  ExtraEVCAMap::const_iterator it = extra_cas_.find(fingerprint);
-  return it != extra_cas_.end() && it->second == policy_oid;
-}
-
-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 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 SHA1Fingerprint& fingerprint,
-                               const char* policy) {
-  return true;
-}
-
-bool EVRootCAMetadata::RemoveEVCA(const SHA1Fingerprint& fingerprint) {
-  return true;
+  return false;
 }
 
-#endif
-
 EVRootCAMetadata::EVRootCAMetadata() {
   // Constructs the object from the raw metadata in ev_root_ca_metadata.
 #if defined(USE_NSS)
-  crypto::EnsureNSSInit();
-
   for (size_t i = 0; i < arraysize(ev_root_ca_metadata); i++) {
     const EVMetadata& metadata = ev_root_ca_metadata[i];
-    for (size_t j = 0; j < arraysize(metadata.policy_oids); j++) {
-      if (metadata.policy_oids[j][0] == '\0')
-        break;
-      const char* policy_oid = metadata.policy_oids[j];
-
-      PolicyOID policy;
-      if (!RegisterOID(policy_oid, &policy)) {
-        LOG(ERROR) << "Failed to register OID: " << policy_oid;
+    for (const char* const* policy_oid = metadata.policy_oids; *policy_oid;
+         policy_oid++) {
+      PRUint8 buf[1024];
+      SECItem oid_item;
+      oid_item.data = buf;
+      oid_item.len = sizeof(buf);
+      SECStatus status = SEC_StringToOID(NULL, &oid_item, *policy_oid, 0);
+      if (status != SECSuccess) {
+        LOG(ERROR) << "Failed to convert to OID: " << *policy_oid;
         continue;
       }
-
+      // Register the OID.
+      SECOidData od;
+      od.oid.len = oid_item.len;
+      od.oid.data = oid_item.data;
+      od.offset = SEC_OID_UNKNOWN;
+      od.desc = *policy_oid;
+      od.mechanism = CKM_INVALID_MECHANISM;
+      od.supportedExtension = INVALID_CERT_EXTENSION;
+      SECOidTag policy = SECOID_AddEntry(&od);
+      DCHECK_NE(SEC_OID_UNKNOWN, policy);
       ev_policy_[metadata.fingerprint].push_back(policy);
       policy_oids_.push_back(policy);
     }
   }
+#elif defined(OS_WIN)
+  num_policy_oids_ = arraysize(policy_oids_);
+  // Verify policy_oids_ is in ascending order.
+  for (int i = 0; i < num_policy_oids_ - 1; i++)
+    DCHECK(strcmp(policy_oids_[i], policy_oids_[i + 1]) < 0);
+
+  for (size_t i = 0; i < arraysize(ev_root_ca_metadata); i++) {
+    const EVMetadata& metadata = ev_root_ca_metadata[i];
+    for (const char* const* policy_oid = metadata.policy_oids; *policy_oid;
+         policy_oid++) {
+      ev_policy_[metadata.fingerprint].push_back(*policy_oid);
+      // Verify policy_oids_ contains every EV policy OID.
+      DCHECK(IsEVPolicyOID(*policy_oid));
+    }
+  }
+#else
+  for (size_t i = 0; i < arraysize(ev_root_ca_metadata); i++) {
+    const EVMetadata& metadata = ev_root_ca_metadata[i];
+    for (const char* const* policy_oid = metadata.policy_oids; *policy_oid;
+         policy_oid++) {
+      ev_policy_[metadata.fingerprint].push_back(*policy_oid);
+      // Multiple root CA certs may use the same EV policy OID.  Having
+      // duplicates in the policy_oids_ array does no harm, so we don't
+      // bother detecting duplicates.
+      policy_oids_.push_back(*policy_oid);
+    }
+  }
 #endif
 }
 
-EVRootCAMetadata::~EVRootCAMetadata() { }
+EVRootCAMetadata::~EVRootCAMetadata() {
+}
+
+// static
+bool EVRootCAMetadata::PolicyOIDsAreEqual(PolicyOID a, PolicyOID b) {
+#if defined(USE_NSS)
+  return a == b;
+#else
+  return !strcmp(a, b);
+#endif
+}
 
 }  // namespace net
diff --git a/net/base/ev_root_ca_metadata.h b/net/base/ev_root_ca_metadata.h
index c86489e..be0c76a 100644
--- a/net/base/ev_root_ca_metadata.h
+++ b/net/base/ev_root_ca_metadata.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -30,20 +30,24 @@ class EVRootCAMetadata {
  public:
 #if defined(USE_NSS)
   typedef SECOidTag PolicyOID;
-#elif defined(OS_WIN)
+#else
   typedef const char* PolicyOID;
 #endif
 
   static EVRootCAMetadata* GetInstance();
 
-#if defined(USE_NSS)
   // If the root CA cert has an EV policy OID, returns true and appends the
   // policy OIDs to |*policy_oids|.  Otherwise, returns false.
   bool GetPolicyOIDsForCA(const SHA1Fingerprint& fingerprint,
                           std::vector<PolicyOID>* policy_oids) const;
-  const PolicyOID* GetPolicyOIDs() const;
-  int NumPolicyOIDs() const;
-#elif defined(OS_WIN)
+
+  const PolicyOID* GetPolicyOIDs() const { return &policy_oids_[0]; }
+#if defined(OS_WIN)
+  int NumPolicyOIDs() const { return num_policy_oids_; }
+#else
+  int NumPolicyOIDs() const { return policy_oids_.size(); }
+#endif
+
   // Returns true if policy_oid is an EV policy OID of some root CA.
   bool IsEVPolicyOID(PolicyOID policy_oid) const;
 
@@ -51,39 +55,26 @@ class EVRootCAMetadata {
   // the EV policy OID policy_oid.
   bool HasEVPolicyOID(const SHA1Fingerprint& fingerprint,
                       PolicyOID policy_oid) const;
-#endif
-
-  // AddEVCA adds an EV CA to the list of known EV CAs with the given policy.
-  // |policy| is expressed as a string of dotted numbers. It returns true on
-  // success.
-  bool AddEVCA(const SHA1Fingerprint& fingerprint, const char* policy);
-
-  // RemoveEVCA removes an EV CA that was previously added by AddEVCA. It
-  // returns true on success.
-  bool RemoveEVCA(const SHA1Fingerprint& fingerprint);
 
  private:
   friend struct base::DefaultLazyInstanceTraits<EVRootCAMetadata>;
 
+  typedef std::map<SHA1Fingerprint, std::vector<PolicyOID>,
+                   SHA1FingerprintLessThan> PolicyOidMap;
+
   EVRootCAMetadata();
   ~EVRootCAMetadata();
 
-#if defined(USE_NSS)
-  typedef std::map<SHA1Fingerprint, std::vector<PolicyOID>,
-                   SHA1FingerprintLessThan> PolicyOIDMap;
+  static bool PolicyOIDsAreEqual(PolicyOID a, PolicyOID b);
 
-  // RegisterOID registers |policy|, a policy OID in dotted string form, and
-  // writes the memoized form to |*out|. It returns true on success.
-  static bool RegisterOID(const char* policy, PolicyOID* out);
+  // Maps an EV root CA cert's SHA-1 fingerprint to its EV policy OID.
+  PolicyOidMap ev_policy_;
 
-  PolicyOIDMap ev_policy_;
+#if defined(OS_WIN)
+  static const PolicyOID policy_oids_[];
+  int num_policy_oids_;
+#else
   std::vector<PolicyOID> policy_oids_;
-#elif defined(OS_WIN)
-  typedef std::map<SHA1Fingerprint, std::string,
-                   SHA1FingerprintLessThan> ExtraEVCAMap;
-
-  // extra_cas_ contains any EV CA metadata that was added at runtime.
-  ExtraEVCAMap extra_cas_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(EVRootCAMetadata);
diff --git a/net/base/ev_root_ca_metadata_unittest.cc b/net/base/ev_root_ca_metadata_unittest.cc
deleted file mode 100644
index 1a1ef35..0000000
--- a/net/base/ev_root_ca_metadata_unittest.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-// 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"
-
-#include "net/base/cert_test_util.h"
-#include "net/base/x509_cert_types.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace net {
-
-static const char kVerisignPolicy[] = "2.16.840.1.113733.1.7.23.6";
-static const char kThawtePolicy[] = "2.16.840.1.113733.1.7.48.1";
-static const char kFakePolicy[] = "2.16.840.1.42";
-static const SHA1Fingerprint kVerisignFingerprint =
-    { { 0x74, 0x2c, 0x31, 0x92, 0xe6, 0x07, 0xe4, 0x24, 0xeb, 0x45,
-        0x49, 0x54, 0x2b, 0xe1, 0xbb, 0xc5, 0x3e, 0x61, 0x74, 0xe2 } };
-static const SHA1Fingerprint kFakeFingerprint =
-    { { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
-        0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 } };
-
-#if defined(USE_NSS)
-
-TEST(EVRootCAMetadataTest, Basic) {
-  EVRootCAMetadata* ev_metadata(EVRootCAMetadata::GetInstance());
-  std::vector<EVRootCAMetadata::PolicyOID> oids;
-
-  EXPECT_TRUE(ev_metadata->GetPolicyOIDsForCA(kVerisignFingerprint, &oids));
-  EXPECT_LT(0u, oids.size());
-  oids.clear();
-
-  EXPECT_FALSE(ev_metadata->GetPolicyOIDsForCA(kFakeFingerprint, &oids));
-  EXPECT_EQ(0u, oids.size());
-}
-
-TEST(EVRootCAMetadataTest, AddRemove) {
-  EVRootCAMetadata* ev_metadata(EVRootCAMetadata::GetInstance());
-  std::vector<EVRootCAMetadata::PolicyOID> oids;
-
-  EXPECT_FALSE(ev_metadata->GetPolicyOIDsForCA(kFakeFingerprint, &oids));
-
-  {
-    ScopedTestEVPolicy test_ev_policy(ev_metadata, kFakeFingerprint,
-                                      kFakePolicy);
-
-    EXPECT_TRUE(ev_metadata->GetPolicyOIDsForCA(kFakeFingerprint, &oids));
-    EXPECT_EQ(1u, oids.size());
-  }
-
-  EXPECT_FALSE(ev_metadata->GetPolicyOIDsForCA(kFakeFingerprint, &oids));
-}
-
-#elif defined(OS_WIN)
-
-TEST(EVRootCAMetadataTest, Basic) {
-  EVRootCAMetadata* ev_metadata(EVRootCAMetadata::GetInstance());
-
-  EXPECT_TRUE(ev_metadata->IsEVPolicyOID(kVerisignPolicy));
-  EXPECT_FALSE(ev_metadata->IsEVPolicyOID(kFakePolicy));
-  EXPECT_TRUE(ev_metadata->HasEVPolicyOID(kVerisignFingerprint,
-                                          kVerisignPolicy));
-  EXPECT_FALSE(ev_metadata->HasEVPolicyOID(kFakeFingerprint,
-                                           kVerisignPolicy));
-  EXPECT_FALSE(ev_metadata->HasEVPolicyOID(kVerisignFingerprint,
-                                           kFakePolicy));
-  EXPECT_FALSE(ev_metadata->HasEVPolicyOID(kVerisignFingerprint,
-                                           kThawtePolicy));
-}
-
-TEST(EVRootCAMetadataTest, AddRemove) {
-  EVRootCAMetadata* ev_metadata(EVRootCAMetadata::GetInstance());
-
-  EXPECT_FALSE(ev_metadata->IsEVPolicyOID(kFakePolicy));
-  EXPECT_FALSE(ev_metadata->HasEVPolicyOID(kFakeFingerprint,
-                                           kFakePolicy));
-
-  {
-    ScopedTestEVPolicy test_ev_policy(ev_metadata, kFakeFingerprint,
-                                      kFakePolicy);
-
-    EXPECT_TRUE(ev_metadata->IsEVPolicyOID(kFakePolicy));
-    EXPECT_TRUE(ev_metadata->HasEVPolicyOID(kFakeFingerprint,
-                                            kFakePolicy));
-  }
-
-  EXPECT_FALSE(ev_metadata->IsEVPolicyOID(kFakePolicy));
-  EXPECT_FALSE(ev_metadata->HasEVPolicyOID(kFakeFingerprint,
-                                           kFakePolicy));
-}
-
-#endif // defined(OS_WIN)
-
-}  // namespace net
diff --git a/net/net.gyp b/net/net.gyp
index e4bb3fe..a850041 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1032,7 +1032,6 @@
         'base/dns_util_unittest.cc',
         'base/dnsrr_resolver_unittest.cc',
         'base/escape_unittest.cc',
-        'base/ev_root_ca_metadata_unittest.cc',
         'base/expiring_cache_unittest.cc',
         'base/file_stream_unittest.cc',
         'base/filter_unittest.cc',