Include better OpenSSL error information in NetLog.

net/socket/ssl_server_socket_openssl.cc

Index: net/socket/ssl_server_socket_openssl.cc
diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc
index 528335dc8ba0022c5dcbaf98d9360c146dd52262..e1bf948c0618d4a35112cf65040e5bb92d3f09e8 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -13,7 +13,6 @@
 #include "crypto/rsa_private_key.h"
 #include "crypto/scoped_openssl_types.h"
 #include "net/base/net_errors.h"
-#include "net/socket/ssl_error_params.h"
 #include "net/ssl/openssl_ssl_util.h"
 
 #define GotoState(s) next_handshake_state_ = s
@@ -457,10 +456,15 @@ int SSLServerSocketOpenSSL::DoPayloadRead() {
   if (rv >= 0)
     return rv;
   int ssl_error = SSL_get_error(ssl_, rv);
-  int net_error = MapOpenSSLError(ssl_error, err_tracer);
+  uint32_t error_code;
+  const char* file;
+  int line;
+  int net_error = MapOpenSSLErrorWithDetails(
+      ssl_error, err_tracer, &error_code, &file, &line);
   if (net_error != ERR_IO_PENDING) {
     net_log_.AddEvent(NetLog::TYPE_SSL_READ_ERROR,
-                      CreateNetLogSSLErrorCallback(net_error, ssl_error));
+                      CreateNetLogOpenSSLErrorCallback(
+                          net_error, ssl_error, error_code, file, line));
   }
   return net_error;
 }
@@ -472,10 +476,15 @@ int SSLServerSocketOpenSSL::DoPayloadWrite() {
   if (rv >= 0)
     return rv;
   int ssl_error = SSL_get_error(ssl_, rv);
-  int net_error = MapOpenSSLError(ssl_error, err_tracer);
+  uint32_t error_code;
+  const char* file;
+  int line;
+  int net_error = MapOpenSSLErrorWithDetails(
+      ssl_error, err_tracer, &error_code, &file, &line);
   if (net_error != ERR_IO_PENDING) {
     net_log_.AddEvent(NetLog::TYPE_SSL_WRITE_ERROR,
-                      CreateNetLogSSLErrorCallback(net_error, ssl_error));
+                      CreateNetLogOpenSSLErrorCallback(
+                          net_error, ssl_error, error_code, file, line));
   }
   return net_error;
 }
@@ -554,7 +563,11 @@ int SSLServerSocketOpenSSL::DoHandshake() {
     completed_handshake_ = true;
   } else {
     int ssl_error = SSL_get_error(ssl_, rv);
-    net_error = MapOpenSSLError(ssl_error, err_tracer);
+    uint32_t error_code;
+    const char* file;
+    int line;
+    net_error = MapOpenSSLErrorWithDetails(
+        ssl_error, err_tracer, &error_code, &file, &line);
 
     // If not done, stay in this state
     if (net_error == ERR_IO_PENDING) {
@@ -564,7 +577,8 @@ int SSLServerSocketOpenSSL::DoHandshake() {
                  << ", SSL error code " << ssl_error
                  << ", net_error " << net_error;
       net_log_.AddEvent(NetLog::TYPE_SSL_HANDSHAKE_ERROR,
-                        CreateNetLogSSLErrorCallback(net_error, ssl_error));
+                        CreateNetLogOpenSSLErrorCallback(
+                            net_error, ssl_error, error_code, file, line));
     }
   }
   return net_error;