Move CertVerifyProcMac unit-tests to their own file.

net/cert/cert_verify_proc_unittest.cc

Index: net/cert/cert_verify_proc_unittest.cc
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
index 86fce4961de1c3d301270a51722e43db87ea53a8..3a877cc97f3f5f72980b116088add5d201669a46 100644
--- a/net/cert/cert_verify_proc_unittest.cc
+++ b/net/cert/cert_verify_proc_unittest.cc
@@ -39,7 +39,6 @@
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
-#include "net/cert/test_keychain_search_list_mac.h"
 #endif
 
 #if defined(OS_WIN)
@@ -142,22 +141,6 @@ const bool kTargetIsIphoneSimulator =
     false;
 #endif
 
-// Template helper to load a series of certificate files into a CertificateList.
-// Like CertTestUtil's CreateCertificateListFromFile, except it can load a
-// series of individual certificates (to make the tests clearer).
-template <size_t N>
-void LoadCertificateFiles(const char* const (&cert_files)[N],
-                          CertificateList* certs) {
-  certs->clear();
-  for (size_t i = 0; i < N; ++i) {
-    SCOPED_TRACE(cert_files[i]);
-    scoped_refptr<X509Certificate> cert = CreateCertificateChainFromFile(
-        GetTestCertsDirectory(), cert_files[i], X509Certificate::FORMAT_AUTO);
-    ASSERT_TRUE(cert);
-    certs->push_back(cert);
-  }
-}
-
 // Returns a textual description of the CertVerifyProc implementation
 // that is being tested, used to give better names to parameterized
 // tests.
@@ -1293,24 +1276,23 @@ TEST_P(CertVerifyProcInternalTest, CRLSetDuringPathBuilding) {
     return;
   }
 
-  const char* const kPath1Files[] = {
-      "multi-root-A-by-B.pem", "multi-root-B-by-C.pem", "multi-root-C-by-D.pem",
-      "multi-root-D-by-D.pem"};
-  const char* const kPath2Files[] = {
-      "multi-root-A-by-B.pem", "multi-root-B-by-C.pem", "multi-root-C-by-E.pem",
-      "multi-root-E-by-E.pem"};
-  const char* const kPath3Files[] = {
-      "multi-root-A-by-B.pem", "multi-root-B-by-F.pem", "multi-root-F-by-E.pem",
-      "multi-root-E-by-E.pem"};
-
   CertificateList path_1_certs;
-  ASSERT_NO_FATAL_FAILURE(LoadCertificateFiles(kPath1Files, &path_1_certs));
+  ASSERT_TRUE(
+      LoadCertificateFiles({"multi-root-A-by-B.pem", "multi-root-B-by-C.pem",
+                            "multi-root-C-by-D.pem", "multi-root-D-by-D.pem"},
+                           &path_1_certs));
 
   CertificateList path_2_certs;
-  ASSERT_NO_FATAL_FAILURE(LoadCertificateFiles(kPath2Files, &path_2_certs));
+  ASSERT_TRUE(
+      LoadCertificateFiles({"multi-root-A-by-B.pem", "multi-root-B-by-C.pem",
+                            "multi-root-C-by-E.pem", "multi-root-E-by-E.pem"},
+                           &path_2_certs));
 
   CertificateList path_3_certs;
-  ASSERT_NO_FATAL_FAILURE(LoadCertificateFiles(kPath3Files, &path_3_certs));
+  ASSERT_TRUE(
+      LoadCertificateFiles({"multi-root-A-by-B.pem", "multi-root-B-by-F.pem",
+                            "multi-root-F-by-E.pem", "multi-root-E-by-E.pem"},
+                           &path_3_certs));
 
   // Add D and E as trust anchors.
   ScopedTestRoot test_root_D(path_1_certs[3].get());  // D-by-D
