Merge 98741 to 782: Mark DigiNotar as untrusted

net/base/ev_root_ca_metadata.cc

 // 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.
 
 #include "net/base/ev_root_ca_metadata.h"
 
 #if defined(USE_NSS)
 #include <cert.h>
 #include <pkcs11n.h>
 #include <secerr.h>
@@ skipping 73 matching lines @@
   { { { 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"
   },
   // 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"
   },
-  // DigiNotar Root CA
-  // https://www.evssl.nl
-  // https://www.polisdirect.nl
-  { { { 0xc0, 0x60, 0xed, 0x44, 0xcb, 0xd8, 0x81, 0xbd, 0x0e, 0xf8,
-        0x6c, 0x0b, 0xa2, 0x87, 0xdd, 0xcf, 0x81, 0x67, 0x47, 0x8c } },
-    "2.16.528.1.1001.1.1.1.12.6.1.1.1"
-  },
   // 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"
   },
   // 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 } },
@@ skipping 158 matching lines @@
   "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.528.1.1001.1.1.1.12.6.1.1.1",
   "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",
 };
@@ skipping 104 matching lines @@
 // static
 bool EVRootCAMetadata::PolicyOIDsAreEqual(PolicyOID a, PolicyOID b) {
 #if defined(USE_NSS)
   return a == b;
 #else
   return !strcmp(a, b);
 #endif
 }
 
 }  // namespace net