aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-02-19 09:43:55 +0100
committerIngela Anderton Andin <[email protected]>2016-02-19 09:43:55 +0100
commitbd9d965ad204f3eecd6022d1f7565235ffa0c227 (patch)
tree3b4088244c0686a6671788abfcb348fb5dbdffb1 /lib/ssl/doc/src
parent48411ad12f4d730412895e90c188c2d8f7813ce5 (diff)
parent3db7370a556d0dd064f005fd745bdbf50840eda1 (diff)
downloadotp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.tar.gz
otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.tar.bz2
otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.zip
Merge branch 'ia/ssl/remove-default-DES/OTP-13195'
* ia/ssl/remove-default-DES/OTP-13195: ssl: Remove DES ciphers from default configuration
Diffstat (limited to 'lib/ssl/doc/src')
-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 6c82e32a74..d05ece3971 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -43,6 +43,8 @@
<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>
+ <item>For security reasons DES cipher suites are no longer supported by default,
+ but can be configured.</item>
<item>Ephemeral Diffie-Hellman cipher suites are supported,
but not Diffie Hellman Certificates cipher suites.</item>
<item>Elliptic Curve cipher suites are supported if the Crypto
@@ -55,8 +57,8 @@
motivated to implement them.</item>
<item>CRL validation is supported.</item>
<item>Policy certificate extensions are not supported.</item>
- <item>'Server Name Indication' extension client side
- (RFC 6066, Section 3) is supported.</item>
+ <item>'Server Name Indication' extension
+ (<url href="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</url>) is supported.</item>
</list>
</description>