@@ -1386,167 +1368,6 @@ TEST_P(CertVerifyProcInternalTest, CRLSetDuringPathBuilding) {
   }
 }
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-// Test that a CRLSet blocking one of the intermediates supplied by the server
-// can be worked around by the chopping workaround for path building. (Once the
-// supplied chain is chopped back to just the target, a better path can be
-// found out-of-band. Normally that would be by AIA fetching, for the purposes
-// of this test the better path is supplied by a test keychain.)
-//
-// In this test, there are two possible paths to validate a leaf (A):
-// 1. A(B) -> B(C) -> C(E) -> E(E)
-// 2. A(B) -> B(F) -> F(E) -> E(E)
-//
-// A(B) -> B(C) -> C(E) is supplied to the verifier.
-// B(F) and F(E) are supplied in a test keychain.
-// C is blocked by a CRLset.
-//
-// The verifier should rollback until it just tries A(B) alone, at which point
-// it will pull B(F) & F(E) from the keychain and succeed.
-TEST(CertVerifyProcMacTest, MacCRLIntermediate) {
-  if (base::mac::IsAtLeastOS10_12()) {
-    // TODO(crbug.com/671889): Investigate SecTrustSetKeychains issue on Sierra.
-    LOG(INFO) << "Skipping test, SecTrustSetKeychains does not work on 10.12";
-    return;
-  }
-  const char* const kPath2Files[] = {
-      "multi-root-A-by-B.pem", "multi-root-B-by-C.pem", "multi-root-C-by-E.pem",
-      "multi-root-E-by-E.pem"};
-  CertificateList path_2_certs;
-  ASSERT_NO_FATAL_FAILURE(LoadCertificateFiles(kPath2Files, &path_2_certs));
-
-  const char* const kPath3Files[] = {
-      "multi-root-A-by-B.pem", "multi-root-B-by-F.pem", "multi-root-F-by-E.pem",
-      "multi-root-E-by-E.pem"};
-
-  CertificateList path_3_certs;
-  ASSERT_NO_FATAL_FAILURE(LoadCertificateFiles(kPath3Files, &path_3_certs));
-
-  // Add E as trust anchor.
-  ScopedTestRoot test_root_E(path_3_certs[3].get());  // E-by-E
-
-  X509Certificate::OSCertHandles intermediates;
-  intermediates.push_back(path_2_certs[1]->os_cert_handle());  // B-by-C
-  intermediates.push_back(path_2_certs[2]->os_cert_handle());  // C-by-E
-  scoped_refptr<X509Certificate> cert = X509Certificate::CreateFromHandle(
-      path_3_certs[0]->os_cert_handle(), intermediates);
-  ASSERT_TRUE(cert);
-
-  std::unique_ptr<TestKeychainSearchList> test_keychain_search_list(
-      TestKeychainSearchList::Create());
-  ASSERT_TRUE(test_keychain_search_list);
-
-  base::FilePath keychain_path(
-      GetTestCertsDirectory().AppendASCII("multi-root-BFE.keychain"));
-  // SecKeychainOpen does not fail if the file doesn't exist, so assert it here
-  // for easier debugging.
-  ASSERT_TRUE(base::PathExists(keychain_path));
-  SecKeychainRef keychain;
-  OSStatus status =
-      SecKeychainOpen(keychain_path.MaybeAsASCII().c_str(), &keychain);
-  ASSERT_EQ(errSecSuccess, status);
-  ASSERT_TRUE(keychain);
-  base::ScopedCFTypeRef<SecKeychainRef> scoped_keychain(keychain);
-  test_keychain_search_list->AddKeychain(keychain);
-
-  scoped_refptr<CRLSet> crl_set;
-  std::string crl_set_bytes;
-  // CRL which blocks C by SPKI.
-  EXPECT_TRUE(base::ReadFileToString(
-      GetTestCertsDirectory().AppendASCII("multi-root-crlset-C.raw"),
-      &crl_set_bytes));
-  ASSERT_TRUE(CRLSetStorage::Parse(crl_set_bytes, &crl_set));
-
-  int flags = 0;
-  CertVerifyResult verify_result;
-
-  scoped_refptr<CertVerifyProc> verify_proc = CertVerifyProc::CreateDefault();
-  int error =
-      verify_proc->Verify(cert.get(), "127.0.0.1", std::string(), flags,
-                          crl_set.get(), CertificateList(), &verify_result);
-
-  ASSERT_EQ(OK, error);
-  ASSERT_EQ(0U, verify_result.cert_status);
-  ASSERT_TRUE(verify_result.verified_cert.get());
-
-  const X509Certificate::OSCertHandles& verified_intermediates =
-      verify_result.verified_cert->GetIntermediateCertificates();
-  ASSERT_EQ(3U, verified_intermediates.size());
-
-  scoped_refptr<X509Certificate> intermediate =
-      X509Certificate::CreateFromHandle(verified_intermediates[1],
-                                        X509Certificate::OSCertHandles());
-  ASSERT_TRUE(intermediate);
-
-  scoped_refptr<X509Certificate> expected_intermediate = path_3_certs[2];
-  EXPECT_TRUE(expected_intermediate->Equals(intermediate.get()))
-      << "Expected: " << expected_intermediate->subject().common_name
-      << " issued by " << expected_intermediate->issuer().common_name
-      << "; Got: " << intermediate->subject().common_name << " issued by "
-      << intermediate->issuer().common_name;
-}
-
-// Test that if a keychain is present which trusts a less-desirable root (ex,
-// one using SHA1), that the keychain reordering hack will cause the better
-// root in the System Roots to be used instead.
-TEST(CertVerifyProcMacTest, MacKeychainReordering) {
-  // Note: target cert expires Apr  2 23:59:59 2018 GMT
-  scoped_refptr<X509Certificate> cert = CreateCertificateChainFromFile(
-      GetTestCertsDirectory(), "tripadvisor-verisign-chain.pem",
-      X509Certificate::FORMAT_AUTO);
-  ASSERT_TRUE(cert);
-
-  // Create a test keychain search list that will Always Trust the SHA1
-  // cross-signed VeriSign Class 3 Public Primary Certification Authority - G5
-  std::unique_ptr<TestKeychainSearchList> test_keychain_search_list(
-      TestKeychainSearchList::Create());
-  ASSERT_TRUE(test_keychain_search_list);
-
-  base::FilePath keychain_path(GetTestCertsDirectory().AppendASCII(
-      "verisign_class3_g5_crosssigned-trusted.keychain"));
-  // SecKeychainOpen does not fail if the file doesn't exist, so assert it here
-  // for easier debugging.
-  ASSERT_TRUE(base::PathExists(keychain_path));
-  SecKeychainRef keychain;
-  OSStatus status =
-      SecKeychainOpen(keychain_path.MaybeAsASCII().c_str(), &keychain);
-  ASSERT_EQ(errSecSuccess, status);
-  ASSERT_TRUE(keychain);
-  base::ScopedCFTypeRef<SecKeychainRef> scoped_keychain(keychain);
-  test_keychain_search_list->AddKeychain(keychain);
-
-  int flags = 0;
-  CertVerifyResult verify_result;
-  scoped_refptr<CertVerifyProc> verify_proc = CertVerifyProc::CreateDefault();
-  int error = verify_proc->Verify(cert.get(), "www.tripadvisor.com",
-                                  std::string(), flags, nullptr /* crl_set */,
-                                  CertificateList(), &verify_result);
-
-  ASSERT_EQ(OK, error);
-  EXPECT_EQ(0U, verify_result.cert_status);
-  EXPECT_FALSE(verify_result.has_sha1);
-  ASSERT_TRUE(verify_result.verified_cert.get());
-
-  const X509Certificate::OSCertHandles& verified_intermediates =
-      verify_result.verified_cert->GetIntermediateCertificates();
-  ASSERT_EQ(2U, verified_intermediates.size());
-}
-
-// Test that the system root certificate keychain is in the expected location
-// and can be opened. Other tests would fail if this was not true, but this
-// test makes the reason for the failure obvious.
-TEST(CertVerifyProcMacTest, MacSystemRootCertificateKeychainLocation) {
-  const char* root_keychain_path =
-      "/System/Library/Keychains/SystemRootCertificates.keychain";
-  ASSERT_TRUE(base::PathExists(base::FilePath(root_keychain_path)));
-
-  SecKeychainRef keychain;
-  OSStatus status = SecKeychainOpen(root_keychain_path, &keychain);
-  ASSERT_EQ(errSecSuccess, status);
-  CFRelease(keychain);
-}
-#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
-
 // TODO(crbug.com/649017): This is not parameterized by the CertVerifyProc
 // because the CertVerifyProc::Verify() does this unconditionally based on the
 // platform.
