Landing Recent QUIC changes until: Fri Oct 30 22:23:58 2015 +0000

net/quic/test_tools/crypto_test_utils_chromium.cc

 // Copyright 2013 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/test_tools/crypto_test_utils.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 32 matching lines @@
 
  private:
   ScopedTestRoot scoped_root_;
   scoped_ptr<CertVerifier> cert_verifier_;
   scoped_ptr<TransportSecurityState> transport_security_state_;
 };
 
 const char kLeafCert[] = "leaf";
 const char kIntermediateCert[] = "intermediate";
 const char kSignature[] = "signature";
+const char kSCT[] = "CryptoServerTests";
 
 class FakeProofSource : public ProofSource {
  public:
   FakeProofSource() : certs_(2) {
     certs_[0] = kLeafCert;
     certs_[1] = kIntermediateCert;
   }
   ~FakeProofSource() override {}
 
   // ProofSource interface
   bool GetProof(const IPAddressNumber& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 bool ecdsa_ok,
                 const std::vector<std::string>** out_certs,
-                std::string* out_signature) override {
+                std::string* out_signature,
+                std::string* out_leaf_cert_sct) override {
     *out_certs = &certs_;
     *out_signature = kSignature;
+    *out_leaf_cert_sct = kSCT;
     return true;
   }
 
  private:
   std::vector<std::string> certs_;
   DISALLOW_COPY_AND_ASSIGN(FakeProofSource);
 };
 
 class FakeProofVerifier : public ProofVerifier {
  public:
@@ skipping 29 matching lines @@
 };
 
 }  // namespace
 
 // static
 ProofSource* CryptoTestUtils::ProofSourceForTesting() {
   ProofSourceChromium* source = new ProofSourceChromium();
   base::FilePath certs_dir = GetTestCertsDirectory();
   CHECK(source->Initialize(
       certs_dir.AppendASCII("quic_test.example.com.crt"),
-      certs_dir.AppendASCII("quic_test.example.com.key.pkcs8")));
+      certs_dir.AppendASCII("quic_test.example.com.key.pkcs8"),
+      certs_dir.AppendASCII("quic_test.example.com.key.sct")));
   return source;
 }
 
 // static
 ProofVerifier* CryptoTestUtils::ProofVerifierForTesting() {
   // TODO(rch): use a real cert verifier?
   scoped_ptr<MockCertVerifier> cert_verifier(new MockCertVerifier());
   net::CertVerifyResult verify_result;
   verify_result.verified_cert =
       ImportCertFromFile(GetTestCertsDirectory(), "quic_test.example.com.crt");
@@ skipping 24 matching lines @@
 }
 
 // static
 ProofVerifyContext* CryptoTestUtils::FakeProofVerifyContextForTesting() {
   return nullptr;
 }
 
 }  // namespace test
 
 }  // namespace net