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

net/quic/test_tools/crypto_test_utils.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 "net/quic/test_tools/crypto_test_utils.h"
 
 #include <memory>
 
 #include "base/strings/string_util.h"
 #include "crypto/openssl_util.h"
@@ skipping 260 matching lines @@
 namespace {
 // This class is used by GenerateFullCHLO() to extract SCID and STK from
 // REJ/SREJ and to construct a full CHLO with these fields and given inchoate
 // CHLO.
 class FullChloGenerator {
  public:
   FullChloGenerator(QuicCryptoServerConfig* crypto_config,
                     IPAddress server_ip,
                     IPEndPoint client_addr,
                     const QuicClock* clock,
-                    scoped_refptr<QuicCryptoProof> proof,
+                    scoped_refptr<QuicSignedServerConfig> signed_config,
                     QuicCompressedCertsCache* compressed_certs_cache,
                     CryptoHandshakeMessage* out)
       : crypto_config_(crypto_config),
         server_ip_(server_ip),
         client_addr_(client_addr),
         clock_(clock),
-        proof_(proof),
+        signed_config_(signed_config),
         compressed_certs_cache_(compressed_certs_cache),
         out_(out),
         params_(new QuicCryptoNegotiatedParameters) {}
 
   class ValidateClientHelloCallback : public ValidateClientHelloResultCallback {
    public:
     explicit ValidateClientHelloCallback(FullChloGenerator* generator)
         : generator_(generator) {}
     void Run(scoped_refptr<ValidateClientHelloResultCallback::Result> result,
              std::unique_ptr<ProofSource::Details> /* details */) override {
@@ skipping 12 matching lines @@
 
  private:
   void ValidateClientHelloDone(
       scoped_refptr<ValidateClientHelloResultCallback::Result> result) {
     result_ = result;
     crypto_config_->ProcessClientHello(
         result_, /*reject_only=*/false, /*connection_id=*/1, server_ip_,
         client_addr_, AllSupportedVersions().front(), AllSupportedVersions(),
         /*use_stateless_rejects=*/true, /*server_designated_connection_id=*/0,
         clock_, QuicRandom::GetInstance(), compressed_certs_cache_, params_,
-        proof_, /*total_framing_overhead=*/50, kDefaultMaxPacketSize,
+        signed_config_, /*total_framing_overhead=*/50, kDefaultMaxPacketSize,
         GetProcessClientHelloCallback());
   }
 
   class ProcessClientHelloCallback : public ProcessClientHelloResultCallback {
    public:
     explicit ProcessClientHelloCallback(FullChloGenerator* generator)
         : generator_(generator) {}
     void Run(
         QuicErrorCode error,
         const string& error_details,
@@ skipping 34 matching lines @@
     out_->SetStringPiece(kSourceAddressTokenTag, srct);
     uint64_t xlct = CryptoTestUtils::LeafCertHashForTesting();
     out_->SetValue(kXLCT, xlct);
   }
 
  protected:
   QuicCryptoServerConfig* crypto_config_;
   IPAddress server_ip_;
   IPEndPoint client_addr_;
   const QuicClock* clock_;
-  scoped_refptr<QuicCryptoProof> proof_;
+  scoped_refptr<QuicSignedServerConfig> signed_config_;
   QuicCompressedCertsCache* compressed_certs_cache_;
   CryptoHandshakeMessage* out_;
 
   scoped_refptr<QuicCryptoNegotiatedParameters> params_;
   scoped_refptr<ValidateClientHelloResultCallback::Result> result_;
 };
 
 }  // namespace
 
 // static
@@ skipping 173 matching lines @@
   QuicTagValueMap::const_iterator it = message.tag_value_map().find(tag);
   if (it == message.tag_value_map().end()) {
     return string();
   }
   return it->second;
 }
 
 uint64_t CryptoTestUtils::LeafCertHashForTesting() {
   scoped_refptr<ProofSource::Chain> chain;
   IPAddress server_ip;
-  string sig;
-  string cert_sct;
+  QuicCryptoProof proof;
   std::unique_ptr<ProofSource> proof_source(
       CryptoTestUtils::ProofSourceForTesting());
   if (!proof_source->GetProof(server_ip, "", "", AllSupportedVersions().front(),
-                              "", QuicTagVector(), &chain, &sig, &cert_sct) ||
+                              "", QuicTagVector(), &chain, &proof) ||
       chain->certs.empty()) {
     DCHECK(false) << "Proof generation failed";
     return 0;
   }
 
   return QuicUtils::FNV1a_64_Hash(chain->certs.at(0).c_str(),
                                   chain->certs.at(0).length());
 }
 
 class MockCommonCertSets : public CommonCertSets {
@@ skipping 367 matching lines @@
     QuicCryptoServerConfig* crypto_config) {
   // clang-format off
   return CryptoTestUtils::Message(
       "CHLO",
       "PDMD", "X509",
       "AEAD", "AESG",
       "KEXS", "C255",
       "PUBS", CryptoTestUtils::GenerateClientPublicValuesHex().c_str(),
       "NONC", CryptoTestUtils::GenerateClientNonceHex(clock,
                                                       crypto_config).c_str(),
-      "VER\0", QuicUtils::TagToString(
+      "VER\0", QuicTagToString(
           QuicVersionToQuicTag(version)).c_str(),
       "$padding", static_cast<int>(kClientHelloMinimumSize),
       nullptr);
   // clang-format on
 }
 
 string CryptoTestUtils::GenerateClientNonceHex(
     const QuicClock* clock,
     QuicCryptoServerConfig* crypto_config) {
   net::QuicCryptoServerConfig::ConfigOptions old_config_options;
@@ skipping 25 matching lines @@
 }
 
 // static
 void CryptoTestUtils::GenerateFullCHLO(
     const CryptoHandshakeMessage& inchoate_chlo,
     QuicCryptoServerConfig* crypto_config,
     IPAddress server_ip,
     IPEndPoint client_addr,
     QuicVersion version,
     const QuicClock* clock,
-    scoped_refptr<QuicCryptoProof> proof,
+    scoped_refptr<QuicSignedServerConfig> proof,
     QuicCompressedCertsCache* compressed_certs_cache,
     CryptoHandshakeMessage* out) {
   // Pass a inchoate CHLO.
   FullChloGenerator generator(crypto_config, server_ip, client_addr, clock,
                               proof, compressed_certs_cache, out);
   crypto_config->ValidateClientHello(
       inchoate_chlo, client_addr.address(), server_ip, version, clock, proof,
       generator.GetValidateClientHelloCallback());
 }
 
 }  // namespace test
 }  // namespace net