- jmc@cvs.openbsd.org 2014/01/28 14:13:39

[ssh-keyscan.1]
     kill some bad Pa;
     From: Jan Stary
This commit is contained in:
Damien Miller 2014-02-04 11:09:12 +11:00
parent 0ba85d696a
commit f8f35bc471
2 changed files with 18 additions and 14 deletions

View File

@ -10,6 +10,10 @@
- markus@cvs.openbsd.org 2014/01/27 20:13:46 - markus@cvs.openbsd.org 2014/01/27 20:13:46
[digest.c digest-openssl.c digest-libc.c Makefile.in] [digest.c digest-openssl.c digest-libc.c Makefile.in]
rename digest.c to digest-openssl.c and add libc variant; ok djm@ rename digest.c to digest-openssl.c and add libc variant; ok djm@
- jmc@cvs.openbsd.org 2014/01/28 14:13:39
[ssh-keyscan.1]
kill some bad Pa;
From: Jan Stary
20140131 20140131
- (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2) - (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2)

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keyscan.1,v 1.33 2013/12/07 11:58:46 naddy Exp $ .\" $OpenBSD: ssh-keyscan.1,v 1.34 2014/01/28 14:13:39 jmc Exp $
.\" .\"
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. .\" 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 .\" permitted provided that due credit is given to the author and the
.\" OpenBSD project by leaving this copyright notice intact. .\" OpenBSD project by leaving this copyright notice intact.
.\" .\"
.Dd $Mdocdate: December 7 2013 $ .Dd $Mdocdate: January 28 2014 $
.Dt SSH-KEYSCAN 1 .Dt SSH-KEYSCAN 1
.Os .Os
.Sh NAME .Sh NAME
@ -56,14 +56,16 @@ Forces
to use IPv6 addresses only. to use IPv6 addresses only.
.It Fl f Ar file .It Fl f Ar file
Read hosts or Read hosts or
.Pa addrlist namelist .Dq addrlist namelist
pairs from this file, one per line. pairs from
.Ar file ,
one per line.
If If
.Pa - .Pa -
is supplied instead of a filename, is supplied instead of a filename,
.Nm .Nm
will read hosts or will read hosts or
.Pa addrlist namelist .Dq addrlist namelist
pairs from the standard input. pairs from the standard input.
.It Fl H .It Fl H
Hash all hostnames and addresses in the output. Hash all hostnames and addresses in the output.
@ -78,7 +80,7 @@ Port to connect to on the remote host.
.It Fl T Ar timeout .It Fl T Ar timeout
Set the timeout for connection attempts. Set the timeout for connection attempts.
If If
.Pa timeout .Ar timeout
seconds have elapsed since a connection was initiated to a host or since the seconds have elapsed since a connection was initiated to a host or since the
last time anything was read from that host, then the connection is last time anything was read from that host, then the connection is
closed and the host in question considered unavailable. closed and the host in question considered unavailable.
@ -117,23 +119,23 @@ On the other hand, if the security model allows such a risk,
can help in the detection of tampered keyfiles or man in the middle can help in the detection of tampered keyfiles or man in the middle
attacks which have begun after the ssh_known_hosts file was created. attacks which have begun after the ssh_known_hosts file was created.
.Sh FILES .Sh FILES
.Pa Input format: Input format:
.Bd -literal .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 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 .Ed
.Pp .Pp
.Pa Output format for rsa1 keys: Output format for rsa1 keys:
.Bd -literal .Bd -literal
host-or-namelist bits exponent modulus host-or-namelist bits exponent modulus
.Ed .Ed
.Pp .Pp
.Pa Output format for rsa, dsa and ecdsa keys: Output format for rsa, dsa and ecdsa keys:
.Bd -literal .Bd -literal
host-or-namelist keytype base64-encoded-key host-or-namelist keytype base64-encoded-key
.Ed .Ed
.Pp .Pp
Where Where
.Pa keytype .Ar keytype
is either is either
.Dq ecdsa-sha2-nistp256 , .Dq ecdsa-sha2-nistp256 ,
.Dq ecdsa-sha2-nistp384 , .Dq ecdsa-sha2-nistp384 ,
@ -145,10 +147,8 @@ or
.Pp .Pp
.Pa /etc/ssh/ssh_known_hosts .Pa /etc/ssh/ssh_known_hosts
.Sh EXAMPLES .Sh EXAMPLES
Print the Print the rsa host key for machine
.Pa rsa .Ar hostname :
host key for machine
.Pa hostname :
.Bd -literal .Bd -literal
$ ssh-keyscan hostname $ ssh-keyscan hostname
.Ed .Ed