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

Unified Diff: net/socket/ssl_client_socket_openssl.h

Issue 416683002: This CL corrects a bug in which the OnHandshakeComplete callback for an ssl session was never called (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@r2
Patch Set: Changed the names of several confusingly named methods. 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 ac65710bd1e683c023994fd7aebb914b1605ae50..3d2194b304af4094cd88e483d70159a72940085a 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -106,6 +106,10 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
friend class SSLClientSocket;
friend class SSLContext;
+ // Callback that is run by OpenSSL to obtain information about the
wtc 2014/08/07 20:04:04 obtain => "report" or "provide" Alternatively, sa
+ // state of the SSL handshake.
+ static void InfoCallback(const SSL* ssl, int result, int unused);
wtc 2014/08/07 20:04:04 The second parameter should be named "type". The t
+
int Init();
void DoReadCallback(int result);
void DoWriteCallback(int result);
@@ -168,6 +172,8 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
const char *argp, int argi, long argl,
long retvalue);
+ void CheckIfHandshakeFinished();
+
bool transport_send_busy_;
bool transport_recv_busy_;
@@ -268,6 +274,11 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
std::string channel_id_cert_;
// True if channel ID extension was negotiated.
bool channel_id_xtn_negotiated_;
+ // True if InfoCallback has been run with result = SSL_CB_HANDSHAKE_DONE.
+ bool ran_handshake_finished_callback_;
wtc 2014/08/07 20:04:04 Nit: this data member name is a little confusing b
+ // True if MarkSSLSessionAsGood has been called for this socket's
+ // connection's SSL session.
wtc 2014/08/07 20:04:04 Nit: shorten "this socket's connection's SSL sessi
+ bool marked_session_as_good_;
// The request handle for |channel_id_service_|.
ChannelIDService::RequestHandle channel_id_request_handle_;
BoundNetLog net_log_;

Powered by Google App Engine
This is Rietveld 408576698