| Index: net/quic/core/crypto/quic_crypto_server_config.cc
|
| diff --git a/net/quic/core/crypto/quic_crypto_server_config.cc b/net/quic/core/crypto/quic_crypto_server_config.cc
|
| index f3e7aa23aa61965dd7e3d764fef2cbd585ecd85d..3deaf629fe041959a0c27b2efb4142577a461b26 100644
|
| --- a/net/quic/core/crypto/quic_crypto_server_config.cc
|
| +++ b/net/quic/core/crypto/quic_crypto_server_config.cc
|
| @@ -515,7 +515,6 @@ void QuicCryptoServerConfig::ValidateClientHello(
|
| StringPiece requested_scid;
|
| client_hello.GetStringPiece(kSCID, &requested_scid);
|
|
|
| - uint8_t primary_orbit[kOrbitSize];
|
| scoped_refptr<Config> requested_config;
|
| scoped_refptr<Config> primary_config;
|
| {
|
| @@ -531,8 +530,6 @@ void QuicCryptoServerConfig::ValidateClientHello(
|
| DCHECK(primary_config_.get());
|
| DCHECK_EQ(configs_.find(primary_config_->id)->second, primary_config_);
|
| }
|
| -
|
| - memcpy(primary_orbit, primary_config_->orbit, sizeof(primary_orbit));
|
| }
|
|
|
| requested_config = GetConfigWithScid(requested_scid);
|
| @@ -545,9 +542,8 @@ void QuicCryptoServerConfig::ValidateClientHello(
|
| crypto_proof->chain = nullptr;
|
| crypto_proof->signature = "";
|
| crypto_proof->cert_sct = "";
|
| - EvaluateClientHello(server_ip, version, primary_orbit, requested_config,
|
| - primary_config, crypto_proof, result,
|
| - std::move(done_cb));
|
| + EvaluateClientHello(server_ip, version, requested_config, primary_config,
|
| + crypto_proof, result, std::move(done_cb));
|
| } else {
|
| done_cb->Run(result, /* details = */ nullptr);
|
| }
|
| @@ -1200,7 +1196,6 @@ class QuicCryptoServerConfig::EvaluateClientHelloCallback
|
| bool found_error,
|
| const IPAddress& server_ip,
|
| QuicVersion version,
|
| - const uint8_t* primary_orbit,
|
| scoped_refptr<QuicCryptoServerConfig::Config> requested_config,
|
| scoped_refptr<QuicCryptoServerConfig::Config> primary_config,
|
| QuicCryptoProof* crypto_proof,
|
| @@ -1211,7 +1206,6 @@ class QuicCryptoServerConfig::EvaluateClientHelloCallback
|
| found_error_(found_error),
|
| server_ip_(server_ip),
|
| version_(version),
|
| - primary_orbit_(primary_orbit),
|
| requested_config_(std::move(requested_config)),
|
| primary_config_(std::move(primary_config)),
|
| crypto_proof_(crypto_proof),
|
| @@ -1229,9 +1223,9 @@ class QuicCryptoServerConfig::EvaluateClientHelloCallback
|
| crypto_proof_->cert_sct = leaf_cert_sct;
|
| }
|
| config_.EvaluateClientHelloAfterGetProof(
|
| - found_error_, server_ip_, version_, primary_orbit_, requested_config_,
|
| - primary_config_, crypto_proof_, std::move(details), !ok,
|
| - client_hello_state_, std::move(done_cb_));
|
| + found_error_, server_ip_, version_, requested_config_, primary_config_,
|
| + crypto_proof_, std::move(details), !ok, client_hello_state_,
|
| + std::move(done_cb_));
|
| }
|
|
|
| private:
|
| @@ -1239,7 +1233,6 @@ class QuicCryptoServerConfig::EvaluateClientHelloCallback
|
| const bool found_error_;
|
| const IPAddress& server_ip_;
|
| const QuicVersion version_;
|
| - const uint8_t* primary_orbit_;
|
| const scoped_refptr<QuicCryptoServerConfig::Config> requested_config_;
|
| const scoped_refptr<QuicCryptoServerConfig::Config> primary_config_;
|
| QuicCryptoProof* crypto_proof_;
|
| @@ -1250,7 +1243,6 @@ class QuicCryptoServerConfig::EvaluateClientHelloCallback
|
| void QuicCryptoServerConfig::EvaluateClientHello(
|
| const IPAddress& server_ip,
|
| QuicVersion version,
|
| - const uint8_t* primary_orbit,
|
| scoped_refptr<Config> requested_config,
|
| scoped_refptr<Config> primary_config,
|
| QuicCryptoProof* crypto_proof,
|
| @@ -1332,9 +1324,9 @@ void QuicCryptoServerConfig::EvaluateClientHello(
|
| // back into EvaluateClientHelloAfterGetProof
|
| std::unique_ptr<EvaluateClientHelloCallback> cb(
|
| new EvaluateClientHelloCallback(
|
| - *this, found_error, server_ip, version, primary_orbit,
|
| - requested_config, primary_config, crypto_proof,
|
| - client_hello_state, std::move(done_cb)));
|
| + *this, found_error, server_ip, version, requested_config,
|
| + primary_config, crypto_proof, client_hello_state,
|
| + std::move(done_cb)));
|
| proof_source_->GetProof(server_ip, info->sni.as_string(),
|
| serialized_config, version, chlo_hash,
|
| std::move(cb));
|
| @@ -1355,9 +1347,9 @@ void QuicCryptoServerConfig::EvaluateClientHello(
|
| // Details are null because the synchronous version of GetProof does not
|
| // return any stats. Eventually the synchronous codepath will be eliminated.
|
| EvaluateClientHelloAfterGetProof(
|
| - found_error, server_ip, version, primary_orbit, requested_config,
|
| - primary_config, crypto_proof, nullptr /* proof_source_details */,
|
| - get_proof_failed, client_hello_state, std::move(done_cb));
|
| + found_error, server_ip, version, requested_config, primary_config,
|
| + crypto_proof, nullptr /* proof_source_details */, get_proof_failed,
|
| + client_hello_state, std::move(done_cb));
|
| helper.DetachCallback();
|
| }
|
|
|
| @@ -1365,7 +1357,6 @@ void QuicCryptoServerConfig::EvaluateClientHelloAfterGetProof(
|
| bool found_error,
|
| const IPAddress& server_ip,
|
| QuicVersion version,
|
| - const uint8_t* primary_orbit,
|
| scoped_refptr<Config> requested_config,
|
| scoped_refptr<Config> primary_config,
|
| QuicCryptoProof* crypto_proof,
|
|
|