summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:19:09 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:19:09 +0000
commit454c4f1fd981e19aaf6b12b804103846cb5eba9a (patch)
tree252bbf0da935a94d7f602be8a0ca57dcd6482476 /net
parentce8701bbc1a10c16b7dadb96cc78e14d6588a727 (diff)
downloadchromium_src-454c4f1fd981e19aaf6b12b804103846cb5eba9a.zip
chromium_src-454c4f1fd981e19aaf6b12b804103846cb5eba9a.tar.gz
chromium_src-454c4f1fd981e19aaf6b12b804103846cb5eba9a.tar.bz2
Reland 125571 - Turn off TLS_RSA_WITH_RC4_128_MD5.
Although HMAC-MD5 is still considered secure, it is an eyesore to people who audit the use of MD5. Enabling TLS_RSA_WITH_RC4_128_SHA is enough. R=rsleevi@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/9666016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/nss_ssl_util.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc
index f4dc8be..84d185e 100644
--- a/net/socket/nss_ssl_util.cc
+++ b/net/socket/nss_ssl_util.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,6 +8,7 @@
#include <secerr.h>
#include <ssl.h>
#include <sslerr.h>
+#include <sslproto.h>
#include <string>
@@ -47,6 +48,7 @@ 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,
@@ -55,6 +57,7 @@ class NSSSSLInitSingleton {
(info.effectiveKeyBits >= 80));
}
}
+ SSL_CipherPrefSetDefault(SSL_RSA_WITH_RC4_128_MD5, PR_FALSE);
// Enable SSL.
SSL_OptionSetDefault(SSL_SECURITY, PR_TRUE);