Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Side by Side Diff: net/spdy/spdy_session.cc

Issue 578553004: Remove the "snionly" concept from the HSTS preload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ... Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/socket_stream/socket_stream_job.cc ('k') | net/ssl/ssl_config_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 2661 matching lines...) Expand 10 before | Expand all | Expand 10 after
3253 if (!queue->empty()) { 3252 if (!queue->empty()) {
3254 SpdyStreamId stream_id = queue->front(); 3253 SpdyStreamId stream_id = queue->front();
3255 queue->pop_front(); 3254 queue->pop_front();
3256 return stream_id; 3255 return stream_id;
3257 } 3256 }
3258 } 3257 }
3259 return 0; 3258 return 0;
3260 } 3259 }
3261 3260
3262 } // namespace net 3261 } // namespace net
OLDNEW
« no previous file with comments | « net/socket_stream/socket_stream_job.cc ('k') | net/ssl/ssl_config_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698