| OLD | NEW |
| 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 Loading... |
| 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 Loading... |
| 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 |
| OLD | NEW |