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 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 HostPortPair(new_hostname, 0), ssl_info.is_issued_by_known_root, | 610 HostPortPair(new_hostname, 0), ssl_info.is_issued_by_known_root, |
611 ssl_info.public_key_hashes, ssl_info.unverified_cert.get(), | 611 ssl_info.public_key_hashes, ssl_info.unverified_cert.get(), |
612 ssl_info.cert.get(), TransportSecurityState::DISABLE_PIN_REPORTS, | 612 ssl_info.cert.get(), TransportSecurityState::DISABLE_PIN_REPORTS, |
613 &pinning_failure_log) == | 613 &pinning_failure_log) == |
614 TransportSecurityState::PKPStatus::VIOLATED) { | 614 TransportSecurityState::PKPStatus::VIOLATED) { |
615 return false; | 615 return false; |
616 } | 616 } |
617 | 617 |
618 if (ssl_info.ct_cert_policy_compliance != | 618 if (ssl_info.ct_cert_policy_compliance != |
619 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && | 619 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && |
| 620 ssl_info.ct_cert_policy_compliance != |
| 621 ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY && |
620 transport_security_state->ShouldRequireCT( | 622 transport_security_state->ShouldRequireCT( |
621 new_hostname, ssl_info.cert.get(), ssl_info.public_key_hashes)) { | 623 new_hostname, ssl_info.cert.get(), ssl_info.public_key_hashes)) { |
622 return false; | 624 return false; |
623 } | 625 } |
624 | 626 |
625 return true; | 627 return true; |
626 } | 628 } |
627 | 629 |
628 SpdySession::SpdySession(const SpdySessionKey& spdy_session_key, | 630 SpdySession::SpdySession(const SpdySessionKey& spdy_session_key, |
629 HttpServerProperties* http_server_properties, | 631 HttpServerProperties* http_server_properties, |
(...skipping 2503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3133 if (!queue->empty()) { | 3135 if (!queue->empty()) { |
3134 SpdyStreamId stream_id = queue->front(); | 3136 SpdyStreamId stream_id = queue->front(); |
3135 queue->pop_front(); | 3137 queue->pop_front(); |
3136 return stream_id; | 3138 return stream_id; |
3137 } | 3139 } |
3138 } | 3140 } |
3139 return 0; | 3141 return 0; |
3140 } | 3142 } |
3141 | 3143 |
3142 } // namespace net | 3144 } // namespace net |
OLD | NEW |