Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(483)

Unified Diff: net/quic/crypto/quic_crypto_server_config.cc

Issue 1983183002: Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: "first try to fix link error for win_clang build" Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/crypto/quic_crypto_server_config.h ('k') | net/quic/quic_chromium_client_session_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/quic_crypto_server_config.cc
diff --git a/net/quic/crypto/quic_crypto_server_config.cc b/net/quic/crypto/quic_crypto_server_config.cc
index 3b59df4882c732515f225cde40a841237885192e..134feaba53cd6a52c99edac03566933a6e5cc05a 100644
--- a/net/quic/crypto/quic_crypto_server_config.cc
+++ b/net/quic/crypto/quic_crypto_server_config.cc
@@ -1160,6 +1160,7 @@ void QuicCryptoServerConfig::EvaluateClientHello(
bool QuicCryptoServerConfig::BuildServerConfigUpdateMessage(
QuicVersion version,
+ StringPiece chlo_hash,
const SourceAddressTokens& previous_source_address_tokens,
const IPAddress& server_ip,
const IPAddress& client_ip,
@@ -1181,12 +1182,22 @@ bool QuicCryptoServerConfig::BuildServerConfigUpdateMessage(
scoped_refptr<ProofSource::Chain> chain;
string signature;
string cert_sct;
- if (!proof_source_->GetProof(server_ip, params.sni,
- primary_config_->serialized, version,
- params.client_nonce, params.x509_ecdsa_supported,
- &chain, &signature, &cert_sct)) {
- DVLOG(1) << "Server: failed to get proof.";
- return false;
+ if (FLAGS_quic_use_hash_in_scup) {
+ if (!proof_source_->GetProof(server_ip, params.sni,
+ primary_config_->serialized, version,
+ chlo_hash, params.x509_ecdsa_supported, &chain,
+ &signature, &cert_sct)) {
+ DVLOG(1) << "Server: failed to get proof.";
+ return false;
+ }
+ } else {
+ if (!proof_source_->GetProof(
+ server_ip, params.sni, primary_config_->serialized, version,
+ params.client_nonce, params.x509_ecdsa_supported, &chain,
+ &signature, &cert_sct)) {
+ DVLOG(1) << "Server: failed to get proof.";
+ return false;
+ }
}
const string compressed = CompressChain(
« no previous file with comments | « net/quic/crypto/quic_crypto_server_config.h ('k') | net/quic/quic_chromium_client_session_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698