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

Unified Diff: net/socket/ssl_client_socket_nss.h

Issue 344026: Add LoadLog to ClientSocket::Connect(). (Closed)
Patch Set: Minor build fixups and fixed mac bug. Created 11 years, 1 month 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
« no previous file with comments | « net/socket/ssl_client_socket_mac.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.h
diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index 5fd04c6de4faee10d5f9126493ee624177835dc3..6e871b52e7e74f17cfacc38508c981920448b349 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_;
};
« no previous file with comments | « net/socket/ssl_client_socket_mac.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698