Fixes the remaining net_unittests for OpenSSL, with the exceptions

net/socket/ssl_client_socket_openssl.h

 // Copyright (c) 2010 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ssl_config_service.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/client_socket_handle.h"
 
 typedef struct bio_st BIO;
+typedef struct evp_pkey_st EVP_PKEY;
 typedef struct ssl_st SSL;
+typedef struct x509_st X509;
 
 namespace net {
 
 class CertVerifier;
 class SSLCertRequestInfo;
 class SSLConfig;
 class SSLInfo;
 
 // An SSL client socket implemented with OpenSSL.
 class SSLClientSocketOpenSSL : public SSLClientSocket {
  public:
   // Takes ownership of the transport_socket, which may already be connected.
   // The given hostname will be compared with the name(s) in the server's
   // certificate during the SSL handshake.  ssl_config specifies the SSL
   // settings.
   SSLClientSocketOpenSSL(ClientSocketHandle* transport_socket,
                          const HostPortPair& host_and_port,
                          const SSLConfig& ssl_config);
   ~SSLClientSocketOpenSSL();
 
   const HostPortPair& host_and_port() const { return host_and_port_; }
 
+  // Callback from the SSL layer that indicates the remote server is requesting
+  // a certificate for this client.
+  int ClientCertRequestCallback(SSL* ssl, X509** x509, EVP_PKEY** pkey);

[wtc, 2010/12/01 22:50:05]

Nit: match the method declaration and definition orders in
.h and .cc files:

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Declaration_Order

[joth, 2010/12/02 17:12:01]

Done as near as I can.
The .cc has slipped quite a way out of order (in fact, never was in order) and
I'm reluctant to do a major re-ordering right now as I know several other people
have got sizable patches pending on this file and I don't want to disrupt them
more than necessary.

[wtc, 2010/12/03 18:56:05]

YES!  This is the right call.  Do not make gratuitous reorderings
merely to comply with this Style Guide recommendation.

I suggested matching declaration and definition orders because
you were adding a new method.  I didn't mean to ask you to fix
the ordering of existing code.

+
   // SSLClientSocket methods:
   virtual void GetSSLInfo(SSLInfo* ssl_info);
   virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
   virtual NextProtoStatus GetNextProto(std::string* proto);
 
   // ClientSocket methods:
   virtual int Connect(CompletionCallback* callback);
   virtual void Disconnect();
   virtual bool IsConnected() const;
   virtual bool IsConnectedAndIdle() const;
@@ skipping 13 matching lines @@
  private:
   bool Init();
   void DoReadCallback(int result);
   void DoWriteCallback(int result);
 
   bool DoTransportIO();
   int DoHandshake();
   int DoVerifyCert(int result);
   int DoVerifyCertComplete(int result);
   void DoConnectCallback(int result);
-  void InvalidateSessionIfBadCertificate();
   X509Certificate* UpdateServerCert();
 
   void OnHandshakeIOComplete(int result);
   void OnSendComplete(int result);
   void OnRecvComplete(int result);
 
   int DoHandshakeLoop(int last_io_result);
   int DoReadLoop(int result);
   int DoWriteLoop(int result);
   int DoPayloadRead();
@@ skipping 56 matching lines @@
     STATE_VERIFY_CERT_COMPLETE,
   };
   State next_handshake_state_;
   BoundNetLog net_log_;
 };
 
 }  // namespace net
 
 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_