Landing Recent QUIC changes until 2015-11-09 20:32 UTC

net/quic/crypto/proof_verifier_chromium_test.cc

 // Copyright 2015 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/quic/crypto/proof_verifier_chromium.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
@@ skipping 143 matching lines @@
   scoped_ptr<ProofVerifyContext> verify_context(
       new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
   scoped_ptr<ProofVerifyDetails> details;
   std::string error_details;
 
   std::vector<std::string> certs;
   ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
 
   DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs, GetTestSignature(),
+      kTestHostname, kTestConfig, certs, "", GetTestSignature(),
       verify_context.get(), &error_details, &details, callback);
   ASSERT_EQ(QUIC_FAILURE, status);
   delete callback;
 }
 
 // Tests that the ProofVerifier doesn't verify certificates if the config
 // signature fails.
 TEST(ProofVerifierChromiumTest, FailsIfSignatureFails) {
   FailsTestCertVerifier cert_verifier;
   ProofVerifierChromium proof_verifier(&cert_verifier, nullptr, nullptr);
 
   scoped_ptr<ProofVerifyContext> verify_context(
       new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
   scoped_ptr<ProofVerifyDetails> details;
   std::string error_details;
 
   std::vector<std::string> certs;
   ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
 
   DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs, kTestConfig, verify_context.get(),
+      kTestHostname, kTestConfig, certs, "", kTestConfig, verify_context.get(),
       &error_details, &details, callback);
   ASSERT_EQ(QUIC_FAILURE, status);
   delete callback;
 }
 
 // Tests that EV certificates are left as EV if there is no certificate
 // policy enforcement.
 TEST(ProofVerifierChromiumTest, PreservesEVIfNoPolicy) {
   scoped_refptr<X509Certificate> test_cert = GetTestServerCertificate();
   ASSERT_TRUE(test_cert);
@@ skipping 10 matching lines @@
   scoped_ptr<ProofVerifyContext> verify_context(
       new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
   scoped_ptr<ProofVerifyDetails> details;
   std::string error_details;
 
   std::vector<std::string> certs;
   ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
 
   DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs, GetTestSignature(),
+      kTestHostname, kTestConfig, certs, "", GetTestSignature(),
       verify_context.get(), &error_details, &details, callback);
   ASSERT_EQ(QUIC_SUCCESS, status);
   delete callback;
 
   ASSERT_TRUE(details.get());
   ProofVerifyDetailsChromium* verify_details =
       static_cast<ProofVerifyDetailsChromium*>(details.get());
   EXPECT_EQ(dummy_result.cert_status,
             verify_details->cert_verify_result.cert_status);
 }
@@ skipping 19 matching lines @@
   scoped_ptr<ProofVerifyContext> verify_context(
       new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
   scoped_ptr<ProofVerifyDetails> details;
   std::string error_details;
 
   std::vector<std::string> certs;
   ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
 
   DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs, GetTestSignature(),
+      kTestHostname, kTestConfig, certs, "", GetTestSignature(),
       verify_context.get(), &error_details, &details, callback);
   ASSERT_EQ(QUIC_SUCCESS, status);
   delete callback;
 
   ASSERT_TRUE(details.get());
   ProofVerifyDetailsChromium* verify_details =
       static_cast<ProofVerifyDetailsChromium*>(details.get());
   EXPECT_EQ(dummy_result.cert_status,
             verify_details->cert_verify_result.cert_status);
 }
@@ skipping 19 matching lines @@
   scoped_ptr<ProofVerifyContext> verify_context(
       new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
   scoped_ptr<ProofVerifyDetails> details;
   std::string error_details;
 
   std::vector<std::string> certs;
   ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
 
   DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs, GetTestSignature(),
+      kTestHostname, kTestConfig, certs, "", GetTestSignature(),
       verify_context.get(), &error_details, &details, callback);
   ASSERT_EQ(QUIC_SUCCESS, status);
   delete callback;
 
   ASSERT_TRUE(details.get());
   ProofVerifyDetailsChromium* verify_details =
       static_cast<ProofVerifyDetailsChromium*>(details.get());
   EXPECT_EQ(CERT_STATUS_CT_COMPLIANCE_FAILED,
             verify_details->cert_verify_result.cert_status &
                 (CERT_STATUS_CT_COMPLIANCE_FAILED | CERT_STATUS_IS_EV));
@@ skipping 20 matching lines @@
   scoped_ptr<ProofVerifyContext> verify_context(
       new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
   scoped_ptr<ProofVerifyDetails> details;
   std::string error_details;
 
   std::vector<std::string> certs;
   ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
 
   DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
   QuicAsyncStatus status = proof_verifier.VerifyProof(
-      kTestHostname, kTestConfig, certs, GetTestSignature(),
+      kTestHostname, kTestConfig, certs, "", GetTestSignature(),
       verify_context.get(), &error_details, &details, callback);
   ASSERT_EQ(QUIC_SUCCESS, status);
   delete callback;
 
   ASSERT_TRUE(details.get());
   ProofVerifyDetailsChromium* verify_details =
       static_cast<ProofVerifyDetailsChromium*>(details.get());
   EXPECT_EQ(0u, verify_details->cert_verify_result.cert_status);
 }
 
 }  // namespace test
 }  // namespace net