Route OCSP stapling through CertVerifier.

net/cert/nss_cert_database_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 <cert.h>
 #include <certdb.h>
 #include <pk11pub.h>
 
 #include <algorithm>
 
@@ skipping 538 matching lines @@
   EXPECT_EQ("Thawte SGC CA", thawte_cert->subject().common_name);
 
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(goog_cert.get(), SERVER_CERT));
 
   EXPECT_EQ(0U, goog_cert->os_cert_handle()->trust->sslFlags);
 
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(goog_cert.get(),
-                                  "www.google.com",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(goog_cert.get(), "www.google.com", std::string(),
+                          flags, NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned) {
   CertificateList certs;
   ASSERT_TRUE(ReadCertIntoList("punycodetest.pem", &certs));
 
   NSSCertDatabase::ImportCertFailureList failed;
   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUST_DEFAULT,
                                          &failed));
 
   EXPECT_EQ(0U, failed.size());
 
   CertificateList cert_list = ListCerts();
   ASSERT_EQ(1U, cert_list.size());
   scoped_refptr<X509Certificate> puny_cert(cert_list[0]);
 
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(puny_cert.get(), SERVER_CERT));
   EXPECT_EQ(0U, puny_cert->os_cert_handle()->trust->sslFlags);
 
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(puny_cert.get(),
-                                  "xn--wgv71a119e.com",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(puny_cert.get(), "xn--wgv71a119e.com", std::string(),
+                          flags, NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error);
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned_Trusted) {
   CertificateList certs;
   ASSERT_TRUE(ReadCertIntoList("punycodetest.pem", &certs));
 
   NSSCertDatabase::ImportCertFailureList failed;
   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUSTED_SSL,
                                          &failed));
 
   EXPECT_EQ(0U, failed.size());
 
   CertificateList cert_list = ListCerts();
   ASSERT_EQ(1U, cert_list.size());
   scoped_refptr<X509Certificate> puny_cert(cert_list[0]);
 
   EXPECT_EQ(NSSCertDatabase::TRUSTED_SSL,
             cert_db_->GetCertTrust(puny_cert.get(), SERVER_CERT));
   EXPECT_EQ(unsigned(CERTDB_TRUSTED | CERTDB_TERMINAL_RECORD),
             puny_cert->os_cert_handle()->trust->sslFlags);
 
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(puny_cert.get(),
-                                  "xn--wgv71a119e.com",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(puny_cert.get(), "xn--wgv71a119e.com", std::string(),
+                          flags, NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert) {
   CertificateList ca_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "root_ca_cert.pem",
       X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_certs.size());
 
@@ skipping 10 matching lines @@
 
   // Import server cert with default trust.
   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUST_DEFAULT,
                                          &failed));
   EXPECT_EQ(0U, failed.size());
 
   // Server cert should verify.
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(certs[0].get(),
-                                  "127.0.0.1",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                          NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert_DistrustServer) {
   CertificateList ca_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "root_ca_cert.pem",
       X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_certs.size());
 
@@ skipping 16 matching lines @@
   EXPECT_EQ(NSSCertDatabase::DISTRUSTED_SSL,
             cert_db_->GetCertTrust(certs[0].get(), SERVER_CERT));
 
   EXPECT_EQ(unsigned(CERTDB_TERMINAL_RECORD),
             certs[0]->os_cert_handle()->trust->sslFlags);
 
   // Server cert should fail to verify.
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(certs[0].get(),
-                                  "127.0.0.1",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                          NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(ERR_CERT_REVOKED, error);
   EXPECT_EQ(CERT_STATUS_REVOKED, verify_result.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, TrustIntermediateCa) {
   CertificateList ca_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "2048-rsa-root.pem",
       X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_certs.size());
 
@@ skipping 22 matching lines @@
   EXPECT_TRUE(cert_db_->ImportServerCert(
       certs, NSSCertDatabase::TRUST_DEFAULT, &failed));
   EXPECT_EQ(0U, failed.size());
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(certs[0].get(), SERVER_CERT));
 
   // Server cert should verify.
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(certs[0].get(),
-                                  "127.0.0.1",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                          NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
   // Trust the root cert and distrust the intermediate.
   EXPECT_TRUE(cert_db_->SetCertTrust(
       ca_certs[0].get(), CA_CERT, NSSCertDatabase::TRUSTED_SSL));
   EXPECT_TRUE(cert_db_->SetCertTrust(
       intermediate_certs[0].get(), CA_CERT, NSSCertDatabase::DISTRUSTED_SSL));
   EXPECT_EQ(
       unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA),
       ca_certs[0]->os_cert_handle()->trust->sslFlags);
   EXPECT_EQ(unsigned(CERTDB_VALID_CA),
             ca_certs[0]->os_cert_handle()->trust->emailFlags);
   EXPECT_EQ(unsigned(CERTDB_VALID_CA),
             ca_certs[0]->os_cert_handle()->trust->objectSigningFlags);
   EXPECT_EQ(unsigned(CERTDB_TERMINAL_RECORD),
             intermediate_certs[0]->os_cert_handle()->trust->sslFlags);
   EXPECT_EQ(unsigned(CERTDB_VALID_CA),
             intermediate_certs[0]->os_cert_handle()->trust->emailFlags);
   EXPECT_EQ(
       unsigned(CERTDB_VALID_CA),
       intermediate_certs[0]->os_cert_handle()->trust->objectSigningFlags);
 
   // Server cert should fail to verify.
   CertVerifyResult verify_result2;
