diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 03:55:45 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 03:55:45 +0000 |
| commit | c6ff35ee812497a94f9fdd6a1d46e0a5028f69c5 (patch) | |
| tree | 19d2afbc2a9abab613bf84da8d418db96ff2dfec /net/socket/ssl_client_socket_mac.h | |
| parent | 9c619e4daf10b27b6c561c3f09512e7237175eb6 (diff) | |
| download | chromium_src-c6ff35ee812497a94f9fdd6a1d46e0a5028f69c5.zip chromium_src-c6ff35ee812497a94f9fdd6a1d46e0a5028f69c5.tar.gz chromium_src-c6ff35ee812497a94f9fdd6a1d46e0a5028f69c5.tar.bz2 | |
Fix and re-enable SSL renegotiation when using system SSL on OS X 10.5.x. System SSL is only used when --use-system-ssl is specified as a command-line flag.
BUG=66931
TEST=none
Review URL: http://codereview.chromium.org/6080005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71291 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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_mac.h b/net/socket/ssl_client_socket_mac.h index a94b2bd..a3c68d6 100644 --- a/net/socket/ssl_client_socket_mac.h +++ b/net/socket/ssl_client_socket_mac.h @@ -149,6 +149,10 @@ class SSLClientSocketMac : public SSLClientSocket { bool client_cert_requested_; SSLContextRef ssl_context_; + // During a renegotiation, the amount of application data read following + // the handshake's completion. + size_t bytes_read_after_renegotiation_; + // These buffers hold data retrieved from/sent to the underlying transport // before it's fed to the SSL engine. std::vector<char> send_buffer_; |