diff options
author | des <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
commit | 7573e91b127f1c198210fd345d3ca198b598cfc6 (patch) | |
tree | d32fb61cec38c52314210c3459fd436685dacdba /crypto/openssh/ssh-keyscan.0 | |
parent | c692973c992c321bb10e631f572fab1500ae5b0e (diff) | |
parent | 45d0197dd79eceffb5bbc29f75199eb09af5a5f9 (diff) | |
download | FreeBSD-src-7573e91b127f1c198210fd345d3ca198b598cfc6.zip FreeBSD-src-7573e91b127f1c198210fd345d3ca198b598cfc6.tar.gz |
Upgrade to OpenSSH 6.5p1.
Diffstat (limited to 'crypto/openssh/ssh-keyscan.0')
-rw-r--r-- | crypto/openssh/ssh-keyscan.0 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/openssh/ssh-keyscan.0 b/crypto/openssh/ssh-keyscan.0 index 3ea99c3..09cfa0a 100644 --- a/crypto/openssh/ssh-keyscan.0 +++ b/crypto/openssh/ssh-keyscan.0 @@ -48,9 +48,9 @@ DESCRIPTION -t type Specifies the type of the key to fetch from the scanned hosts. The possible values are ``rsa1'' for protocol version 1 and - ``dsa'', ``ecdsa'' or ``rsa'' for protocol version 2. Multiple - values may be specified by separating them with commas. The - default is to fetch ``rsa'' and ``ecdsa'' keys. + ``dsa'', ``ecdsa'', ``ed25519'', or ``rsa'' for protocol version + 2. Multiple values may be specified by separating them with + commas. The default is to fetch ``rsa'' and ``ecdsa'' keys. -v Verbose mode. Causes ssh-keyscan to print debugging messages about its progress. @@ -77,7 +77,7 @@ FILES host-or-namelist keytype base64-encoded-key Where keytype is either ``ecdsa-sha2-nistp256'', ``ecdsa-sha2-nistp384'', - ``ecdsa-sha2-nistp521'', ``ssh-dss'' or ``ssh-rsa''. + ``ecdsa-sha2-nistp521'', ``ssh-ed25519'', ``ssh-dss'' or ``ssh-rsa''. /etc/ssh/ssh_known_hosts @@ -106,4 +106,4 @@ BUGS This is because it opens a connection to the ssh port, reads the public key, and drops the connection as soon as it gets the key. -OpenBSD 5.4 July 16, 2013 OpenBSD 5.4 +OpenBSD 5.4 December 7, 2013 OpenBSD 5.4 |