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

net/base/ssl_client_socket_mac.cc

 // Copyright (c) 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_mac.h"
 
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
@@ skipping 261 matching lines @@
   DCHECK(next_state_ == STATE_NONE);
   DCHECK(!user_callback_);
 
   next_state_ = STATE_CONNECT;
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)
     user_callback_ = callback;
   return rv;
 }
 
-int SSLClientSocketMac::ReconnectIgnoringLastError(
-    CompletionCallback* callback) {
-  // TODO(darin): implement me!
-  return ERR_FAILED;
-}
-
 void SSLClientSocketMac::Disconnect() {
   completed_handshake_ = false;
 
   if (ssl_context_) {
     SSLClose(ssl_context_);
     SSLDisposeContext(ssl_context_);
     ssl_context_ = NULL;
   }
 
   transport_->Disconnect();
@@ skipping 146 matching lines @@
         rv = ERR_UNEXPECTED;
         NOTREACHED() << "unexpected state";
         break;
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
   return rv;
 }
 
 int SSLClientSocketMac::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 SSLClientSocketMac::DoConnectComplete(int result) {
   if (result < 0)
     return result;
 
   OSStatus status = noErr;
 
   status = SSLNewContext(false, &ssl_context_);
   if (status)
@@ skipping 292 matching lines @@
 
   if (rv < 0 && rv != ERR_IO_PENDING) {
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net