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

net/quic/test_tools/crypto_test_utils_test.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 "net/quic/core/crypto/crypto_server_config_protobuf.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::string;
 
 namespace net {
 namespace test {
 
 class ShloVerifier {
  public:
   ShloVerifier(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)
       : 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),
         params_(new QuicCryptoNegotiatedParameters) {}
 
   class ValidateClientHelloCallback : public ValidateClientHelloResultCallback {
    public:
     explicit ValidateClientHelloCallback(ShloVerifier* shlo_verifier)
         : shlo_verifier_(shlo_verifier) {}
     void Run(scoped_refptr<ValidateClientHelloResultCallback::Result> result,
              std::unique_ptr<ProofSource::Details> /* details */) override {
       shlo_verifier_->ValidateClientHelloDone(result);
@@ skipping 11 matching lines @@
 
  private:
   void ValidateClientHelloDone(
       const 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(ShloVerifier* shlo_verifier)
         : shlo_verifier_(shlo_verifier) {}
     void Run(
         QuicErrorCode error,
         const string& error_details,
@@ skipping 15 matching lines @@
   void ProcessClientHelloDone(std::unique_ptr<CryptoHandshakeMessage> message) {
     // Verify output is a SHLO.
     EXPECT_EQ(message->tag(), kSHLO) << "Fail to pass validation. Get "
                                      << message->DebugString();
   }
 
   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_;
 
   scoped_refptr<QuicCryptoNegotiatedParameters> params_;
   scoped_refptr<ValidateClientHelloResultCallback::Result> result_;
 };
 
 TEST(CryptoTestUtilsTest, TestGenerateFullCHLO) {
   MockClock clock;
   QuicCryptoServerConfig crypto_config(
       QuicCryptoServerConfig::TESTING, QuicRandom::GetInstance(),
       CryptoTestUtils::ProofSourceForTesting());
   IPAddress server_ip;
   IPEndPoint client_addr(IPAddress::IPv4Localhost(), 1);
-  scoped_refptr<QuicCryptoProof> proof(new QuicCryptoProof);
+  scoped_refptr<QuicSignedServerConfig> signed_config(
+      new QuicSignedServerConfig);
   QuicCompressedCertsCache compressed_certs_cache(
       QuicCompressedCertsCache::kQuicCompressedCertsCacheSize);
   CryptoHandshakeMessage full_chlo;
 
   QuicCryptoServerConfig::ConfigOptions old_config_options;
   old_config_options.id = "old-config-id";
   delete crypto_config.AddDefaultConfig(QuicRandom::GetInstance(), &clock,
                                         old_config_options);
   QuicCryptoServerConfig::ConfigOptions new_config_options;
   std::unique_ptr<QuicServerConfigProtobuf> primary_config(
@@ skipping 20 matching lines @@
   QuicVersion version(AllSupportedVersions().front());
   // clang-format off
   CryptoHandshakeMessage inchoate_chlo = CryptoTestUtils::Message(
     "CHLO",
     "PDMD", "X509",
     "AEAD", "AESG",
     "KEXS", "C255",
     "COPT", "SREJ",
     "PUBS", pub_hex.c_str(),
     "NONC", nonce_hex.c_str(),
-    "VER\0", QuicUtils::TagToString(QuicVersionToQuicTag(version)).c_str(),
+    "VER\0", QuicTagToString(QuicVersionToQuicTag(version)).c_str(),
     "$padding", static_cast<int>(kClientHelloMinimumSize),
     nullptr);
   // clang-format on
 
   CryptoTestUtils::GenerateFullCHLO(inchoate_chlo, &crypto_config, server_ip,
-                                    client_addr, version, &clock, proof,
+                                    client_addr, version, &clock, signed_config,
                                     &compressed_certs_cache, &full_chlo);
   // Verify that full_chlo can pass crypto_config's verification.
   ShloVerifier shlo_verifier(&crypto_config, server_ip, client_addr, &clock,
-                             proof, &compressed_certs_cache);
+                             signed_config, &compressed_certs_cache);
   crypto_config.ValidateClientHello(
-      full_chlo, client_addr.address(), server_ip, version, &clock, proof,
-      shlo_verifier.GetValidateClientHelloCallback());
+      full_chlo, client_addr.address(), server_ip, version, &clock,
+      signed_config, shlo_verifier.GetValidateClientHelloCallback());
 }
 
 }  // namespace test
 }  // namespace net