Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/test_tools/crypto_test_utils.h

 // 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 126 matching lines @@
       QuicCryptoStream* server,
       size_t server_i);
 
   // Returns the value for the tag |tag| in the tag value map of |message|.
   static std::string GetValueForTag(const CryptoHandshakeMessage& message,
                                     QuicTag tag);
 
   // Returns a new |ProofSource| that serves up test certificates.
   static std::unique_ptr<ProofSource> ProofSourceForTesting();
 
-  // Returns a |ProofVerifier| that uses the QUIC testing root CA.
+  // Identical to |ProofSourceForTesting|, with the addition of setting
+  // the |emit_expect_ct_header| field on the test certificates
+  // to be the value of |send_expect_ct_header|.
+  static std::unique_ptr<ProofSource> ProofSourceForTesting(
+      bool send_expect_ct_header);
+
+  // Returns a new |ProofVerifier| that uses the QUIC testing root CA.
   static std::unique_ptr<ProofVerifier> ProofVerifierForTesting();
 
   // Returns a real ProofVerifier (not a fake proof verifier) for testing.
   static std::unique_ptr<ProofVerifier> RealProofVerifierForTesting();
 
   // Returns a hash of the leaf test certificate.
   static uint64_t LeafCertHashForTesting();
 
   // Returns a |ProofVerifyContext| that must be used with the verifier
   // returned by |ProofVerifierForTesting|.
@@ skipping 47 matching lines @@
                           Perspective dest_perspective);
 
   // Return an inchoate CHLO with some basic tag value std:pairs.
   static CryptoHandshakeMessage GenerateDefaultInchoateCHLO(
       const QuicClock* clock,
       QuicVersion version,
       QuicCryptoServerConfig* crypto_config);
 
   // Takes a inchoate CHLO, returns a full CHLO in |out| which can pass
   // |crypto_config|'s validation.
-  static void GenerateFullCHLO(const CryptoHandshakeMessage& inchoate_chlo,
-                               QuicCryptoServerConfig* crypto_config,
-                               IPAddress server_ip,
-                               IPEndPoint client_addr,
-                               QuicVersion version,
-                               const QuicClock* clock,
-                               scoped_refptr<QuicCryptoProof> proof,
-                               QuicCompressedCertsCache* compressed_certs_cache,
-                               CryptoHandshakeMessage* out);
+  static void GenerateFullCHLO(
+      const CryptoHandshakeMessage& inchoate_chlo,
+      QuicCryptoServerConfig* crypto_config,
+      IPAddress server_ip,
+      IPEndPoint client_addr,
+      QuicVersion version,
+      const QuicClock* clock,
+      scoped_refptr<QuicSignedServerConfig> signed_config,
+      QuicCompressedCertsCache* compressed_certs_cache,
+      CryptoHandshakeMessage* out);
 
  private:
   static void CompareClientAndServerKeys(QuicCryptoClientStream* client,
                                          QuicCryptoServerStream* server);
 
   // Return a CHLO nonce in hexadecimal.
   static std::string GenerateClientNonceHex(
       const QuicClock* clock,
       QuicCryptoServerConfig* crypto_config);
 
   // Return a CHLO PUBS in hexadecimal.
   static std::string GenerateClientPublicValuesHex();
 
   DISALLOW_COPY_AND_ASSIGN(CryptoTestUtils);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_