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

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

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comment issues, addressed case where session is NULL 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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "net/base/completion_callback.h" 11 #include "net/base/completion_callback.h"
12 #include "net/base/load_flags.h" 12 #include "net/base/load_flags.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/socket/ssl_socket.h" 14 #include "net/socket/ssl_socket.h"
15 #include "net/socket/stream_socket.h" 15 #include "net/socket/stream_socket.h"
16 16
17 namespace net { 17 namespace net {
18 18
19 class CertVerifier; 19 class CertVerifier;
20 class CTVerifier; 20 class CTVerifier;
21 class HostPortPair;
21 class ServerBoundCertService; 22 class ServerBoundCertService;
22 class SSLCertRequestInfo; 23 class SSLCertRequestInfo;
23 struct SSLConfig; 24 struct SSLConfig;
24 class SSLInfo; 25 class SSLInfo;
25 class TransportSecurityState; 26 class TransportSecurityState;
26 class X509Certificate; 27 class X509Certificate;
27 28
28 // This struct groups together several fields which are used by various 29 // This struct groups together several fields which are used by various
29 // classes related to SSLClientSocket. 30 // classes related to SSLClientSocket.
30 struct SSLClientSocketContext { 31 struct SSLClientSocketContext {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 kNextProtoUnsupported = 0, // The server doesn't support NPN. 75 kNextProtoUnsupported = 0, // The server doesn't support NPN.
75 kNextProtoNegotiated = 1, // We agreed on a protocol. 76 kNextProtoNegotiated = 1, // We agreed on a protocol.
76 kNextProtoNoOverlap = 2, // No protocols in common. We requested 77 kNextProtoNoOverlap = 2, // No protocols in common. We requested
77 // the first protocol in our list. 78 // the first protocol in our list.
78 }; 79 };
79 80
80 // StreamSocket: 81 // StreamSocket:
81 virtual bool WasNpnNegotiated() const OVERRIDE; 82 virtual bool WasNpnNegotiated() const OVERRIDE;
82 virtual NextProto GetNegotiatedProtocol() const OVERRIDE; 83 virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
83 84
85 // Formats a unique key for the SSL session cache. This method
86 // is necessary so that all classes create cache keys in a consistent
87 // manner.
88 // TODO(mshelley) This method will be deleted soon.
Ryan Sleevi 2014/07/18 22:01:17 Avoid words like soon in comments. Better to menti
mshelley 2014/07/21 23:00:08 Done.
89 static std::string GetSessionCacheKey(
90 const HostPortPair& host_and_port,
91 const std::string& ssl_session_cache_shard);
92
93 // Returns true if there is a cache entry in the SSL session cache
94 // for the cache key of the SSL socket.
95 //
96 // The cache key consists of a host and port concatenated with a session
97 // cache shard. These two strings are passed to the constructor of most
98 // subclasses of SSLClientSocket.
99 virtual bool InSessionCache() const = 0;
100
101 // Tells the session cache to monitor this socket's session and runs
102 // |callback| upon the session being made available for resumption.
103 virtual void SetHandshakeSuccessCallback(const base::Closure& callback) = 0;
104
105 // Sets the callback to be used if the socket's SSL handshake should fail.
106 virtual void SetHandshakeFailureCallback(const base::Closure& callback) = 0;
107
84 // Gets the SSL CertificateRequest info of the socket after Connect failed 108 // Gets the SSL CertificateRequest info of the socket after Connect failed
85 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED. 109 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
86 virtual void GetSSLCertRequestInfo( 110 virtual void GetSSLCertRequestInfo(
87 SSLCertRequestInfo* cert_request_info) = 0; 111 SSLCertRequestInfo* cert_request_info) = 0;
88 112
89 // Get the application level protocol that we negotiated with the server. 113 // Get the application level protocol that we negotiated with the server.
90 // *proto is set to the resulting protocol (n.b. that the string may have 114 // *proto is set to the resulting protocol (n.b. that the string may have
91 // embedded NULs). 115 // embedded NULs).
92 // kNextProtoUnsupported: *proto is cleared. 116 // kNextProtoUnsupported: *proto is cleared.
93 // kNextProtoNegotiated: *proto is set to the negotiated protocol. 117 // kNextProtoNegotiated: *proto is set to the negotiated protocol.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 bool channel_id_sent_; 207 bool channel_id_sent_;
184 // True if SCTs were received via a TLS extension. 208 // True if SCTs were received via a TLS extension.
185 bool signed_cert_timestamps_received_; 209 bool signed_cert_timestamps_received_;
186 // True if a stapled OCSP response was received. 210 // True if a stapled OCSP response was received.
187 bool stapled_ocsp_response_received_; 211 bool stapled_ocsp_response_received_;
188 }; 212 };
189 213
190 } // namespace net 214 } // namespace net
191 215
192 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 216 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698