summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_client_socket_nss.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 23:25:19 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 23:25:19 +0000
commit5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf (patch)
tree4f39f1f44be3eb179f8368bca0bc18512e398a40 /net/socket/ssl_client_socket_nss.h
parentf852667f469ea8fd31b8a1dd0f0130382efe591f (diff)
downloadchromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.zip
chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.gz
chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.bz2
Add LoadLog to ClientSocket::Connect().
TODO: Use LoadLog in FLIP code. Review URL: http://codereview.chromium.org/344026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.h')
-rw-r--r--net/socket/ssl_client_socket_nss.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index 5fd04c6..6e871b5 100644
--- a/net/socket/ssl_client_socket_nss.h
+++ b/net/socket/ssl_client_socket_nss.h
@@ -27,6 +27,7 @@
namespace net {
class CertVerifier;
+class LoadLog;
class X509Certificate;
// An SSL client socket implemented with Mozilla NSS.
@@ -46,7 +47,7 @@ class SSLClientSocketNSS : public SSLClientSocket {
virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
// ClientSocket methods:
- virtual int Connect(CompletionCallback* callback);
+ virtual int Connect(CompletionCallback* callback, LoadLog* load_log);
virtual void Disconnect();
virtual bool IsConnected() const;
virtual bool IsConnectedAndIdle() const;
@@ -58,6 +59,9 @@ class SSLClientSocketNSS : public SSLClientSocket {
virtual bool SetSendBufferSize(int32 size);
private:
+ // Initializes NSS SSL options. Returns a net error code.
+ int InitializeSSLOptions();
+
void InvalidateSessionIfBadCertificate();
X509Certificate* UpdateServerCert();
void DoReadCallback(int result);
@@ -148,6 +152,8 @@ class SSLClientSocketNSS : public SSLClientSocket {
// Buffers for the network end of the SSL state machine
memio_Private* nss_bufs_;
+ scoped_refptr<LoadLog> load_log_;
+
static bool nss_options_initialized_;
};