From d799aa95dcff2fc2602db2b98798e1bca21a3a35 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin
Date: Wed, 22 Aug 2012 13:50:37 +0200
Subject: ssl & public_key: Prepare for release
Tickets solved by this branch: OTP-8871, OTP-8872 and OTP-9908
---
lib/ssl/doc/src/ssl.xml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
(limited to 'lib/ssl/doc/src/ssl.xml')
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 28bf82b406..5098d26a3a 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -36,12 +36,16 @@
- ssl requires the crypto and public_key applications.
- - Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0
+ - 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).
- For security reasons sslv2 is not supported.
- Ephemeral Diffie-Hellman cipher suites are supported
but not Diffie Hellman Certificates cipher suites.
- Export cipher suites are not supported as the
U.S. lifted its export restrictions in early 2000.
+ - IDEA cipher suites are not supported as they have
+ become deprecated by the latest TLS spec so there is not any
+ real motivation to implement them.
- CRL and policy certificate
extensions are not supported yet.
@@ -75,7 +79,7 @@
{keyfile, path()} | {password, string()} |
{cacerts, [der_encoded()]} | {cacertfile, path()} |
|{dh, der_encoded()} | {dhfile, path()} | {ciphers, ciphers()} |
- {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()}
+ {ssl_imp, ssl_imp()}| {reuse_sessions, boolean()} | {reuse_session, fun()}
transportoption() = {CallbackModule, DataTag, ClosedTag}
@@ -106,7 +110,7 @@
sslsocket() - opaque to the user.
- protocol() = sslv3 | tlsv1
+ protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'
ciphers() = [ciphersuite()] | string() (according to old API)
--
cgit v1.2.3