Chromium Code Reviews| Index: net/socket/ssl_server_socket_nss.h |
| diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h |
| index ba5564958faf355ddf7b2691eb105c5e1e2fb64e..2605abb0c8712f7043251fd2354ceb85c36a6904 100644 |
| --- a/net/socket/ssl_server_socket_nss.h |
| +++ b/net/socket/ssl_server_socket_nss.h |
| @@ -30,13 +30,18 @@ class SSLServerSocketNSS : public SSLServerSocket { |
| 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 t
Ryan Hamilton
2012/07/30 21:37:58
Done. FWIW, the order of declaration vs definitio
|
| // Socket interface (via StreamSocket). |
| virtual int Read(IOBuffer* buf, int buf_len, |