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/spdy/spdy_session.h" | 5 #include "net/spdy/spdy_session.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <utility> | 10 #include <utility> |
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 HostPortPair(new_hostname, 0), ssl_info.is_issued_by_known_root, | 608 HostPortPair(new_hostname, 0), ssl_info.is_issued_by_known_root, |
609 ssl_info.public_key_hashes, ssl_info.unverified_cert.get(), | 609 ssl_info.public_key_hashes, ssl_info.unverified_cert.get(), |
610 ssl_info.cert.get(), TransportSecurityState::DISABLE_PIN_REPORTS, | 610 ssl_info.cert.get(), TransportSecurityState::DISABLE_PIN_REPORTS, |
611 &pinning_failure_log) == | 611 &pinning_failure_log) == |
612 TransportSecurityState::PKPStatus::VIOLATED) { | 612 TransportSecurityState::PKPStatus::VIOLATED) { |
613 return false; | 613 return false; |
614 } | 614 } |
615 | 615 |
616 if (ssl_info.ct_cert_policy_compliance != | 616 if (ssl_info.ct_cert_policy_compliance != |
617 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && | 617 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && |
| 618 ssl_info.ct_cert_policy_compliance != |
| 619 ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY && |
618 transport_security_state->ShouldRequireCT( | 620 transport_security_state->ShouldRequireCT( |
619 new_hostname, ssl_info.cert.get(), ssl_info.public_key_hashes)) { | 621 new_hostname, ssl_info.cert.get(), ssl_info.public_key_hashes)) { |
620 return false; | 622 return false; |
621 } | 623 } |
622 | 624 |
623 return true; | 625 return true; |
624 } | 626 } |
625 | 627 |
626 SpdySession::SpdySession(const SpdySessionKey& spdy_session_key, | 628 SpdySession::SpdySession(const SpdySessionKey& spdy_session_key, |
627 HttpServerProperties* http_server_properties, | 629 HttpServerProperties* http_server_properties, |
(...skipping 2479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3107 if (!queue->empty()) { | 3109 if (!queue->empty()) { |
3108 SpdyStreamId stream_id = queue->front(); | 3110 SpdyStreamId stream_id = queue->front(); |
3109 queue->pop_front(); | 3111 queue->pop_front(); |
3110 return stream_id; | 3112 return stream_id; |
3111 } | 3113 } |
3112 } | 3114 } |
3113 return 0; | 3115 return 0; |
3114 } | 3116 } |
3115 | 3117 |
3116 } // namespace net | 3118 } // namespace net |
OLD | NEW |