| Index: net/socket/ssl_server_socket.h
|
| diff --git a/net/socket/ssl_server_socket.h b/net/socket/ssl_server_socket.h
|
| index 8e0ad606ecb75f3720aee2eba3361befb29f7542..3a90c7a24c266ebb54c29441c84335a5b2de3260 100644
|
| --- a/net/socket/ssl_server_socket.h
|
| +++ b/net/socket/ssl_server_socket.h
|
| @@ -8,12 +8,9 @@
|
| #include "base/basictypes.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/net_export.h"
|
| +#include "net/socket/ssl_socket.h"
|
| #include "net/socket/stream_socket.h"
|
|
|
| -namespace base {
|
| -class StringPiece;
|
| -} // namespace base
|
| -
|
| namespace crypto {
|
| class RSAPrivateKey;
|
| } // namespace crypto
|
| @@ -23,7 +20,7 @@ namespace net {
|
| struct SSLConfig;
|
| class X509Certificate;
|
|
|
| -class SSLServerSocket : public StreamSocket {
|
| +class SSLServerSocket : public SSLSocket {
|
| public:
|
| virtual ~SSLServerSocket() {}
|
|
|
| @@ -32,14 +29,6 @@ class SSLServerSocket : public StreamSocket {
|
| // completion then the callback will be silently, as for other StreamSocket
|
| // calls.
|
| virtual int Handshake(OldCompletionCallback* callback) = 0;
|
| -
|
| - // Exports data derived from the SSL master-secret (see RFC 5705).
|
| - // The call will fail with an error if the socket is not connected, or the
|
| - // SSL implementation does not support the operation.
|
| - virtual int ExportKeyingMaterial(const base::StringPiece& label,
|
| - const base::StringPiece& context,
|
| - unsigned char *out,
|
| - unsigned int outlen) = 0;
|
| };
|
|
|
| // Creates an SSL server socket over an already-connected transport socket.
|
|
|