diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 18:17:06 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 18:17:06 +0000 |
| commit | 109805a973b58a72d2ba06b22d2cd9a04abc6bcc (patch) | |
| tree | ba8b87a388074f2b370ff6bbed7a380df2e2984d /net/socket/ssl_client_socket_unittest.cc | |
| parent | fb5c31f01cb8013d2074f42907036e70d79876f0 (diff) | |
| download | chromium_src-109805a973b58a72d2ba06b22d2cd9a04abc6bcc.zip chromium_src-109805a973b58a72d2ba06b22d2cd9a04abc6bcc.tar.gz chromium_src-109805a973b58a72d2ba06b22d2cd9a04abc6bcc.tar.bz2 | |
Implements disabled cipher support for OpenSSL. (ssl_config_.disabled_cipher_suites)
Also adds a more complete error code mapping table.
BUG=None
TEST=SSLClientSocketTest.CipherSuiteDisables
Review URL: http://codereview.chromium.org/5592003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_unittest.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index a95585c..0410a06 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -525,16 +525,9 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) { EXPECT_EQ(net::ERR_SSL_PROTOCOL_ERROR, rv); } -#if defined(USE_OPENSSL) -// TODO(rsleevi): Not implemented for Schannel or OpenSSL. Schannel is -// controlled by the SSL client socket factory, rather than a define, so it -// cannot be conditionally disabled here. As Schannel is only used when +// TODO(rsleevi): Not implemented for Schannel. As Schannel is only used when // performing client authentication, it will not be tested here. -#define MAYBE_CipherSuiteDisables DISABLED_CipherSuiteDisables -#else -#define MAYBE_CipherSuiteDisables CipherSuiteDisables -#endif -TEST_F(SSLClientSocketTest, MAYBE_CipherSuiteDisables) { +TEST_F(SSLClientSocketTest, CipherSuiteDisables) { // Rather than exhaustively disabling every RC4 ciphersuite defined at // http://www.iana.org/assignments/tls-parameters/tls-parameters.xml, // only disabling those cipher suites that the test server actually |