Landing Recent QUIC changes until 7/26/2016 13:53 UTC

net/quic/quic_crypto_server_stream.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/quic_crypto_server_stream.h"
 
 #include <memory>
 
 #include "base/base64.h"
 #include "crypto/secure_hash.h"
@@ skipping 139 matching lines @@
   validate_client_hello_cb_ = new ValidateCallback(this);
   crypto_config_->ValidateClientHello(
       message, session()->connection()->peer_address().address(),
       session()->connection()->self_address().address(), version(),
       session()->connection()->clock(), &crypto_proof_,
       validate_client_hello_cb_);
 }
 
 void QuicCryptoServerStream::FinishProcessingHandshakeMessage(
     const CryptoHandshakeMessage& message,
-    const ValidateClientHelloResultCallback::Result& result) {
+    const ValidateClientHelloResultCallback::Result& result,
+    std::unique_ptr<ProofSource::Details> details) {
   // Clear the callback that got us here.
   DCHECK(validate_client_hello_cb_ != nullptr);
   validate_client_hello_cb_ = nullptr;
 
   if (use_stateless_rejects_if_peer_supported_) {
     peer_supports_stateless_rejects_ = DoesPeerSupportStatelessRejects(message);
   }
 
   CryptoHandshakeMessage reply;
   DiversificationNonce diversification_nonce;
   string error_details;
-  QuicErrorCode error = ProcessClientHello(
-      message, result, &reply, &diversification_nonce, &error_details);
+  QuicErrorCode error =
+      ProcessClientHello(message, result, std::move(details), &reply,
+                         &diversification_nonce, &error_details);
 
   if (error != QUIC_NO_ERROR) {
     CloseConnectionWithDetails(error, error_details);
     return;
   }
 
   if (reply.tag() != kSHLO) {
     if (reply.tag() == kSREJ) {
       DCHECK(use_stateless_rejects_if_peer_supported_);
       DCHECK(peer_supports_stateless_rejects_);
@@ skipping 226 matching lines @@
       }
       output->resize(len);
     }
   }
   return true;
 }
 
 QuicErrorCode QuicCryptoServerStream::ProcessClientHello(
     const CryptoHandshakeMessage& message,
     const ValidateClientHelloResultCallback::Result& result,
+    std::unique_ptr<ProofSource::Details> proof_source_details,
     CryptoHandshakeMessage* reply,
     DiversificationNonce* out_diversification_nonce,
     string* error_details) {
   QuicServerSessionBase* session_base =
       static_cast<QuicServerSessionBase*>(session());
   if (!session_base->CanAcceptClientHello(message, error_details)) {
     return QUIC_HANDSHAKE_FAILED;
   }
 
   if (!result.info.server_nonce.empty()) {
@@ skipping 29 matching lines @@
 QuicCryptoServerStream::ValidateCallback::ValidateCallback(
     QuicCryptoServerStream* parent)
     : parent_(parent) {}
 
 void QuicCryptoServerStream::ValidateCallback::Cancel() {
   parent_ = nullptr;
 }
 
 void QuicCryptoServerStream::ValidateCallback::RunImpl(
     const CryptoHandshakeMessage& client_hello,
-    const Result& result) {
+    const Result& result,
+    std::unique_ptr<ProofSource::Details> details) {
   if (parent_ != nullptr) {
-    parent_->FinishProcessingHandshakeMessage(client_hello, result);
+    parent_->FinishProcessingHandshakeMessage(client_hello, result,
+                                              std::move(details));
   }
 }
 
 QuicConnectionId QuicCryptoServerStream::GenerateConnectionIdForReject(
     QuicConnectionId connection_id) {
   // TODO(rch): Remove this method when
   // reloadable_flag_quic_dispatcher_creates_id2 is removed.
   QuicServerSessionBase* session_base =
       static_cast<QuicServerSessionBase*>(session());
   return session_base->GenerateConnectionIdForReject(connection_id);
 }
 
 }  // namespace net