| 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 <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 return false; | 571 return false; |
| 572 } | 572 } |
| 573 | 573 |
| 574 bool unused = false; | 574 bool unused = false; |
| 575 if (!ssl_info.cert->VerifyNameMatch(new_hostname, &unused)) | 575 if (!ssl_info.cert->VerifyNameMatch(new_hostname, &unused)) |
| 576 return false; | 576 return false; |
| 577 | 577 |
| 578 std::string pinning_failure_log; | 578 std::string pinning_failure_log; |
| 579 if (!transport_security_state->CheckPublicKeyPins( | 579 if (!transport_security_state->CheckPublicKeyPins( |
| 580 new_hostname, | 580 new_hostname, |
| 581 true, /* sni_available */ | |
| 582 ssl_info.is_issued_by_known_root, | 581 ssl_info.is_issued_by_known_root, |
| 583 ssl_info.public_key_hashes, | 582 ssl_info.public_key_hashes, |
| 584 &pinning_failure_log)) { | 583 &pinning_failure_log)) { |
| 585 return false; | 584 return false; |
| 586 } | 585 } |
| 587 | 586 |
| 588 return true; | 587 return true; |
| 589 } | 588 } |
| 590 | 589 |
| 591 SpdySession::SpdySession( | 590 SpdySession::SpdySession( |
| (...skipping 2666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3258 if (!queue->empty()) { | 3257 if (!queue->empty()) { |
| 3259 SpdyStreamId stream_id = queue->front(); | 3258 SpdyStreamId stream_id = queue->front(); |
| 3260 queue->pop_front(); | 3259 queue->pop_front(); |
| 3261 return stream_id; | 3260 return stream_id; |
| 3262 } | 3261 } |
| 3263 } | 3262 } |
| 3264 return 0; | 3263 return 0; |
| 3265 } | 3264 } |
| 3266 | 3265 |
| 3267 } // namespace net | 3266 } // namespace net |
| OLD | NEW |