aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-12-07 12:28:37 +0100
committerIngela Anderton Andin <[email protected]>2015-12-07 12:28:37 +0100
commitbd06d4ecd680701373f5903cae1a31746e5530c6 (patch)
treea45bff14a8abb4593b9f7a260b5ae6dd66dfd6c8 /lib/ssl
parent2b73b1cee4571227bd56e6b661daa6907396ce77 (diff)
parentb7d8e2d89cfcc4c4265f45adc5ffc425e43c90fe (diff)
downloadotp-bd06d4ecd680701373f5903cae1a31746e5530c6.tar.gz
otp-bd06d4ecd680701373f5903cae1a31746e5530c6.tar.bz2
otp-bd06d4ecd680701373f5903cae1a31746e5530c6.zip
Merge branch 'ia/ssl/sslv3-completeness' into maint
* ia/ssl/sslv3-completeness: ssl: SSLv3 completeness
Diffstat (limited to 'lib/ssl')
-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
].