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_chromium_client_session.h" | 5 #include "net/quic/quic_chromium_client_session.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 } | 547 } |
548 int ssl_connection_status = 0; | 548 int ssl_connection_status = 0; |
549 ssl_connection_status |= cipher_suite; | 549 ssl_connection_status |= cipher_suite; |
550 ssl_connection_status |= | 550 ssl_connection_status |= |
551 (SSL_CONNECTION_VERSION_QUIC & SSL_CONNECTION_VERSION_MASK) | 551 (SSL_CONNECTION_VERSION_QUIC & SSL_CONNECTION_VERSION_MASK) |
552 << SSL_CONNECTION_VERSION_SHIFT; | 552 << SSL_CONNECTION_VERSION_SHIFT; |
553 | 553 |
554 ssl_info->public_key_hashes = cert_verify_result_->public_key_hashes; | 554 ssl_info->public_key_hashes = cert_verify_result_->public_key_hashes; |
555 ssl_info->is_issued_by_known_root = | 555 ssl_info->is_issued_by_known_root = |
556 cert_verify_result_->is_issued_by_known_root; | 556 cert_verify_result_->is_issued_by_known_root; |
| 557 ssl_info->pkp_bypassed = cert_verify_result_->pkp_bypassed; |
557 | 558 |
558 ssl_info->connection_status = ssl_connection_status; | 559 ssl_info->connection_status = ssl_connection_status; |
559 ssl_info->client_cert_sent = false; | 560 ssl_info->client_cert_sent = false; |
560 ssl_info->channel_id_sent = crypto_stream_->WasChannelIDSent(); | 561 ssl_info->channel_id_sent = crypto_stream_->WasChannelIDSent(); |
561 ssl_info->security_bits = security_bits; | 562 ssl_info->security_bits = security_bits; |
562 ssl_info->handshake_type = SSLInfo::HANDSHAKE_FULL; | 563 ssl_info->handshake_type = SSLInfo::HANDSHAKE_FULL; |
563 ssl_info->pinning_failure_log = pinning_failure_log_; | 564 ssl_info->pinning_failure_log = pinning_failure_log_; |
564 | 565 |
565 ssl_info->UpdateCertificateTransparencyInfo(*ct_verify_result_); | 566 ssl_info->UpdateCertificateTransparencyInfo(*ct_verify_result_); |
566 | 567 |
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1198 } | 1199 } |
1199 | 1200 |
1200 void QuicChromiumClientSession::DeletePromised( | 1201 void QuicChromiumClientSession::DeletePromised( |
1201 QuicClientPromisedInfo* promised) { | 1202 QuicClientPromisedInfo* promised) { |
1202 if (IsOpenStream(promised->id())) | 1203 if (IsOpenStream(promised->id())) |
1203 streams_pushed_and_claimed_count_++; | 1204 streams_pushed_and_claimed_count_++; |
1204 QuicClientSessionBase::DeletePromised(promised); | 1205 QuicClientSessionBase::DeletePromised(promised); |
1205 } | 1206 } |
1206 | 1207 |
1207 } // namespace net | 1208 } // namespace net |
OLD | NEW |