aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-17 16:18:34 +0200
committerIngela Anderton Andin <[email protected]>2016-06-17 16:18:34 +0200
commit5209278192e4c7762b7f2d5a311c13a4596cb4d4 (patch)
tree450a2b646f1d78091d436f146c91c743564ec95e
parentad614116e739e45fcce34f614335c6b8f67e614d (diff)
parentab3cffc9c24ec5b54456d2128a07a09bee2e69d6 (diff)
downloadotp-5209278192e4c7762b7f2d5a311c13a4596cb4d4.tar.gz
otp-5209278192e4c7762b7f2d5a311c13a4596cb4d4.tar.bz2
otp-5209278192e4c7762b7f2d5a311c13a4596cb4d4.zip
Merge branch 'ingela/ssl/doc-update-supported-list'
* ingela/ssl/doc-update-supported-list: ssl: Extend list of supported features
-rw-r--r--lib/ssl/doc/src/ssl_app.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 0b3fa9a8a9..a66e947bc1 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -45,6 +45,8 @@
but can be configured.</item>
<item>For security reasons DES cipher suites are no longer supported by default,
but can be configured.</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,
but not Diffie Hellman Certificates cipher suites.</item>
<item>Elliptic Curve cipher suites are supported if the Crypto
@@ -55,10 +57,16 @@
<item>IDEA cipher suites are not supported as they have
become deprecated by the latest TLS specification so it is not
motivated to implement them.</item>
+ <item>Compression is not supported.</item>
<item>CRL validation is supported.</item>
<item>Policy certificate extensions are not supported.</item>
<item>'Server Name Indication' extension
(<url href="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</url>) is supported.</item>
+ <item>Application Layer Protocol Negotiation (ALPN) and its successor Next Protocol Negotiation (NPN)
+ are supported. </item>
+ <item>It is possible to use Pre-Shared Key (PSK) and Secure Remote Password (SRP)
+ cipher suites, but they are not enabled by default.
+ </item>
</list>
</description>