Remove x509_certificate_model_openssl.cc

chrome/common/net/x509_certificate_model_unittest.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 "chrome/common/net/x509_certificate_model.h"
 
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "net/base/test_data_directory.h"
@@ skipping 19 matching lines @@
                               "punycodetest.pem"));
   ASSERT_TRUE(punycode_cert.get());
   EXPECT_EQ("xn--wgv71a119e.com (日本語.com)",
             x509_certificate_model::GetCertNameOrNickname(
                 punycode_cert->os_cert_handle()));
 
   scoped_refptr<net::X509Certificate> no_cn_cert(
       net::ImportCertFromFile(net::GetTestCertsDirectory(),
                               "no_subject_common_name_cert.pem"));
   ASSERT_TRUE(no_cn_cert.get());
-#if defined(USE_OPENSSL_CERTS)
-  EXPECT_EQ("emailAddress=wtc@google.com",
-            x509_certificate_model::GetCertNameOrNickname(
-                no_cn_cert->os_cert_handle()));
-#else
   // Temp cert has no nickname.
   EXPECT_EQ("",
             x509_certificate_model::GetCertNameOrNickname(
                 no_cn_cert->os_cert_handle()));
-#endif
 
   EXPECT_EQ("xn--wgv71a119e.com",
             x509_certificate_model::GetTitle(
                 punycode_cert->os_cert_handle()));
 
-#if defined(USE_OPENSSL_CERTS)
-  EXPECT_EQ("emailAddress=wtc@google.com",
-            x509_certificate_model::GetTitle(
-                no_cn_cert->os_cert_handle()));
-#else
   EXPECT_EQ("E=wtc@google.com",
             x509_certificate_model::GetTitle(
                 no_cn_cert->os_cert_handle()));
