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

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: Implemented better memory management and callback handling. 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"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 kNextProtoUnsupported = 0, // The server doesn't support NPN. 74 kNextProtoUnsupported = 0, // The server doesn't support NPN.
75 kNextProtoNegotiated = 1, // We agreed on a protocol. 75 kNextProtoNegotiated = 1, // We agreed on a protocol.
76 kNextProtoNoOverlap = 2, // No protocols in common. We requested 76 kNextProtoNoOverlap = 2, // No protocols in common. We requested
77 // the first protocol in our list. 77 // the first protocol in our list.
78 }; 78 };
79 79
80 // StreamSocket: 80 // StreamSocket:
81 virtual bool WasNpnNegotiated() const OVERRIDE; 81 virtual bool WasNpnNegotiated() const OVERRIDE;
82 virtual NextProto GetNegotiatedProtocol() const OVERRIDE; 82 virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
83 83
84 // Formats a unique key for the SSL session cache. This method
85 // is necessary so that all classes create cache keys in a consistent
86 // manner.
87 static std::string FormatSessionCacheKey(
wtc 2014/07/15 19:27:58 Please add a TODO comment that this method will be
mshelley 2014/07/17 00:28:44 Done.
88 const std::string& host_and_port,
89 const std::string& ssl_session_cache_shard);
90
91 // Returns true if there is a cache entry in the ssl session cache
92 // for the cache key of the SSL socket.
93 //
94 // The cache key consists of a host and port concatenated with a session
95 // cache shard. These two strings are passed to the constructor of most
96 // subclasses
97 // of SSLClientSocket.
wtc 2014/07/15 19:27:58 Move this to the previous line. (Unfortunately "gi
mshelley 2014/07/17 00:28:44 Done.
98 virtual bool InSessionCache() const = 0;
99
100 // Tells the session cache to monitor this socket's session and inform
101 // its SSLConnectJobMessenger upon the session's handshake's completion.
wtc 2014/07/15 19:27:58 upon the session's handshake's completion => upon
mshelley 2014/07/17 00:28:44 Done.
102 virtual void SetHandshakeSuccessCallback(const base::Closure& callback) = 0;
103
104 // Sets the callback to be used if the socket's ssl handshake should fail.
105 virtual void SetHandshakeFailureCallback(const base::Closure& callback) = 0;
106
84 // Gets the SSL CertificateRequest info of the socket after Connect failed 107 // Gets the SSL CertificateRequest info of the socket after Connect failed
85 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED. 108 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
86 virtual void GetSSLCertRequestInfo( 109 virtual void GetSSLCertRequestInfo(
87 SSLCertRequestInfo* cert_request_info) = 0; 110 SSLCertRequestInfo* cert_request_info) = 0;
88 111
89 // Get the application level protocol that we negotiated with the server. 112 // 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 113 // *proto is set to the resulting protocol (n.b. that the string may have
91 // embedded NULs). 114 // embedded NULs).
92 // kNextProtoUnsupported: *proto is cleared. 115 // kNextProtoUnsupported: *proto is cleared.
93 // kNextProtoNegotiated: *proto is set to the negotiated protocol. 116 // 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_; 206 bool channel_id_sent_;
184 // True if SCTs were received via a TLS extension. 207 // True if SCTs were received via a TLS extension.
185 bool signed_cert_timestamps_received_; 208 bool signed_cert_timestamps_received_;
186 // True if a stapled OCSP response was received. 209 // True if a stapled OCSP response was received.
187 bool stapled_ocsp_response_received_; 210 bool stapled_ocsp_response_received_;
188 }; 211 };
189 212
190 } // namespace net 213 } // namespace net
191 214
192 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 215 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698