diff options
| author | Hans Nilsson <[email protected]> | 2017-11-23 10:33:06 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-11-23 10:33:06 +0100 |
| commit | a01b9c4e90d422343d9bc8fea348f77940ff44c7 (patch) | |
| tree | c5788a3c114acbae34252c4574c4ff7f00c8d6ea /lib/ssl | |
| parent | a41bfcdf524dd94a9a760ab3dd0d375896e5a7f7 (diff) | |
| parent | af2cc09e0390fd5940f2fc52534b9721e9942926 (diff) | |
| download | otp-a01b9c4e90d422343d9bc8fea348f77940ff44c7.tar.gz otp-a01b9c4e90d422343d9bc8fea348f77940ff44c7.tar.bz2 otp-a01b9c4e90d422343d9bc8fea348f77940ff44c7.zip | |
Merge branch 'hans/crypto/doc_engine_keys/OTP-14735' into maint
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index ac5a69c69b..8fcda78ed5 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -203,7 +203,9 @@ <tag><c>{certfile, path()}</c></tag> <item><p>Path to a file containing the user certificate.</p></item> - <tag><c>{key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'ECPrivateKey' + <tag> + <marker id="key_option_def"/> + <c>{key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'ECPrivateKey' |'PrivateKeyInfo', public_key:der_encoded()} | #{algorithm := rsa | dss | ecdsa, engine := crypto:engine_ref(), key_id := crypto:key_id(), password => crypto:password()}</c></tag> <item><p>The DER-encoded user's private key or a map refering to a crypto |