| Index: net/quic/crypto/quic_crypto_client_config.cc
|
| diff --git a/net/quic/crypto/quic_crypto_client_config.cc b/net/quic/crypto/quic_crypto_client_config.cc
|
| index 4481a9486b03fb1a8df944593645e0916f356d80..33d5242b708bf82bfc6bd79b5109b520cee3b56d 100644
|
| --- a/net/quic/crypto/quic_crypto_client_config.cc
|
| +++ b/net/quic/crypto/quic_crypto_client_config.cc
|
| @@ -532,8 +532,8 @@ QuicErrorCode QuicCryptoClientConfig::FillClientHello(
|
| QuicErrorCode QuicCryptoClientConfig::CacheNewServerConfig(
|
| const CryptoHandshakeMessage& message,
|
| QuicWallTime now,
|
| + const vector<string>& cached_certs,
|
| CachedState* cached,
|
| - QuicCryptoNegotiatedParameters* out_params,
|
| string* error_details) {
|
| DCHECK(error_details != NULL);
|
|
|
| @@ -558,7 +558,7 @@ QuicErrorCode QuicCryptoClientConfig::CacheNewServerConfig(
|
| bool has_cert = message.GetStringPiece(kCertificateTag, &cert_bytes);
|
| if (has_proof && has_cert) {
|
| vector<string> certs;
|
| - if (!CertCompressor::DecompressChain(cert_bytes, out_params->cached_certs,
|
| + if (!CertCompressor::DecompressChain(cert_bytes, cached_certs,
|
| common_cert_sets, &certs)) {
|
| *error_details = "Certificate data invalid";
|
| return QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER;
|
| @@ -594,8 +594,8 @@ QuicErrorCode QuicCryptoClientConfig::ProcessRejection(
|
| return QUIC_CRYPTO_INTERNAL_ERROR;
|
| }
|
|
|
| - QuicErrorCode error =
|
| - CacheNewServerConfig(rej, now, cached, out_params, error_details);
|
| + QuicErrorCode error = CacheNewServerConfig(rej, now, out_params->cached_certs,
|
| + cached, error_details);
|
| if (error != QUIC_NO_ERROR) {
|
| return error;
|
| }
|
| @@ -716,8 +716,8 @@ QuicErrorCode QuicCryptoClientConfig::ProcessServerConfigUpdate(
|
| return QUIC_INVALID_CRYPTO_MESSAGE_TYPE;
|
| }
|
|
|
| - return CacheNewServerConfig(server_config_update, now, cached, out_params,
|
| - error_details);
|
| + return CacheNewServerConfig(server_config_update, now,
|
| + out_params->cached_certs, cached, error_details);
|
| }
|
|
|
| ProofVerifier* QuicCryptoClientConfig::proof_verifier() const {
|
|
|