summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keyscan.115
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d8b9540f..87476f13e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 - djm@cvs.openbsd.org 2014/03/12 04:51:12 15 - djm@cvs.openbsd.org 2014/03/12 04:51:12
16 [authfile.c] 16 [authfile.c]
17 correct test that kdf name is not "none" or "bcrypt" 17 correct test that kdf name is not "none" or "bcrypt"
18 - naddy@cvs.openbsd.org 2014/03/12 13:06:59
19 [ssh-keyscan.1]
20 scan for Ed25519 keys by default too
18 21
1920140401 2220140401
20 - (djm) On platforms that support it, use prctl() to prevent sftp-server 23 - (djm) On platforms that support it, use prctl() to prevent sftp-server
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index dae4fd9fb..5c32ea9c7 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.34 2014/01/28 14:13:39 jmc Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.35 2014/03/12 13:06:59 naddy Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -6,7 +6,7 @@
6.\" permitted provided that due credit is given to the author and the 6.\" permitted provided that due credit is given to the author and the
7.\" OpenBSD project by leaving this copyright notice intact. 7.\" OpenBSD project by leaving this copyright notice intact.
8.\" 8.\"
9.Dd $Mdocdate: January 28 2014 $ 9.Dd $Mdocdate: March 12 2014 $
10.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
11.Os 11.Os
12.Sh NAME 12.Sh NAME
@@ -98,9 +98,10 @@ or
98for protocol version 2. 98for protocol version 2.
99Multiple values may be specified by separating them with commas. 99Multiple values may be specified by separating them with commas.
100The default is to fetch 100The default is to fetch
101.Dq rsa 101.Dq rsa ,
102.Dq ecdsa ,
102and 103and
103.Dq ecdsa 104.Dq ed25519
104keys. 105keys.
105.It Fl v 106.It Fl v
106Verbose mode. 107Verbose mode.
@@ -124,12 +125,12 @@ Input format:
1241.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4 1251.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
125.Ed 126.Ed
126.Pp 127.Pp
127Output format for rsa1 keys: 128Output format for RSA1 keys:
128.Bd -literal 129.Bd -literal
129host-or-namelist bits exponent modulus 130host-or-namelist bits exponent modulus
130.Ed 131.Ed
131.Pp 132.Pp
132Output format for rsa, dsa and ecdsa keys: 133Output format for RSA, DSA, ECDSA, and ED25519 keys:
133.Bd -literal 134.Bd -literal
134host-or-namelist keytype base64-encoded-key 135host-or-namelist keytype base64-encoded-key
135.Ed 136.Ed
@@ -158,7 +159,7 @@ Find all hosts from the file
158which have new or different keys from those in the sorted file 159which have new or different keys from those in the sorted file
159.Pa ssh_known_hosts : 160.Pa ssh_known_hosts :
160.Bd -literal 161.Bd -literal
161$ ssh-keyscan -t rsa,dsa,ecdsa -f ssh_hosts | \e 162$ ssh-keyscan -t rsa,dsa,ecdsa,ed25519 -f ssh_hosts | \e
162 sort -u - ssh_known_hosts | diff ssh_known_hosts - 163 sort -u - ssh_known_hosts | diff ssh_known_hosts -
163.Ed 164.Ed
164.Sh SEE ALSO 165.Sh SEE ALSO