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

Unified Diff: net/socket/ssl_client_socket_openssl.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 typo & removed CapturingNetLog arg. Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket_openssl.h
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index d20d5ee5284ccf9383909ac194038781c1e3b966..ac65710bd1e683c023994fd7aebb914b1605ae50 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -57,6 +57,9 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
}
// SSLClientSocket implementation.
+ virtual bool InSessionCache() const OVERRIDE;
+ virtual void SetHandshakeCompletionCallback(
+ const base::Closure& callback) OVERRIDE;
virtual void GetSSLCertRequestInfo(
SSLCertRequestInfo* cert_request_info) OVERRIDE;
virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
@@ -107,6 +110,10 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
void DoReadCallback(int result);
void DoWriteCallback(int result);
+ // Compute a unique key string for the SSL session cache.
+ std::string GetSessionCacheKey() const;
+ void OnHandshakeCompletion();
+
bool DoTransportIO();
int DoHandshake();
int DoChannelIDLookup();
@@ -224,6 +231,12 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
// The service for retrieving Channel ID keys. May be NULL.
ChannelIDService* channel_id_service_;
+ // Callback that is invoked when the connection finishes.
+ //
+ // Note: this callback will be run in Disconnect(). It will not alter
+ // any member variables of the SSLClientSocketOpenSSL.
+ base::Closure handshake_completion_callback_;
+
// OpenSSL stuff
SSL* ssl_;
BIO* transport_bio_;

Powered by Google App Engine
This is Rietveld 408576698