RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 10:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

- naddy@cvs.openbsd.org 2014/03/12 13:06:59

Browse Source 
[ssh-keyscan.1]
     scan for Ed25519 keys by default too
This commit is contained in:
Damien Miller 2014-04-20 13:00:51 +10:00
parent 3819519288
commit 94bfe0fbd6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15,6 +15,9 @@
- djm@cvs.openbsd.org 2014/03/12 04:51:12 - djm@cvs.openbsd.org 2014/03/12 04:51:12
[authfile.c] [authfile.c]
correct test that kdf name is not "none" or "bcrypt" correct test that kdf name is not "none" or "bcrypt"
- naddy@cvs.openbsd.org 2014/03/12 13:06:59
[ssh-keyscan.1]
scan for Ed25519 keys by default too
20140401 20140401
- (djm) On platforms that support it, use prctl() to prevent sftp-server - (djm) On platforms that support it, use prctl() to prevent sftp-server

15
ssh-keyscan.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keyscan.1,v 1.34 2014/01/28 14:13:39 jmc Exp $ .\" $OpenBSD: ssh-keyscan.1,v 1.35 2014/03/12 13:06:59 naddy 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: January 28 2014 $ .Dd $Mdocdate: March 12 2014 $
.Dt SSH-KEYSCAN 1 .Dt SSH-KEYSCAN 1
.Os .Os
.Sh NAME .Sh NAME
@ -98,9 +98,10 @@ or
for protocol version 2. for protocol version 2.
Multiple values may be specified by separating them with commas. Multiple values may be specified by separating them with commas.
The default is to fetch The default is to fetch
.Dq rsa .Dq rsa ,
.Dq ecdsa ,
and and
.Dq ecdsa .Dq ed25519
keys. keys.
.It Fl v .It Fl v
Verbose mode. Verbose mode.
@ -124,12 +125,12 @@ Input format:
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
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
Output format for rsa, dsa and ecdsa keys: Output format for RSA, DSA, ECDSA, and ED25519 keys:
.Bd -literal .Bd -literal
host-or-namelist keytype base64-encoded-key host-or-namelist keytype base64-encoded-key
.Ed .Ed
@ -158,7 +159,7 @@ Find all hosts from the file
which have new or different keys from those in the sorted file which have new or different keys from those in the sorted file
.Pa ssh_known_hosts : .Pa ssh_known_hosts :
.Bd -literal .Bd -literal
$ ssh-keyscan -t rsa,dsa,ecdsa -f ssh_hosts | \e $ ssh-keyscan -t rsa,dsa,ecdsa,ed25519 -f ssh_hosts | \e
sort -u - ssh_known_hosts | diff ssh_known_hosts - sort -u - ssh_known_hosts | diff ssh_known_hosts -
.Ed .Ed
.Sh SEE ALSO .Sh SEE ALSO