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

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: 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 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 5d70c0523fabe0230b2361f7418688f1215fe0df..20200be353184af378e80f3953a0f4a1e8234d12 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -57,6 +57,12 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
}
// SSLClientSocket implementation.
+ virtual bool InSessionCache() const OVERRIDE;
+ virtual void SetHandshakeSuccessCallback(
+ const base::Closure& callback) OVERRIDE;
+ virtual void SetHandshakeFailureCallback(
+ const base::Closure& callback) OVERRIDE;
+
virtual void GetSSLCertRequestInfo(
SSLCertRequestInfo* cert_request_info) OVERRIDE;
virtual NextProtoStatus GetNextProto(std::string* proto,
@@ -108,6 +114,11 @@ 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 OnHandshakeFailure();
+ void OnHandshakeSuccess();
+
bool DoTransportIO();
int DoHandshake();
int DoVerifyCert(int result);
@@ -208,6 +219,12 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
// The service for retrieving Channel ID keys. May be NULL.
ServerBoundCertService* server_bound_cert_service_;
+ // Callback that is invoked when the connection encounters an error.
+ base::Closure error_callback_;
+
+ // Callback that is invoked when the connection is successful.
+ base::Closure success_callback_;
+
// OpenSSL stuff
SSL* ssl_;
BIO* transport_bio_;

Powered by Google App Engine
This is Rietveld 408576698