diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:36:02 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-01-08 15:36:02 +0100 |
| commit | e9a01bb9d93a462e868cf2549205fcc617ccb0aa (patch) | |
| tree | 065fc362f0d4e1e65b95443f80c2fcdb2281460d /lib/ssl/doc/src/ssl.xml | |
| parent | 67777601894ba779757daab0f062084ce03a1432 (diff) | |
| parent | 72f5a4a6174338c011e5c3b73b0ad11ca296b5af (diff) | |
| download | otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.tar.gz otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.tar.bz2 otp-e9a01bb9d93a462e868cf2549205fcc617ccb0aa.zip | |
Merge branch 'ia/ssl/TLS-1.2-default/OTP-10425'
* ia/ssl/TLS-1.2-default/OTP-10425:
ssl: Make TLS-1.2 default version
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index f0eac76264..e45a4c774f 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -36,8 +36,8 @@ <list type="bulleted"> <item>ssl requires the crypto and public_key applications.</item> - <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0, experimental - support for TLS-1.1 and TLS-1.2 is also available (no support for elliptic curve cipher suites yet).</item> + <item>Supported SSL/TLS-versions are SSL-3.0, TLS-1.0, + TLS-1.1 and TLS-1.2 (no support for elliptic curve cipher suites yet).</item> <item>For security reasons sslv2 is not supported.</item> <item>Ephemeral Diffie-Hellman cipher suites are supported but not Diffie Hellman Certificates cipher suites.</item> |