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

Unified Diff: net/socket/ssl_server_socket_openssl.cc

Issue 7054010: Update SSLServerSocket to provide the net::StreamSocket interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix missed Connect call to Handshake in unit test. Created 9 years, 6 months 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_server_socket_nss.cc ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_server_socket_openssl.cc
diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc
index 68c26fe4155c04fdada5bef20737686c2ab96950..8dc1b9c03aa967c3c5725a4ec824fbbaeeb9fc52 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -7,53 +7,16 @@
namespace net {
-namespace {
-
-class SSLServerSocketOpenSSL : public SSLServerSocket {
- public:
- virtual ~SSLServerSocketOpenSSL() {}
-
- // SSLServerSocket
- virtual int Accept(CompletionCallback* callback) {
- // TODO(bulach): implement.
- NOTIMPLEMENTED();
- return 0;
- }
-
- // Socket
- virtual int Read(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
- // TODO(bulach): implement.
- NOTIMPLEMENTED();
- return 0;
- }
- virtual int Write(IOBuffer* buf, int buf_len,
- CompletionCallback* callback) {
- // TODO(bulach): implement.
- NOTIMPLEMENTED();
- return 0;
- }
-
- virtual bool SetReceiveBufferSize(int32 size) {
- // TODO(bulach): implement.
- NOTIMPLEMENTED();
- return false;
- }
-
- virtual bool SetSendBufferSize(int32 size) {
- // TODO(bulach): implement.
- NOTIMPLEMENTED();
- return false;
- }
-};
-
-} // namespace
-
-SSLServerSocket* CreateSSLServerSocket(Socket* socket,
+// TODO(bulach): Rather than disable components which call
+// CreateSSLServerSocket when building for OpenSSL rather than NSS, just
+// provide a stub for it for now.
+SSLServerSocket* CreateSSLServerSocket(StreamSocket* socket,
X509Certificate* certificate,
crypto::RSAPrivateKey* key,
const SSLConfig& ssl_config) {
- return new SSLServerSocketOpenSSL();
+ NOTIMPLEMENTED();
+ delete socket;
+ return NULL;
}
} // namespace net
« no previous file with comments | « net/socket/ssl_server_socket_nss.cc ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698