Make OpenSSL UpdateServerCert() OS independent.

net/socket/ssl_client_socket_nss.h

 // Copyright (c) 2012 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_NSS_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
 
 #include <certt.h>
 #include <keyt.h>
 #include <nspr.h>
@@ skipping 62 matching lines @@
   virtual NextProtoStatus GetNextProto(std::string* proto,
                                        std::string* server_protos) OVERRIDE;
 
   // SSLSocket implementation.
   virtual int ExportKeyingMaterial(const base::StringPiece& label,
                                    bool has_context,
                                    const base::StringPiece& context,
                                    unsigned char* out,
                                    unsigned int outlen) OVERRIDE;
   virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE;
+  // For unit testing only.
+  virtual const scoped_refptr<X509Certificate> GetUnverifiedServerCertificate()

[wtc, 2014/03/10 21:45:34]

1. This method is listed under the "SSLSocket implementation" section (see line
76), but it is a method of SSLClientSocket. So it is listed under the wrong
section.

2. More important: should this method be public? The base class SSLClientSocket
declares this method as private.

[Ryan Sleevi, 2014/03/11 00:15:15]

did you mean for this to be "const scoped_refptr<X509Certificate>&" ?

the const does nothing otherwise.

[haavardm, 2014/03/11 18:43:21]

No need for scoped pointer here at all, so I'll use const X509Certificate*
instead to allow returning NULL in the mock implementation.

[haavardm, 2014/03/11 18:43:21]

Done.

+      const OVERRIDE;
 
   // StreamSocket implementation.
   virtual int Connect(const CompletionCallback& callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
   virtual bool IsConnectedAndIdle() const OVERRIDE;
   virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
   virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
   virtual const BoundNetLog& NetLog() const OVERRIDE;
   virtual void SetSubresourceSpeculation() OVERRIDE;
@@ skipping 108 matching lines @@
   // Added the following code Debugging in release mode.
   mutable base::Lock lock_;
   // This is mutable so that CalledOnValidThread can set it.
   // It's guarded by |lock_|.
   mutable base::PlatformThreadId valid_thread_id_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_