Add a new GetTlsUniqueChannelBinding method to SSLSocket, and implement nss version.

net/socket/ssl_server_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_SERVER_SOCKET_NSS_H_
 #define NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
 
 #include <certt.h>
 #include <keyt.h>
 #include <nspr.h>
@@ skipping 12 matching lines @@
 class SSLServerSocketNSS : public SSLServerSocket {
  public:
   // See comments on CreateSSLServerSocket for details of how these
   // parameters are used.
   SSLServerSocketNSS(StreamSocket* socket,
                      scoped_refptr<X509Certificate> certificate,
                      crypto::RSAPrivateKey* key,
                      const SSLConfig& ssl_config);
   virtual ~SSLServerSocketNSS();
 
-  // SSLServerSocket interface.
-  virtual int Handshake(const CompletionCallback& callback) OVERRIDE;
+  // SSLSocket interface.
   virtual int ExportKeyingMaterial(const base::StringPiece& label,
                                    bool has_context,
                                    const base::StringPiece& context,
                                    unsigned char* out,
                                    unsigned int outlen) OVERRIDE;
+  virtual int GetTlsUniqueChannelBinding(unsigned char* out,
+                                         unsigned int *outlen,
+                                         unsigned int outlen_max) OVERRIDE;
+
+  // SSLServerSocket interface.
+  virtual int Handshake(const CompletionCallback& callback) OVERRIDE;

[wtc, 2012/07/30 20:05:08]

Nit: to conform to the style guide's requirement that method
declaration and definition orders match each other, I
suggest you list
  // SSLServerSocket interface.
  virtual int Handshake(const ...
first, and then
  // SSLSocket interface.
  virtual int ExportKeyingMaterial(...
  ...
  virtual int ExportKeyingMaterial(...
  ...

Please make the same change to the other headers.

[Ryan Hamilton, 2012/07/30 21:37:58]

Done.  FWIW, the order of declaration vs definition is not in agreement for
other methods in these classes, but that can wait for another day.

 
   // Socket interface (via StreamSocket).
   virtual int Read(IOBuffer* buf, int buf_len,
                    const CompletionCallback& callback) OVERRIDE;
   virtual int Write(IOBuffer* buf, int buf_len,
                     const CompletionCallback& callback) OVERRIDE;
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
 
   // StreamSocket implementation.
@@ skipping 90 matching lines @@
 
   State next_handshake_state_;
   bool completed_handshake_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLServerSocketNSS);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_