diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-04-01 07:59:48 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-01 07:59:48 +0000 |
| commit | 71238dc853d1e56b34b883b233d99d4480f6bffa (patch) | |
| tree | 9ffff34725cd59c3302bac0b19947eb64f46d3e0 /lib/ssl | |
| parent | 8e78ddf9ebb5a2633024b240f5d2ad5b5a89c0c2 (diff) | |
| download | otp-71238dc853d1e56b34b883b233d99d4480f6bffa.tar.gz otp-71238dc853d1e56b34b883b233d99d4480f6bffa.tar.bz2 otp-71238dc853d1e56b34b883b233d99d4480f6bffa.zip | |
Add dhfile option
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/doc/src/new_ssl.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/ssl/doc/src/new_ssl.xml b/lib/ssl/doc/src/new_ssl.xml index b642280096..b4f9bf9b64 100644 --- a/lib/ssl/doc/src/new_ssl.xml +++ b/lib/ssl/doc/src/new_ssl.xml @@ -84,8 +84,6 @@ <item>New API functions are ssl:shutdown/2, ssl:cipher_suites/[0,1] and ssl:versions/0</item> - <item>Diffie-Hellman keyexchange is - not supported yet.</item> <item>CRL and policy certificate extensions are not supported yet. </item> <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0 </item> @@ -118,8 +116,8 @@ {fail_if_no_peer_cert, boolean()} {depth, integer()} | {certfile, path()} | {keyfile, path()} | {password, string()} | - {cacertfile, path()} | {ciphers, ciphers()} | {ssl_imp, ssl_imp()} - | {reuse_sessions, boolean()} | {reuse_session, fun()} + {cacertfile, path()} | {dhfile, path()} | {ciphers, ciphers()} | + {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()} </c></p> <p><c>transportoption() = {CallbackModule, DataTag, ClosedTag} @@ -262,6 +260,12 @@ end CA certificates (trusted certificates used for verifying a peer certificate). May be omitted if you do not want to verify the peer.</item> + + <tag>{dhfile, path()}</tag> + <item>Path to file containing PEM encoded Diffie Hellman parameters, + for the server to use if a cipher suite using Diffie Hellman key exchange + is negotiated. If not specified hardcode parameters will be used. + </item> <tag>{ciphers, ciphers()}</tag> <item>The function <c>ciphers_suites/0</c> can |