| Index: net/socket/ssl_client_socket_openssl.h
|
| diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
|
| index d113f8267a6b6903aa6cdd235d4e6ec3957e464c..95947f7944c07a312b6429157fbffa7f254f132c 100644
|
| --- a/net/socket/ssl_client_socket_openssl.h
|
| +++ b/net/socket/ssl_client_socket_openssl.h
|
| @@ -54,14 +54,19 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen,
|
| const unsigned char* in, unsigned int inlen);
|
|
|
| - // SSLClientSocket implementation.
|
| - virtual void GetSSLCertRequestInfo(
|
| - SSLCertRequestInfo* cert_request_info) 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(unsigned char* out,
|
| + unsigned int *outlen,
|
| + unsigned int outlen_max) OVERRIDE;
|
| +
|
| + // SSLClientSocket implementation.
|
| + virtual void GetSSLCertRequestInfo(
|
| + SSLCertRequestInfo* cert_request_info) OVERRIDE;
|
| virtual NextProtoStatus GetNextProto(std::string* proto,
|
| std::string* server_protos) OVERRIDE;
|
| virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
|
|
|