diff options
author | Hans Nilsson <[email protected]> | 2017-02-10 14:37:41 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2017-02-14 16:24:16 +0100 |
commit | 9f23065062eb724e58f39a65e416e5b0e1e9d95d (patch) | |
tree | 287688dd9783ac8295a2c71677cb2cbf8b3ccd8a /lib/ssh/doc/src | |
parent | f7bae98de902c597d9f1e5861745e90aecc58191 (diff) | |
download | otp-9f23065062eb724e58f39a65e416e5b0e1e9d95d.tar.gz otp-9f23065062eb724e58f39a65e416e5b0e1e9d95d.tar.bz2 otp-9f23065062eb724e58f39a65e416e5b0e1e9d95d.zip |
ssh: allow a list of fingerprint algos in silently_accept_hosts option
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r-- | lib/ssh/doc/src/ssh.xml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 6b49f89449..1a6bac8355 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -175,9 +175,11 @@ supplied with this option. </p> </item> - <tag><c><![CDATA[{silently_accept_hosts, boolean() | accept_fun() | {crypto:digest_type(), accept_fun()} }]]></c> + <tag><c><![CDATA[{silently_accept_hosts, boolean() | accept_fun() | {HashAlgoSpec, accept_fun()} }]]></c> <br/> - <c><![CDATA[accept_fun() :: fun(PeerName::string(), FingerPrint::string()) -> boolean()]]></c> + <c><![CDATA[HashAlgoSpec :: crypto:digest_type() | [crypto:digest_type()] ]]></c> + <br/> + <c><![CDATA[accept_fun() :: fun(PeerName::string(), FingerPrint:: string()|[string()]) -> boolean()]]></c> </tag> <item> <p>When <c>true</c>, hosts are added to the @@ -188,8 +190,13 @@ <c>(PeerName, PeerHostKeyFingerPrint)</c>. The fingerprint is calculated on the Peer's Host Key with <seealso marker="public_key:public_key#ssh_hostkey_fingerprint-1">public_key:ssh_hostkey_fingerprint/1</seealso>. </p> - <p>If the <c>crypto:digest_type()</c> is present, the fingerprint is calculated with that digest type by the function + <p>If the <c>HashAlgoSpec</c> is present and is an <c>crypto:digest_type()</c>, the fingerprint is calculated + with that digest type by the function <seealso marker="public_key:public_key#ssh_hostkey_fingerprint-2">public_key:ssh_hostkey_fingerprint/2</seealso>. + </p> + <p>If the <c>HashAlgoSpec</c> is present and is a list of <c>crypto:digest_type()</c>, the fingerprint is calulated for + each digest_type and <c>PeerHostKeyFingerPrint</c> is the list of the results in order corresponding to the + <c>HashAlgoSpec</c>. </p> </item> <tag><c><![CDATA[{user_interaction, boolean()}]]></c></tag> |