Land Recent QUIC changes.

net/quic/crypto/crypto_handshake.cc

 // Copyright (c) 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/crypto/crypto_handshake.h"
 
 #include <ctype.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 555 matching lines @@
     // TODO(rtenneti): Enable ECDSA proof verification on Windows. Disabled it
     // because X509Certificate::GetPublicKeyInfo is not returning the correct
     // type for ECDSA certificates.
 #if defined(OS_WIN)
     out->SetTaglist(kPDMD, kX59R, 0);
 #else
     out->SetTaglist(kPDMD, kX509, 0);
 #endif
   }
 
+  if (proof_verifier_.get() && !cached->proof_valid()) {
+    // If we are expecting a certificate chain, double the size of the client
+    // hello so that the response from the server can be larger - hopefully
+    // including the whole certificate chain.
+    out->set_minimum_size(kClientHelloMinimumSize * 2);
+  }
+
   if (common_cert_sets) {
     out->SetStringPiece(kCCS, common_cert_sets->GetCommonHashes());
   }
 
   const vector<string>& certs = cached->certs();
   // We save |certs| in the QuicCryptoNegotiatedParameters so that, if the
   // client config is being used for multiple connections, another connection
   // doesn't update the cached certificates and cause us to be unable to
   // process the server's compressed certificate chain.
   out_params->cached_certs = certs;
@@ skipping 287 matching lines @@
 
 ChannelIDSigner* QuicCryptoClientConfig::channel_id_signer() const {
   return channel_id_signer_.get();
 }
 
 void QuicCryptoClientConfig::SetChannelIDSigner(ChannelIDSigner* signer) {
   channel_id_signer_.reset(signer);
 }
 
 }  // namespace net