diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-10-19 10:08:25 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-01 16:54:41 +0100 |
| commit | 1564b5853f286c97a7c9e1d6715d3c6f10bea50f (patch) | |
| tree | b28f6c1ba414a4747f8c8d52d80783e266fa9d5a /lib/ssl/doc/src | |
| parent | b211df3a0cca478822d57836dac3dd6452aab32a (diff) | |
| download | otp-1564b5853f286c97a7c9e1d6715d3c6f10bea50f.tar.gz otp-1564b5853f286c97a7c9e1d6715d3c6f10bea50f.tar.bz2 otp-1564b5853f286c97a7c9e1d6715d3c6f10bea50f.zip | |
Added PKCS-8 support in ssl
Diffstat (limited to 'lib/ssl/doc/src')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 70122e4393..50268ae206 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -71,7 +71,8 @@ {fail_if_no_peer_cert, boolean()} {depth, integer()} | {cert, der_encoded()}| {certfile, path()} | - {key, der_encoded()} | {keyfile, path()} | {password, string()} | + {key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'PrivateKeyInfo', der_encoded()}} | + {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()} @@ -139,7 +140,7 @@ <tag>{certfile, path()}</tag> <item>Path to a file containing the user's certificate.</item> - <tag>{key, der_encoded()}</tag> + <tag>{key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'PrivateKeyInfo', der_encoded()}}</tag> <item> The DER encoded users private key. If this option is supplied it will override the keyfile option.</item> |