diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-18 04:00:32 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-18 04:00:32 +0000 |
| commit | 7995214b590ddd4b075a9680f02a41cabc99c26b (patch) | |
| tree | 218b60eeb9188738b645f29e029aa89bf57f698a /net/socket/nss_ssl_util.cc | |
| parent | 2159e039fef6e0b853329380878bec8f0a53b423 (diff) | |
| download | chromium_src-7995214b590ddd4b075a9680f02a41cabc99c26b.zip chromium_src-7995214b590ddd4b075a9680f02a41cabc99c26b.tar.gz chromium_src-7995214b590ddd4b075a9680f02a41cabc99c26b.tar.bz2 | |
Revert 125973 - Turn off TLS_RSA_WITH_RC4_128_MD5.
We received several bug reports of servers that only support
TLS_RSA_WITH_RC4_128_MD5. Since HMAC-MD5 is still considered
secure (see RFC 6151 Section 2.3), this patch reinistates
TLS_RSA_WITH_RC4_128_MD5 support.
Original review URL: http://codereview.chromium.org/9666016
TBR=agl@chromium.org,rsleevi@chromium.org
BUG=118330
TEST=Visit https://missouristate.info/feeds/calendar.aspx.
Should not get the net::ERR_SSL_VERSION_OR_CIPHER_MISMATCH
error.
Review URL: https://chromiumcodereview.appspot.com/9722027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/nss_ssl_util.cc')
| -rw-r--r-- | net/socket/nss_ssl_util.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index 84d185e..fc94004 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -8,7 +8,6 @@ #include <secerr.h> #include <ssl.h> #include <sslerr.h> -#include <sslproto.h> #include <string> @@ -48,7 +47,6 @@ class NSSSSLInitSingleton { #endif // Explicitly enable exactly those ciphers with keys of at least 80 bits - // except TLS_RSA_WITH_RC4_128_MD5. for (int i = 0; i < SSL_NumImplementedCiphers; i++) { SSLCipherSuiteInfo info; if (SSL_GetCipherSuiteInfo(pSSL_ImplementedCiphers[i], &info, @@ -57,7 +55,6 @@ class NSSSSLInitSingleton { (info.effectiveKeyBits >= 80)); } } - SSL_CipherPrefSetDefault(SSL_RSA_WITH_RC4_128_MD5, PR_FALSE); // Enable SSL. SSL_OptionSetDefault(SSL_SECURITY, PR_TRUE); |