Always log the SSL server certificate received and being verified.

Now that there is no passive NetLog interface, the overhead for always-logging is expected to be minimal.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/9432018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122987 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 16 deletions

diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index 12e3f2e..aa62b96 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -1284,11 +1284,9 @@ int SSLClientSocketMac::DidCompleteHandshake() {
       GetServerCert(ssl_context_));
   if (!new_server_cert)
     return ERR_UNEXPECTED;
-  if (net_log_.IsLoggingBytes()) {
-    net_log_.AddEvent(
-        NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
-        make_scoped_refptr(new X509CertificateNetLogParam(new_server_cert)));
-  }
+  net_log_.AddEvent(
+      NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
+      make_scoped_refptr(new X509CertificateNetLogParam(new_server_cert)));
 
   if (renegotiating_ &&
       X509Certificate::IsSameOSCert(server_cert_->os_cert_handle(),
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 5175392..f3b8fa9 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1073,7 +1073,7 @@ void SSLClientSocketNSS::UpdateServerCert() {
       // case CreateFromDERCertChain() returns NULL.
       server_cert_ = X509Certificate::CreateFromDERCertChain(
           certs.AsStringPieceVector());
-      if (server_cert_ && net_log_.IsLoggingBytes()) {
+      if (server_cert_) {
         net_log_.AddEvent(
             NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
             make_scoped_refptr(new X509CertificateNetLogParam(server_cert_)));
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 716b094..5039487 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -791,11 +791,9 @@ int SSLClientSocketOpenSSL::DoHandshake() {
     // SSL handshake is completed.  Let's verify the certificate.
     const bool got_cert = !!UpdateServerCert();
     DCHECK(got_cert);
-    if (net_log_.IsLoggingBytes()) {
-      net_log_.AddEvent(
-          NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
-          make_scoped_refptr(new X509CertificateNetLogParam(server_cert_)));
-    }
+    net_log_.AddEvent(
+        NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
+        make_scoped_refptr(new X509CertificateNetLogParam(server_cert_)));
     GotoState(STATE_VERIFY_CERT);
   } else {
     int ssl_error = SSL_get_error(ssl_, rv);
diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc
index 7434305..3f3511f 100644
--- a/net/socket/ssl_client_socket_win.cc
+++ b/net/socket/ssl_client_socket_win.cc
@@ -1529,11 +1529,9 @@ int SSLClientSocketWin::DidCompleteHandshake() {
   scoped_refptr<X509Certificate> new_server_cert(
       X509Certificate::CreateFromHandle(server_cert_handle,
                                         X509Certificate::OSCertHandles()));
-  if (net_log_.IsLoggingBytes()) {
-    net_log_.AddEvent(
-        NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
-        make_scoped_refptr(new X509CertificateNetLogParam(new_server_cert)));
-  }
+  net_log_.AddEvent(
+      NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
+      make_scoped_refptr(new X509CertificateNetLogParam(new_server_cert)));
   if (renegotiating_ &&
       X509Certificate::IsSameOSCert(server_cert_->os_cert_handle(),
                                     server_cert_handle)) {