-  error = verify_proc->Verify(certs[0].get(),
-                              "127.0.0.1",
-                              flags,
-                              NULL,
-                              empty_cert_list_,
-                              &verify_result2);
+  error = verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                              NULL, empty_cert_list_, &verify_result2);
   EXPECT_EQ(ERR_CERT_REVOKED, error);
   EXPECT_EQ(CERT_STATUS_REVOKED, verify_result2.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, TrustIntermediateCa2) {
   if (NSS_VersionCheck("3.14.2") && !NSS_VersionCheck("3.15")) {
     // See http://bugzil.la/863947 for details.
     LOG(INFO) << "Skipping test for NSS 3.14.2 - NSS 3.15";
     return;
   }
@@ skipping 19 matching lines @@
   EXPECT_TRUE(cert_db_->ImportServerCert(
       certs, NSSCertDatabase::TRUST_DEFAULT, &failed));
   EXPECT_EQ(0U, failed.size());
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(certs[0].get(), SERVER_CERT));
 
   // Server cert should verify.
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(certs[0].get(),
-                                  "127.0.0.1",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                          NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
   // Without explicit trust of the intermediate, verification should fail.
   EXPECT_TRUE(cert_db_->SetCertTrust(
       intermediate_certs[0].get(), CA_CERT, NSSCertDatabase::TRUST_DEFAULT));
 
   // Server cert should fail to verify.
   CertVerifyResult verify_result2;
-  error = verify_proc->Verify(certs[0].get(),
-                              "127.0.0.1",
-                              flags,
-                              NULL,
-                              empty_cert_list_,
-                              &verify_result2);
+  error = verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                              NULL, empty_cert_list_, &verify_result2);
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error);
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result2.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, TrustIntermediateCa3) {
   if (NSS_VersionCheck("3.14.2") && !NSS_VersionCheck("3.15")) {
     // See http://bugzil.la/863947 for details.
     LOG(INFO) << "Skipping test for NSS 3.14.2 - NSS 3.15";
     return;
   }
@@ skipping 29 matching lines @@
   EXPECT_TRUE(cert_db_->ImportServerCert(
       certs, NSSCertDatabase::TRUST_DEFAULT, &failed));
   EXPECT_EQ(0U, failed.size());
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(certs[0].get(), SERVER_CERT));
 
   // Server cert should verify.
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(certs[0].get(),
-                                  "127.0.0.1",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                          NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
   // Without explicit trust of the intermediate, verification should fail.
   EXPECT_TRUE(cert_db_->SetCertTrust(
       intermediate_certs[0].get(), CA_CERT, NSSCertDatabase::TRUST_DEFAULT));
 
   // Server cert should fail to verify.
   CertVerifyResult verify_result2;
-  error = verify_proc->Verify(certs[0].get(),
-                              "127.0.0.1",
-                              flags,
-                              NULL,
-                              empty_cert_list_,
-                              &verify_result2);
+  error = verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                              NULL, empty_cert_list_, &verify_result2);
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error);
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result2.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, TrustIntermediateCa4) {
   NSSCertDatabase::ImportCertFailureList failed;
 
   CertificateList ca_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "2048-rsa-root.pem",
       X509Certificate::FORMAT_AUTO);
@@ skipping 23 matching lines @@
   EXPECT_TRUE(cert_db_->ImportServerCert(
       certs, NSSCertDatabase::TRUST_DEFAULT, &failed));
   EXPECT_EQ(0U, failed.size());
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(certs[0].get(), SERVER_CERT));
 
   // Server cert should not verify.
   scoped_refptr<CertVerifyProc> verify_proc(new CertVerifyProcNSS());
   int flags = 0;
   CertVerifyResult verify_result;
-  int error = verify_proc->Verify(certs[0].get(),
-                                  "127.0.0.1",
-                                  flags,
-                                  NULL,
-                                  empty_cert_list_,
-                                  &verify_result);
+  int error =
+      verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                          NULL, empty_cert_list_, &verify_result);
   EXPECT_EQ(ERR_CERT_REVOKED, error);
   EXPECT_EQ(CERT_STATUS_REVOKED, verify_result.cert_status);
 
   // Without explicit distrust of the intermediate, verification should succeed.
   EXPECT_TRUE(cert_db_->SetCertTrust(
       intermediate_certs[0].get(), CA_CERT, NSSCertDatabase::TRUST_DEFAULT));
 
   // Server cert should verify.
   CertVerifyResult verify_result2;
-  error = verify_proc->Verify(certs[0].get(),
-                              "127.0.0.1",
-                              flags,
-                              NULL,
-                              empty_cert_list_,
-                              &verify_result2);
+  error = verify_proc->Verify(certs[0].get(), "127.0.0.1", std::string(), flags,
+                              NULL, empty_cert_list_, &verify_result2);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result2.cert_status);
 }
 
 // Importing two certificates with the same issuer and subject common name,
 // but overall distinct subject names, should succeed and generate a unique
 // nickname for the second certificate.
 TEST_F(CertDatabaseNSSTest, ImportDuplicateCommonName) {
   CertificateList certs =
       CreateCertificateListFromFile(GetTestCertsDirectory(),
@@ skipping 28 matching lines @@
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(certs2[0].get(), SERVER_CERT));
 
   new_certs = ListCerts();
   ASSERT_EQ(2U, new_certs.size());
   EXPECT_STRNE(new_certs[0]->os_cert_handle()->nickname,
                new_certs[1]->os_cert_handle()->nickname);
 }
 
 }  // namespace net