aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-22 10:41:58 +0100
committerIngela Anderton Andin <[email protected]>2018-01-22 10:41:58 +0100
commitbb64f19a947568a56f719d609fa5915f703a32fb (patch)
tree38af53107ac5896a46cfce5de8dc65e73b2ab0e0 /lib/ssl/doc
parente6432a0c60a488c7750fcdab3a4f2821c0f35ec8 (diff)
parent22236da53c12d11eee7c103e3484aaa5ea8030b5 (diff)
downloadotp-bb64f19a947568a56f719d609fa5915f703a32fb.tar.gz
otp-bb64f19a947568a56f719d609fa5915f703a32fb.tar.bz2
otp-bb64f19a947568a56f719d609fa5915f703a32fb.zip
Merge branch 'ingela/ssl/remove-3des-from-default/OTP-14768'
* ingela/ssl/remove-3des-from-default/OTP-14768: ssl: Remove 3DES cipher suites from default
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r--lib/ssl/doc/src/ssl_app.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index e4109dd080..3b0f01d1e8 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -47,6 +47,8 @@
but can be configured. (OTP 21) </item>
<item>For security reasons DES cipher suites are no longer supported by default,
but can be configured. (OTP 20) </item>
+ <item>For security reasons 3DES cipher suites are no longer supported by default,
+ but can be configured. (OTP 21) </item>
<item> Renegotiation Indication Extension <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url> is supported
</item>
<item>Ephemeral Diffie-Hellman cipher suites are supported,