@@ -1996,34 +1817,6 @@ INSTANTIATE_TEST_CASE_P(VerifyName,
                         testing::ValuesIn(kAllCertVerifiers),
                         VerifyProcTypeToName);
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-// Test that CertVerifyProcMac reacts appropriately when Apple's certificate
-// verifier rejects a certificate with a fatal error. This is a regression
-// test for https://crbug.com/472291.
-// (Since 10.12, this causes a recoverable error instead of a fatal one.)
-// TODO(mattm): Try to find a different way to cause a fatal error that works
-// on 10.12.
-TEST(CertVerifyProcMacTest, LargeKey) {
-  // Load root_ca_cert.pem into the test root store.
-  ScopedTestRoot test_root(
-      ImportCertFromFile(GetTestCertsDirectory(), "root_ca_cert.pem").get());
-
-  scoped_refptr<X509Certificate> cert(
-      ImportCertFromFile(GetTestCertsDirectory(), "large_key.pem"));
-
-  // Apple's verifier rejects this certificate as invalid because the
-  // RSA key is too large. If a future version of OS X changes this,
-  // large_key.pem may need to be regenerated with a larger key.
-  int flags = 0;
-  CertVerifyResult verify_result;
-  scoped_refptr<CertVerifyProc> verify_proc = CertVerifyProc::CreateDefault();
-  int error = verify_proc->Verify(cert.get(), "127.0.0.1", std::string(), flags,
-                                  NULL, CertificateList(), &verify_result);
-  EXPECT_THAT(error, IsError(ERR_CERT_INVALID));
-  EXPECT_TRUE(verify_result.cert_status & CERT_STATUS_INVALID);
-}
-#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
-
 // Tests that CertVerifyProc records a histogram correctly when a
 // certificate chaining to a private root contains the TLS feature
 // extension and does not have a stapled OCSP response.