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

Unified Diff: net/quic/quic_crypto_client_stream.cc

Issue 1397983007: relnote: remove insecure QUIC support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rch_insecure_quic
Patch Set: Compile fix Created 5 years, 2 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/quic_connection_test.cc ('k') | net/quic/quic_crypto_client_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_crypto_client_stream.cc
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
index 5a39043ae14ebedeccc1ce016fb61e2745ac285d..e829cafcd3c8d505c8465ce142223d329cf87bb5 100644
--- a/net/quic/quic_crypto_client_stream.cc
+++ b/net/quic/quic_crypto_client_stream.cc
@@ -224,8 +224,7 @@ void QuicCryptoClientStream::DoHandshakeLoop(
void QuicCryptoClientStream::DoInitialize(
QuicCryptoClientConfig::CachedState* cached) {
- if (!cached->IsEmpty() && !cached->signature().empty() &&
- server_id_.is_https()) {
+ if (!cached->IsEmpty() && !cached->signature().empty()) {
// Note that we verify the proof even if the cached proof is valid.
// This allows us to respond to CA trust changes or certificate
// expiration because it may have been a while since we last verified
@@ -375,7 +374,7 @@ void QuicCryptoClientStream::DoReceiveREJ(
string error_details;
QuicErrorCode error = crypto_config_->ProcessRejection(
*in, session()->connection()->clock()->WallNow(), cached,
- server_id_.is_https(), &crypto_negotiated_params_, &error_details);
+ &crypto_negotiated_params_, &error_details);
if (error != QUIC_NO_ERROR) {
next_state_ = STATE_NONE;
@@ -383,10 +382,7 @@ void QuicCryptoClientStream::DoReceiveREJ(
return;
}
if (!cached->proof_valid()) {
- if (!server_id_.is_https()) {
- // We don't check the certificates for insecure QUIC connections.
- SetCachedProofValid(cached);
- } else if (!cached->signature().empty()) {
+ if (!cached->signature().empty()) {
// Note that we only verify the proof if the cached proof is not
// valid. If the cached proof is valid here, someone else must have
// just added the server config to the cache and verified the proof,
@@ -582,11 +578,7 @@ void QuicCryptoClientStream::DoReceiveSHLO(
void QuicCryptoClientStream::DoInitializeServerConfigUpdate(
QuicCryptoClientConfig::CachedState* cached) {
bool update_ignored = false;
- if (!server_id_.is_https()) {
- // We don't check the certificates for insecure QUIC connections.
- SetCachedProofValid(cached);
- next_state_ = STATE_NONE;
- } else if (!cached->IsEmpty() && !cached->signature().empty()) {
+ if (!cached->IsEmpty() && !cached->signature().empty()) {
// Note that we verify the proof even if the cached proof is valid.
DCHECK(crypto_config_->proof_verifier());
next_state_ = STATE_VERIFY_PROOF;
@@ -606,8 +598,7 @@ void QuicCryptoClientStream::SetCachedProofValid(
bool QuicCryptoClientStream::RequiresChannelID(
QuicCryptoClientConfig::CachedState* cached) {
- if (!server_id_.is_https() ||
- server_id_.privacy_mode() == PRIVACY_MODE_ENABLED ||
+ if (server_id_.privacy_mode() == PRIVACY_MODE_ENABLED ||
!crypto_config_->channel_id_source()) {
return false;
}
« no previous file with comments | « net/quic/quic_connection_test.cc ('k') | net/quic/quic_crypto_client_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698