Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(650)

Unified Diff: net/socket/ssl_server_socket.h

Issue 8515026: Add SSLSocket interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket.h ('k') | net/socket/ssl_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « net/socket/ssl_client_socket.h ('k') | net/socket/ssl_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698