summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 22:36:31 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 22:36:31 +0000
commitd7a47fff65c763a5485189c16aab2e8ed52bc03c (patch)
treefe64b8ee3f483f44edf27c16b778f34f95ada31f /net/socket
parent4fd6b78df62d4f470fa4e131d0450cd1b0f19e85 (diff)
downloadchromium_src-d7a47fff65c763a5485189c16aab2e8ed52bc03c.zip
chromium_src-d7a47fff65c763a5485189c16aab2e8ed52bc03c.tar.gz
chromium_src-d7a47fff65c763a5485189c16aab2e8ed52bc03c.tar.bz2
Enable SSL 2.0 cipher suites. Although SSL 2.0 is disabled by default,
the SSL 2.0 cipher suites must be available if SSL 2.0 is enabled. R=mark BUG=30682 TEST=none Review URL: http://codereview.chromium.org/552014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_mac.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index feed3b5..37aec4d 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -327,7 +327,6 @@ int KeySizeOfCipherSuite(SSLCipherSuite suite) {
// Whitelist the cipher suites we want to enable. We disable the following
// cipher suites.
-// - SSL 2.0 cipher suites.
// - Null encryption cipher suites.
// - Weak cipher suites: < 80 bits of security strength.
// - FORTEZZA cipher suites (obsolete).
@@ -341,6 +340,9 @@ int KeySizeOfCipherSuite(SSLCipherSuite suite) {
// won't support any new cipher suites in that release.
bool ShouldEnableCipherSuite(SSLCipherSuite suite) {
switch (suite) {
+ case SSL_RSA_WITH_3DES_EDE_CBC_MD5:
+ case SSL_RSA_WITH_RC2_CBC_MD5:
+
case SSL_RSA_WITH_3DES_EDE_CBC_SHA:
case SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA: // **
case SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA: // **