Split DoHandshake into DoHandshake and DoHandshakeComplete.

The rv == 1 case was getting a little unwieldy. This should hopefully be
simpler. DoHandshake converts the error to a net error code and decides which
state to transition to. DoHandshakeComplete handles the result of the
handshake.

BUG=none

Review URL: https://codereview.chromium.org/1126113004

Cr-Commit-Position: refs/heads/master@{#329518}

net/socket/ssl_client_socket_openssl.cc

@@ -892,7 +892,6 @@ base::LazyInstance<base::ThreadLocalBoolean>::Leaky g_first_run_completed =
 
 int SSLClientSocketOpenSSL::DoHandshake() {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
-  int net_error = OK;
 
   int rv;
 
@@ -914,7 +913,43 @@ int SSLClientSocketOpenSSL::DoHandshake() {
     }
   }
 
-  if (rv == 1) {
+  int net_error = OK;
+  if (rv <= 0) {
+    int ssl_error = SSL_get_error(ssl_, rv);
+    if (ssl_error == SSL_ERROR_WANT_CHANNEL_ID_LOOKUP) {
+      // The server supports channel ID. Stop to look one up before returning to
+      // the handshake.
+      GotoState(STATE_CHANNEL_ID_LOOKUP);
+      return OK;
+    }
+    if (ssl_error == SSL_ERROR_WANT_X509_LOOKUP &&
+        !ssl_config_.send_client_cert) {
+      return ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
+    }
+
+    OpenSSLErrorInfo error_info;
+    net_error = MapOpenSSLErrorWithDetails(ssl_error, err_tracer, &error_info);
+    if (net_error == ERR_IO_PENDING) {
+      // If not done, stay in this state
+      GotoState(STATE_HANDSHAKE);
+      return ERR_IO_PENDING;
+    }
+
+    LOG(ERROR) << "handshake failed; returned " << rv << ", SSL error code "
+               << ssl_error << ", net_error " << net_error;
+    net_log_.AddEvent(
+        NetLog::TYPE_SSL_HANDSHAKE_ERROR,
+        CreateNetLogOpenSSLErrorCallback(net_error, ssl_error, error_info));
+  }
+
+  GotoState(STATE_HANDSHAKE_COMPLETE);
+  return net_error;
+}
+
+int SSLClientSocketOpenSSL::DoHandshakeComplete(int result) {
+  if (result < 0)
+    return result;
+
   if (ssl_config_.version_fallback &&
       ssl_config_.version_max < ssl_config_.version_fallback_min) {
     return ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION;
@@ -959,35 +994,7 @@ int SSLClientSocketOpenSSL::DoHandshake() {
   // Verify the certificate.
   UpdateServerCert();
   GotoState(STATE_VERIFY_CERT);
-  } else {
-    int ssl_error = SSL_get_error(ssl_, rv);
-    if (ssl_error == SSL_ERROR_WANT_CHANNEL_ID_LOOKUP) {
-      // The server supports channel ID. Stop to look one up before returning to
-      // the handshake.
-      GotoState(STATE_CHANNEL_ID_LOOKUP);
   return OK;
-    }
-    if (ssl_error == SSL_ERROR_WANT_X509_LOOKUP &&
-        !ssl_config_.send_client_cert) {
-      return ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
-    }
-
-    OpenSSLErrorInfo error_info;
-    net_error = MapOpenSSLErrorWithDetails(ssl_error, err_tracer, &error_info);
-
-    // If not done, stay in this state
-    if (net_error == ERR_IO_PENDING) {
-      GotoState(STATE_HANDSHAKE);
-    } else {
-      LOG(ERROR) << "handshake failed; returned " << rv
-                 << ", SSL error code " << ssl_error
-                 << ", net_error " << net_error;
-      net_log_.AddEvent(
-          NetLog::TYPE_SSL_HANDSHAKE_ERROR,
-          CreateNetLogOpenSSLErrorCallback(net_error, ssl_error, error_info));
-    }
-  }
-  return net_error;
 }
 
 int SSLClientSocketOpenSSL::DoChannelIDLookup() {
@@ -1298,6 +1305,9 @@ int SSLClientSocketOpenSSL::DoHandshakeLoop(int last_io_result) {
       case STATE_HANDSHAKE:
         rv = DoHandshake();
         break;
+      case STATE_HANDSHAKE_COMPLETE:
+        rv = DoHandshakeComplete(rv);
+        break;
       case STATE_CHANNEL_ID_LOOKUP:
         DCHECK_EQ(OK, rv);
         rv = DoChannelIDLookup();

net/socket/ssl_client_socket_openssl.h

@@ -113,6 +113,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
 
   bool DoTransportIO();
   int DoHandshake();
+  int DoHandshakeComplete(int result);
   int DoChannelIDLookup();
   int DoChannelIDLookupComplete(int result);
   int DoVerifyCert(int result);
@@ -279,6 +280,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   enum State {
     STATE_NONE,
     STATE_HANDSHAKE,
+    STATE_HANDSHAKE_COMPLETE,
     STATE_CHANNEL_ID_LOOKUP,
     STATE_CHANNEL_ID_LOOKUP_COMPLETE,
     STATE_VERIFY_CERT,