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

Side by Side Diff: net/socket/ssl_client_socket.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed the structure of pending_sockets_and_callbacks_ and made cl compatible with nss. (Fixed one… Created 6 years, 5 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/socket/ssl_client_socket.h" 5 #include "net/socket/ssl_client_socket.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "crypto/ec_private_key.h" 9 #include "crypto/ec_private_key.h"
10 #include "net/ssl/server_bound_cert_service.h" 10 #include "net/ssl/server_bound_cert_service.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 96 }
97 97
98 bool SSLClientSocket::WasNpnNegotiated() const { 98 bool SSLClientSocket::WasNpnNegotiated() const {
99 return was_npn_negotiated_; 99 return was_npn_negotiated_;
100 } 100 }
101 101
102 NextProto SSLClientSocket::GetNegotiatedProtocol() const { 102 NextProto SSLClientSocket::GetNegotiatedProtocol() const {
103 return protocol_negotiated_; 103 return protocol_negotiated_;
104 } 104 }
105 105
106 // static
107 std::string SSLClientSocket::FormatSessionCacheKey(
108 std::string host_and_port,
109 std::string ssl_session_cache_shard) {
110 std::string result = host_and_port;
111 result.append("/");
112 result.append(ssl_session_cache_shard);
113 return result;
114 }
115
106 bool SSLClientSocket::IgnoreCertError(int error, int load_flags) { 116 bool SSLClientSocket::IgnoreCertError(int error, int load_flags) {
107 if (error == OK || load_flags & LOAD_IGNORE_ALL_CERT_ERRORS) 117 if (error == OK || load_flags & LOAD_IGNORE_ALL_CERT_ERRORS)
108 return true; 118 return true;
109 119
110 if (error == ERR_CERT_COMMON_NAME_INVALID && 120 if (error == ERR_CERT_COMMON_NAME_INVALID &&
111 (load_flags & LOAD_IGNORE_CERT_COMMON_NAME_INVALID)) 121 (load_flags & LOAD_IGNORE_CERT_COMMON_NAME_INVALID))
112 return true; 122 return true;
113 123
114 if (error == ERR_CERT_DATE_INVALID && 124 if (error == ERR_CERT_DATE_INVALID &&
115 (load_flags & LOAD_IGNORE_CERT_DATE_INVALID)) 125 (load_flags & LOAD_IGNORE_CERT_DATE_INVALID))
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 return false; 213 return false;
204 } 214 }
205 if (!server_bound_cert_service->IsSystemTimeValid()) { 215 if (!server_bound_cert_service->IsSystemTimeValid()) {
206 DVLOG(1) << "System time is not within the supported range for certificate " 216 DVLOG(1) << "System time is not within the supported range for certificate "
207 "generation, not enabling channel ID."; 217 "generation, not enabling channel ID.";
208 return false; 218 return false;
209 } 219 }
210 return true; 220 return true;
211 } 221 }
212 222
223 // static
224 bool SSLClientSocket::enable_connect_job_waiting_ = false;
225
226 // static
227 void SSLClientSocket::EnableConnectJobWaiting(bool enable) {
228 enable_connect_job_waiting_ = enable;
229 }
230
231 // static
232 bool SSLClientSocket::GetEnableConnectJobWaiting() {
233 return enable_connect_job_waiting_;
234 }
235
213 } // namespace net 236 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698