-#endif
 
   scoped_refptr<net::X509Certificate> no_cn_cert2(net::ImportCertFromFile(
       net::GetTestCertsDirectory(), "ct-test-embedded-cert.pem"));
   ASSERT_TRUE(no_cn_cert2.get());
   EXPECT_EQ("L=Erw Wen,ST=Wales,O=Certificate Transparency,C=GB",
             x509_certificate_model::GetTitle(no_cn_cert2->os_cert_handle()));
 }
 
 TEST(X509CertificateModelTest, GetExtensions) {
   {
@@ skipping 144 matching lines @@
         extensions[3].value);
   }
 }
 
 TEST(X509CertificateModelTest, GetTypeCA) {
   scoped_refptr<net::X509Certificate> cert(
       net::ImportCertFromFile(net::GetTestCertsDirectory(),
                               "root_ca_cert.pem"));
   ASSERT_TRUE(cert.get());
 
-#if defined(USE_OPENSSL_CERTS)
-  // Remove this when OpenSSL build implements the necessary functions.
-  EXPECT_EQ(net::OTHER_CERT,
-            x509_certificate_model::GetType(cert->os_cert_handle()));
-#else
   EXPECT_EQ(net::CA_CERT,
             x509_certificate_model::GetType(cert->os_cert_handle()));
 
   crypto::ScopedTestNSSDB test_nssdb;
   net::NSSCertDatabase db(crypto::ScopedPK11Slot(PK11_ReferenceSlot(
                               test_nssdb.slot())) /* public slot */,
                           crypto::ScopedPK11Slot(PK11_ReferenceSlot(
                               test_nssdb.slot())) /* private slot */);
 
   // Test that explicitly distrusted CA certs are still returned as CA_CERT
   // type. See http://crbug.com/96654.
   EXPECT_TRUE(db.SetCertTrust(
       cert.get(), net::CA_CERT, net::NSSCertDatabase::DISTRUSTED_SSL));
 
   EXPECT_EQ(net::CA_CERT,
             x509_certificate_model::GetType(cert->os_cert_handle()));
-#endif
 }
 
 TEST(X509CertificateModelTest, GetTypeServer) {
   scoped_refptr<net::X509Certificate> cert(
       net::ImportCertFromFile(net::GetTestCertsDirectory(),
                               "google.single.der"));
   ASSERT_TRUE(cert.get());
 
-#if defined(USE_OPENSSL_CERTS)
-  // Remove this when OpenSSL build implements the necessary functions.
-  EXPECT_EQ(net::OTHER_CERT,
-            x509_certificate_model::GetType(cert->os_cert_handle()));
-#else
   // Test mozilla_security_manager::GetCertType with server certs and default
   // trust.  Currently this doesn't work.
   // TODO(mattm): make mozilla_security_manager::GetCertType smarter so we can
   // tell server certs even if they have no trust bits set.
   EXPECT_EQ(net::OTHER_CERT,
             x509_certificate_model::GetType(cert->os_cert_handle()));
 
   crypto::ScopedTestNSSDB test_nssdb;
   net::NSSCertDatabase db(crypto::ScopedPK11Slot(PK11_ReferenceSlot(
                               test_nssdb.slot())) /* public slot */,
                           crypto::ScopedPK11Slot(PK11_ReferenceSlot(
                               test_nssdb.slot())) /* private slot */);
 
   // Test GetCertType with server certs and explicit trust.
   EXPECT_TRUE(db.SetCertTrust(
       cert.get(), net::SERVER_CERT, net::NSSCertDatabase::TRUSTED_SSL));
 
   EXPECT_EQ(net::SERVER_CERT,
             x509_certificate_model::GetType(cert->os_cert_handle()));
 
   // Test GetCertType with server certs and explicit distrust.
   EXPECT_TRUE(db.SetCertTrust(
       cert.get(), net::SERVER_CERT, net::NSSCertDatabase::DISTRUSTED_SSL));
 
   EXPECT_EQ(net::SERVER_CERT,
             x509_certificate_model::GetType(cert->os_cert_handle()));
-#endif
 }
 
 // An X.509 v1 certificate with the version field omitted should get
 // the default value v1.
 TEST(X509CertificateModelTest, GetVersionOmitted) {
   scoped_refptr<net::X509Certificate> cert(
       net::ImportCertFromFile(net::GetTestCertsDirectory(),
                               "ndn.ca.crt"));
   ASSERT_TRUE(cert.get());
 
@@ skipping 18 matching lines @@
 
     ASSERT_FALSE(pkcs7_string.empty());
 
     net::CertificateList decoded_certs =
         net::X509Certificate::CreateCertificateListFromBytes(
             pkcs7_string.data(),
             pkcs7_string.size(),
             net::X509Certificate::FORMAT_PKCS7);
 
     ASSERT_EQ(certs.size(), decoded_certs.size());
-#if defined(USE_OPENSSL_CERTS)
-    for (size_t i = 0; i < certs.size(); ++i)
-      EXPECT_TRUE(certs[i]->Equals(decoded_certs[i].get()));
-#else
+
     // NSS sorts the certs before writing the file.
     EXPECT_TRUE(certs[0]->Equals(decoded_certs.back().get()));
     for (size_t i = 1; i < certs.size(); ++i)
       EXPECT_TRUE(certs[i]->Equals(decoded_certs[i - 1].get()));
-#endif
   }
 
   {
     // Write only the first cert.
     std::string pkcs7_string =
         x509_certificate_model::GetCMSString(cert_handles, 0, 1);
 
     net::CertificateList decoded_certs =
         net::X509Certificate::CreateCertificateListFromBytes(
             pkcs7_string.data(),
@@ skipping 56 matching lines @@
         "35 61 5D C9 76 6D B0 F2 1E BF 30 86 D8 77 52 36\n"
         "95 97 0E D1 46 C5 ED 81 3D 1B B0 F2 61 95 3C C1\n"
         "40 38 EF 5F 5D BA 61 9F EF 2B 9C 9F 85 89 74 70\n"
         "63 D5 76 E8 35 7E CE 01 E1 F3 11 11 90 1C 0D F5\n"
         "FD 8D CE 10 6C AD 7C 55 1A 21 6F D7 2D F4 78 15\n"
         "EA 2F 38 BD 91 9E 3C 1D 07 46 F5 43 C1 82 8B AF\n"
         "12 53 65 19 8A 69 69 66 06 B2 DA 0B FA 2A 00 A1\n"
         "2A 15 84 49 F1 01 BF 9B 30 06 D0 15 A0 1F 9D 51\n"
         "91 47 E1 53 5F EF 5E EC C2 61 79 C2 14 9F C4 E3\n"
         "\n"
-#if defined(USE_OPENSSL_CERTS)
-        "  Public Exponent (17 bits):\n"
-#else
         "  Public Exponent (24 bits):\n"
-#endif
         "  01 00 01",
         x509_certificate_model::ProcessSubjectPublicKeyInfo(
             cert->os_cert_handle()));
   }
   {
     scoped_refptr<net::X509Certificate> cert(net::ImportCertFromFile(
         net::GetTestCertsDirectory(), "prime256v1-ecdsa-intermediate.pem"));
     ASSERT_TRUE(cert.get());
 
     EXPECT_EQ(
@@ skipping 25 matching lines @@
       "10 21 14 7F 1B 70 3D 89 1A 40 8A 06 2C 5D 50 19\n"
       "62 F9 C7 45 89 F2 3D 66 05 3D 7D 75 5B 55 1E 80\n"
       "42 72 A1 9A 7C 6D 0A 74 F6 EE A6 21 6C 3A 98 FB\n"
       "77 82 5F F2 6B 56 E6 DD 9B 8E 50 F0 C6 AE FD EA\n"
       "A6 05 07 A9 26 06 56 B3 B2 D9 B2 37 A0 21 3E 79\n"
       "06 1F B9 51 BE F4 B1 49 4D 90 B5 33 E5 0E C7 5E\n"
       "5B 40 C5 6A 04 D1 43 7A 94 6A A4 4F 61 FC 82 E0",
       x509_certificate_model::ProcessRawBitsSignatureWrap(
           cert->os_cert_handle()));
 }