aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-12-07 14:23:36 +0100
committerIngela Anderton Andin <[email protected]>2015-12-07 14:23:36 +0100
commit9f1843dcfde8f53be93cfcb303aff36f16a541f0 (patch)
treeb08c58dfc02315ade20531e0eb2123ffbba31d68
parente656b6e26de27db6a4235961f7e667998d3a2832 (diff)
parentbd06d4ecd680701373f5903cae1a31746e5530c6 (diff)
downloadotp-9f1843dcfde8f53be93cfcb303aff36f16a541f0.tar.gz
otp-9f1843dcfde8f53be93cfcb303aff36f16a541f0.tar.bz2
otp-9f1843dcfde8f53be93cfcb303aff36f16a541f0.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/src/ssl_v3.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_v3.erl b/lib/ssl/src/ssl_v3.erl
index 5e043624a7..f169059a75 100644
--- a/lib/ssl/src/ssl_v3.erl
+++ b/lib/ssl/src/ssl_v3.erl
@@ -144,6 +144,7 @@ suites() ->
?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
?TLS_RSA_WITH_AES_128_CBC_SHA,
+ ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
?TLS_RSA_WITH_DES_CBC_SHA
].