diff options
| author | Raimo Niskanen <[email protected]> | 2016-06-01 11:12:24 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-06-01 11:12:24 +0200 |
| commit | 4aa1a8758c041af6633d3681fe5064ff31a64d0c (patch) | |
| tree | 6d66a67fe2ca129a015726b3732207410daf32f9 /lib/ssl/doc | |
| parent | 9adcce3611c149817f0fa68ebe47e6b1350c5151 (diff) | |
| parent | 624fb38a6949fff28a7be80527ce126a26e2ad18 (diff) | |
| download | otp-4aa1a8758c041af6633d3681fe5064ff31a64d0c.tar.gz otp-4aa1a8758c041af6633d3681fe5064ff31a64d0c.tar.bz2 otp-4aa1a8758c041af6633d3681fe5064ff31a64d0c.zip | |
Merge branch 'legoscia/ssl/tls-dist-more-opts/PR-956/OTP-13429'
* legoscia/ssl/tls-dist-more-opts/PR-956/OTP-13429:
Quote curly brackets in command line options
Avoid disappearing ETS tables in ssl_dist_SUITE
Fix db handle for TLS distribution crl_cache opts
Fix ssl_dist_SUITE logging on Windows
More logging in ssl_dist_SUITE
TLS distribution: crl_check and crl_cache options
Allow passing verify_fun for TLS distribution
More informative malformed_ssl_dist_opt error
Diffstat (limited to 'lib/ssl/doc')
| -rw-r--r-- | lib/ssl/doc/src/ssl_distribution.xml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml index 7c00b4eae2..495e02d271 100644 --- a/lib/ssl/doc/src/ssl_distribution.xml +++ b/lib/ssl/doc/src/ssl_distribution.xml @@ -196,6 +196,9 @@ Eshell V5.0 (abort with ^G) <item><c>password</c></item> <item><c>cacertfile</c></item> <item><c>verify</c></item> + <item><c>verify_fun</c> (write as <c>{Module, Function, InitialUserState}</c>)</item> + <item><c>crl_check</c></item> + <item><c>crl_cache</c> (write as Erlang term)</item> <item><c>reuse_sessions</c></item> <item><c>secure_renegotiate</c></item> <item><c>depth</c></item> @@ -203,6 +206,10 @@ Eshell V5.0 (abort with ^G) <item><c>ciphers</c> (use old string format)</item> </list> + <p>Note that <c>verify_fun</c> needs to be written in a different + form than the corresponding SSL option, since funs are not + accepted on the command line.</p> + <p>The server can also take the options <c>dhfile</c> and <c>fail_if_no_peer_cert</c> (also prefixed).</p> @@ -210,10 +217,6 @@ Eshell V5.0 (abort with ^G) initiates a connection to another node. <c>server_</c>-prefixed options are used when accepting a connection from a remote node.</p> - <p>More complex options, such as <c>verify_fun</c>, are currently not - available, but a mechanism to handle such options may be added in - a future release.</p> - <p>Raw socket options, such as <c>packet</c> and <c>size</c> must not be specified on the command line.</p> |