diff options
| author | byungchul@chromium.org <byungchul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:02:08 +0000 |
|---|---|---|
| committer | byungchul@chromium.org <byungchul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:02:08 +0000 |
| commit | c8a80e99796678a7dca2c23111e03a593b9a7655 (patch) | |
| tree | b57b15486e0796196d502b42184c92a1defd212e /net/socket/ssl_server_socket_unittest.cc | |
| parent | 7ef5378569d945939649e1c4aede54eb39aaacda (diff) | |
| download | chromium_src-c8a80e99796678a7dca2c23111e03a593b9a7655.zip chromium_src-c8a80e99796678a7dca2c23111e03a593b9a7655.tar.gz chromium_src-c8a80e99796678a7dca2c23111e03a593b9a7655.tar.bz2 | |
Implement SSL server socket over OpenSSL.
1) Mixed ssl_server_socket_nss.cc and ssl_client_socket_openssl.cc.
2) Moved common functions into openssl_util.cc.
3) Enabled SslServerSocketTest when USE_OPENSSL is defined.
BUG=
Review URL: https://codereview.chromium.org/274783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_server_socket_unittest.cc')
| -rw-r--r-- | net/socket/ssl_server_socket_unittest.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index 92d2efc..d2863ff 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -361,9 +361,6 @@ class SSLServerSocketTest : public PlatformTest { scoped_ptr<net::TransportSecurityState> transport_security_state_; }; -// SSLServerSocket is only implemented using NSS. -#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX) - // This test only executes creation of client and server sockets. This is to // test that creation of sockets doesn't crash and have minimal code to run // under valgrind in order to help debugging memory problems. @@ -580,6 +577,5 @@ TEST_F(SSLServerSocketTest, ExportKeyingMaterial) { ASSERT_EQ(rv, net::OK); EXPECT_NE(0, memcmp(server_out, client_bad, sizeof(server_out))); } -#endif } // namespace net |