Change the bad-certificate handler for SSL (using NSS) to return an...

net/base/ssl_client_socket_win.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/ssl_client_socket_win.h"
 
 #include <schnlsp.h>
 
 #include "base/lock.h"
 #include "base/singleton.h"
@@ skipping 262 matching lines @@
     return ERR_NO_SSL_VERSIONS_ENABLED;
   creds_ = GetCredHandle(ssl_version_mask);
 
   next_state_ = STATE_CONNECT;
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)
     user_callback_ = callback;
   return rv;
 }
 
-int SSLClientSocketWin::ReconnectIgnoringLastError(
-    CompletionCallback* callback) {
-  // TODO(darin): implement me!
-  return ERR_FAILED;
-}
-
 void SSLClientSocketWin::Disconnect() {
   // TODO(wtc): Send SSL close_notify alert.
   completed_handshake_ = false;
   transport_->Disconnect();
 
   if (send_buffer_.pvBuffer)
     FreeSendBuffer();
   if (ctxt_.dwLower || ctxt_.dwUpper) {
     DeleteSecurityContext(&ctxt_);
     memset(&ctxt_, 0, sizeof(ctxt_));
@@ skipping 144 matching lines @@
         rv = ERR_UNEXPECTED;
         NOTREACHED() << "unexpected state";
         break;
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
   return rv;
 }
 
 int SSLClientSocketWin::DoConnect() {
   next_state_ = STATE_CONNECT_COMPLETE;
-  return transport_->Connect(&io_callback_);
+
+  // The caller has to make sure that the transport socket is connected. If
+  // it isn't, we will eventually fail when trying to negotiate an SSL session.
+  // But we cannot call transport_->Connect(), as we do not know if there is
+  // any proxy negotiation that needs to be performed prior to establishing
+  // the SSL session.
+  return OK;
 }
 
 int SSLClientSocketWin::DoConnectComplete(int result) {
   if (result < 0)
     return result;
 
   memset(&ctxt_, 0, sizeof(ctxt_));
 
   SecBufferDesc buffer_desc;
   DWORD out_flags;
@@ skipping 510 matching lines @@
   }
 }
 
 void SSLClientSocketWin::FreeSendBuffer() {
   SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer);
   DCHECK(status == SEC_E_OK);
   memset(&send_buffer_, 0, sizeof(send_buffer_));
 }
 
 }  // namespace net