summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2018-03-05 07:03:18 +0000
committerDamien Miller <djm@mindrot.org>2018-03-12 11:48:15 +1100
commit0bcd871ccdf3baf2b642509ba4773d5be067cfa2 (patch)
tree09e708983400761125752b7e43693d1bf6614648
parent45011511a09e03493568506ce32f4891a174a3bd (diff)
upstream: move the input format details to -f; remove the output
format details and point to sshd(8), where it is documented; ok dtucker OpenBSD-Commit-ID: 95f17e47dae02a6ac7329708c8c893d4cad0004a
-rw-r--r--ssh-keyscan.133
1 files changed, 9 insertions, 24 deletions
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index edefe76f..f3d7a407 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keyscan.1,v 1.43 2018/03/02 21:40:15 jmc Exp $
+.\" $OpenBSD: ssh-keyscan.1,v 1.44 2018/03/05 07:03:18 jmc Exp $
.\"
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
.\"
@@ -6,7 +6,7 @@
.\" permitted provided that due credit is given to the author and the
.\" OpenBSD project by leaving this copyright notice intact.
.\"
-.Dd $Mdocdate: March 2 2018 $
+.Dd $Mdocdate: March 5 2018 $
.Dt SSH-KEYSCAN 1
.Os
.Sh NAME
@@ -26,7 +26,9 @@ is a utility for gathering the public SSH host keys of a number of
hosts.
It was designed to aid in building and verifying
.Pa ssh_known_hosts
-files.
+files,
+the format of which is documented in
+.Xr sshd 8 .
.Nm
provides a minimal interface suitable for use by shell and perl
scripts.
@@ -42,27 +44,6 @@ For scanning, one does not need
login access to the machines that are being scanned, nor does the
scanning process involve any encryption.
.Pp
-Input is expected in the format:
-.Bd -literal -offset 3n
-1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
-.Ed
-.Pp
-The output format is:
-.Bd -literal -offset 3n
-host-or-namelist keytype base64-encoded-key
-.Ed
-.Pp
-Where
-.Ar keytype
-is either
-.Dq ecdsa-sha2-nistp256 ,
-.Dq ecdsa-sha2-nistp384 ,
-.Dq ecdsa-sha2-nistp521 ,
-.Dq ssh-ed25519 ,
-.Dq ssh-dss
-or
-.Dq ssh-rsa .
-.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl 4
@@ -92,6 +73,10 @@ If
is supplied instead of a filename,
.Nm
will read from the standard input.
+Input is expected in the format:
+.Bd -literal
+1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
+.Ed
.It Fl H
Hash all hostnames and addresses in the output.
Hashed names may be used normally by