diff options
| author | Hans Nilsson <[email protected]> | 2018-11-22 10:26:28 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-11-22 10:26:28 +0100 |
| commit | 2f0a547f78363a2504405e82e3ab3ea35b9e6a88 (patch) | |
| tree | dcaac8676f0f80a5cabdfa6f4a69b572ab33a2cf /lib/ssh/doc/src | |
| parent | f8183c3949b3da11fafac4e5b7737fb75e0d0f11 (diff) | |
| parent | aa7b1de2803c5fcd63af842f567226074a616e86 (diff) | |
| download | otp-2f0a547f78363a2504405e82e3ab3ea35b9e6a88.tar.gz otp-2f0a547f78363a2504405e82e3ab3ea35b9e6a88.tar.bz2 otp-2f0a547f78363a2504405e82e3ab3ea35b9e6a88.zip | |
Merge branch 'hans/ssh/eddsa/OTP-15094' into maint
* hans/ssh/eddsa/OTP-15094:
ssh: Add forgotten doc about the files ssh_host_ed*_key
Diffstat (limited to 'lib/ssh/doc/src')
| -rw-r--r-- | lib/ssh/doc/src/ssh_file.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh_file.xml b/lib/ssh/doc/src/ssh_file.xml index 47ed4dd912..6681d9c306 100644 --- a/lib/ssh/doc/src/ssh_file.xml +++ b/lib/ssh/doc/src/ssh_file.xml @@ -93,8 +93,8 @@ <item><marker id="SYSDIR-ssh_host_dsa_key"/><c>ssh_host_dsa_key</c> - private dss host key (optional)</item> <item><marker id="SYSDIR-ssh_host_rsa_key"/><c>ssh_host_rsa_key</c> - private rsa host key (optional)</item> <item><marker id="SYSDIR-ssh_host_ecdsa_key"/><c>ssh_host_ecdsa_key</c> - private ecdsa host key (optional)</item> - <item><marker id="SYSDIR-ssh_host_ed25519_key"/><c>ssh_host_ed25519_key</c> - private ecdsa host key for curve 25519 (optional)</item> - <item><marker id="SYSDIR-ssh_host_ed448_key"/><c>ssh_host_ed448_key</c> - private ecdsa host key for curve 448 (optional)</item> + <item><marker id="SYSDIR-ssh_host_ed25519_key"/><c>ssh_host_ed25519_key</c> - private eddsa host key for curve 25519 (optional)</item> + <item><marker id="SYSDIR-ssh_host_ed448_key"/><c>ssh_host_ed448_key</c> - private eddsa host key for curve 448 (optional)</item> </list> <p>At least one host key must be defined. The default value of SYSDIR is <marker id="#/etc/ssh"/><c>/etc/ssh</c>. </p> @@ -188,6 +188,8 @@ <item><seealso marker="#SYSDIR-ssh_host_rsa_key"><c>SYSDIR/ssh_host_rsa_key</c></seealso></item> <item><seealso marker="#SYSDIR-ssh_host_dsa_key"><c>SYSDIR/ssh_host_dsa_key</c></seealso></item> <item><seealso marker="#SYSDIR-ssh_host_ecdsa_key"><c>SYSDIR/ssh_host_ecdsa_key</c></seealso></item> + <item><seealso marker="#SYSDIR-ssh_host_ed25519_key"><c>SYSDIR/ssh_host_ed25519_key</c></seealso></item> + <item><seealso marker="#SYSDIR-ssh_host_ed448_key"><c>SYSDIR/ssh_host_ed448_key</c>c></seealso></item> </list> </desc> </func> |