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

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

Issue 1405383003: IsSecureTLSCipherSuite should not classify DHE_RSA as secure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 1016
1017 SSLInfo ssl_info; 1017 SSLInfo ssl_info;
1018 CHECK(connection_->socket()->GetSSLInfo(&ssl_info)); 1018 CHECK(connection_->socket()->GetSSLInfo(&ssl_info));
1019 1019
1020 // HTTP/2 requires TLS 1.2+ 1020 // HTTP/2 requires TLS 1.2+
1021 if (SSLConnectionStatusToVersion(ssl_info.connection_status) < 1021 if (SSLConnectionStatusToVersion(ssl_info.connection_status) <
1022 SSL_CONNECTION_VERSION_TLS1_2) { 1022 SSL_CONNECTION_VERSION_TLS1_2) {
1023 return false; 1023 return false;
1024 } 1024 }
1025 1025
1026 if (!IsSecureTLSCipherSuite( 1026 if (!IsTLSCipherSuiteAllowedByHTTP2(
1027 SSLConnectionStatusToCipherSuite(ssl_info.connection_status))) { 1027 SSLConnectionStatusToCipherSuite(ssl_info.connection_status))) {
1028 return false; 1028 return false;
1029 } 1029 }
1030 1030
1031 return true; 1031 return true;
1032 } 1032 }
1033 1033
1034 base::WeakPtr<SpdySession> SpdySession::GetWeakPtr() { 1034 base::WeakPtr<SpdySession> SpdySession::GetWeakPtr() {
1035 return weak_factory_.GetWeakPtr(); 1035 return weak_factory_.GetWeakPtr();
1036 } 1036 }
(...skipping 2228 matching lines...) Expand 10 before | Expand all | Expand 10 after
3265 if (!queue->empty()) { 3265 if (!queue->empty()) {
3266 SpdyStreamId stream_id = queue->front(); 3266 SpdyStreamId stream_id = queue->front();
3267 queue->pop_front(); 3267 queue->pop_front();
3268 return stream_id; 3268 return stream_id;
3269 } 3269 }
3270 } 3270 }
3271 return 0; 3271 return 0;
3272 } 3272 }
3273 3273
3274 } // namespace net 3274 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698