aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-16 13:49:54 +0100
committerIngela Anderton Andin <[email protected]>2018-01-16 13:49:54 +0100
commit0841f405cdce1392a4d8975618c4e0895eb8a6b7 (patch)
tree94c95e046e638c25082d73977a8f05f6213241c8 /lib/ssl/doc
parent613b5f890a5bc13aaf64cc31b535262a40eba721 (diff)
parentdf5280ac94110458381594cbc8dfa3fe31898622 (diff)
downloadotp-0841f405cdce1392a4d8975618c4e0895eb8a6b7.tar.gz
otp-0841f405cdce1392a4d8975618c4e0895eb8a6b7.tar.bz2
otp-0841f405cdce1392a4d8975618c4e0895eb8a6b7.zip
Merge branch 'ingela/ssl/remove-rsa-keyexchange-from-default/OTP-14769'
* ingela/ssl/remove-rsa-keyexchange-from-default/OTP-14769: ssl: RSA key exchange is considered broken do not support by default
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r--lib/ssl/doc/src/ssl_app.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index f317dfded4..e4109dd080 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -42,9 +42,11 @@
TLS-1.1, and TLS-1.2.</item>
<item>For security reasons SSL-2.0 is not supported.</item>
<item>For security reasons SSL-3.0 is no longer supported by default,
- but can be configured.</item>
+ but can be configured. (OTP 19) </item>
+ <item>For security reasons RSA key exchange cipher suites are no longer supported by default,
+ but can be configured. (OTP 21) </item>
<item>For security reasons DES cipher suites are no longer supported by default,
- but can be configured.</item>
+ but can be configured. (OTP 20) </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,