diff options
Diffstat (limited to 'lib/ssl/doc')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 10 | 
1 files changed, 7 insertions, 3 deletions
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 @@      <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 </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>For security reasons sslv2 is not supported.</item>        <item>Ephemeral Diffie-Hellman cipher suites are supported        but not Diffie Hellman Certificates cipher suites.</item>        <item>Export cipher suites are not supported as the        U.S. lifted its export restrictions in early 2000.</item> +      <item>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.</item>        <item>CRL and policy certificate              extensions are not supported yet. </item>      </list> @@ -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()}      </c></p>      <p><c>transportoption() = {CallbackModule, DataTag, ClosedTag} @@ -106,7 +110,7 @@      <p><c>sslsocket() - opaque to the user. </c></p> -    <p><c>protocol() = sslv3 | tlsv1 </c></p> +    <p><c>protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>      <p><c>ciphers() = [ciphersuite()] | string() (according to old API)</c></p>  | 
