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

Side by Side Diff: net/quic/quic_crypto_client_stream.cc

Issue 2155753002: Enable Expect-Staple in SSLClientSocket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocsp-reporting
Patch Set: Rebase / Add QUIC todo Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « net/http/transport_security_state_unittest.cc ('k') | net/socket/ssl_client_socket_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_crypto_client_stream.h" 5 #include "net/quic/quic_crypto_client_stream.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 // Check if generation_counter has changed between STATE_VERIFY_PROOF and 519 // Check if generation_counter has changed between STATE_VERIFY_PROOF and
520 // STATE_VERIFY_PROOF_COMPLETE state changes. 520 // STATE_VERIFY_PROOF_COMPLETE state changes.
521 if (generation_counter_ != cached->generation_counter()) { 521 if (generation_counter_ != cached->generation_counter()) {
522 next_state_ = STATE_VERIFY_PROOF; 522 next_state_ = STATE_VERIFY_PROOF;
523 } else { 523 } else {
524 SetCachedProofValid(cached); 524 SetCachedProofValid(cached);
525 cached->SetProofVerifyDetails(verify_details_.release()); 525 cached->SetProofVerifyDetails(verify_details_.release());
526 if (!handshake_confirmed()) { 526 if (!handshake_confirmed()) {
527 next_state_ = STATE_GET_CHANNEL_ID; 527 next_state_ = STATE_GET_CHANNEL_ID;
528 } else { 528 } else {
529 // TODO: Enable Expect-Staple. https://crbug.com/631101
529 next_state_ = STATE_NONE; 530 next_state_ = STATE_NONE;
530 } 531 }
531 } 532 }
532 } 533 }
533 534
534 QuicAsyncStatus QuicCryptoClientStream::DoGetChannelID( 535 QuicAsyncStatus QuicCryptoClientStream::DoGetChannelID(
535 QuicCryptoClientConfig::CachedState* cached) { 536 QuicCryptoClientConfig::CachedState* cached) {
536 next_state_ = STATE_GET_CHANNEL_ID_COMPLETE; 537 next_state_ = STATE_GET_CHANNEL_ID_COMPLETE;
537 channel_id_key_.reset(); 538 channel_id_key_.reset();
538 if (!RequiresChannelID(cached)) { 539 if (!RequiresChannelID(cached)) {
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 } 686 }
686 for (size_t i = 0; i < num_their_proof_demands; i++) { 687 for (size_t i = 0; i < num_their_proof_demands; i++) {
687 if (their_proof_demands[i] == kCHID) { 688 if (their_proof_demands[i] == kCHID) {
688 return true; 689 return true;
689 } 690 }
690 } 691 }
691 return false; 692 return false;
692 } 693 }
693 694
694 } // namespace net 695 } // namespace net
OLDNEW
« no previous file with comments | « net/http/transport_security_state_unittest.cc ('k') | net/socket/ssl_client_socket_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698