diff options
| author | hawk@chromium.org <hawk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 23:05:48 +0000 |
|---|---|---|
| committer | hawk@chromium.org <hawk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 23:05:48 +0000 |
| commit | 13f5578f84833b2dda9d2539b234d13e0712893d (patch) | |
| tree | bbd4356bd68e6693583d6415ca5439255fbf3dc5 /net/socket/ssl_client_socket_mac.h | |
| parent | aee6bbf90e2fb86525ef26134263699acc19152b (diff) | |
| download | chromium_src-13f5578f84833b2dda9d2539b234d13e0712893d.zip chromium_src-13f5578f84833b2dda9d2539b234d13e0712893d.tar.gz chromium_src-13f5578f84833b2dda9d2539b234d13e0712893d.tar.bz2 | |
Enable SSL session resumption for Mac OS X.
BUG=19049
TEST=https sites perform identically under Mac OS X <= 10.5.6 and Mac OS X >= 10.5.7 (in particular, https://test-ssev.verisign.com/ and the three pages linked from there)
Review URL: http://codereview.chromium.org/177014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_mac.h')
| -rw-r--r-- | net/socket/ssl_client_socket_mac.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_mac.h b/net/socket/ssl_client_socket_mac.h index a447055..0c24e7a 100644 --- a/net/socket/ssl_client_socket_mac.h +++ b/net/socket/ssl_client_socket_mac.h @@ -53,9 +53,10 @@ class SSLClientSocketMac : public SSLClientSocket { int DoLoop(int last_io_result); int DoPayloadRead(); int DoPayloadWrite(); - int DoHandshake(); + int DoHandshakeStart(); int DoVerifyCert(); int DoVerifyCertComplete(int result); + int DoHandshakeFinish(); int DoReadComplete(int result); void OnWriteComplete(int result); @@ -83,9 +84,10 @@ class SSLClientSocketMac : public SSLClientSocket { STATE_NONE, STATE_PAYLOAD_READ, STATE_PAYLOAD_WRITE, - STATE_HANDSHAKE, + STATE_HANDSHAKE_START, STATE_VERIFY_CERT, STATE_VERIFY_CERT_COMPLETE, + STATE_HANDSHAKE_FINISH, STATE_READ_COMPLETE, }; State next_state_; @@ -97,6 +99,7 @@ class SSLClientSocketMac : public SSLClientSocket { CertVerifyResult server_cert_verify_result_; bool completed_handshake_; + bool handshake_interrupted_; SSLContextRef ssl_context_; // These are buffers for holding data during I/O. The "slop" is the amount of |