summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-04-20 13:00:51 +1000
committerDamien Miller <djm@mindrot.org>2014-04-20 13:00:51 +1000
commit94bfe0fbd6e91a56b5b0ab94ac955d2a67d101aa (patch)
tree77476f0f5eadd26ce898f659ebae55d5dc292495
parent3819519288b2b3928c6882f5883b0f55148f4fc0 (diff)
- naddy@cvs.openbsd.org 2014/03/12 13:06:59
[ssh-keyscan.1] scan for Ed25519 keys by default too
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keyscan.115
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d8b9540..87476f13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
- djm@cvs.openbsd.org 2014/03/12 04:51:12
[authfile.c]
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
- (djm) On platforms that support it, use prctl() to prevent sftp-server
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index dae4fd9f..5c32ea9c 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -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>.
.\"
@@ -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: January 28 2014 $
+.Dd $Mdocdate: March 12 2014 $
.Dt SSH-KEYSCAN 1
.Os
.Sh NAME
@@ -98,9 +98,10 @@ or
for protocol version 2.
Multiple values may be specified by separating them with commas.
The default is to fetch
-.Dq rsa
+.Dq rsa ,
+.Dq ecdsa ,
and
-.Dq ecdsa
+.Dq ed25519
keys.
.It Fl v
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
.Ed
.Pp
-Output format for rsa1 keys:
+Output format for RSA1 keys:
.Bd -literal
host-or-namelist bits exponent modulus
.Ed
.Pp
-Output format for rsa, dsa and ecdsa keys:
+Output format for RSA, DSA, ECDSA, and ED25519 keys:
.Bd -literal
host-or-namelist keytype base64-encoded-key
.Ed
@@ -158,7 +159,7 @@ Find all hosts from the file
which have new or different keys from those in the sorted file
.Pa ssh_known_hosts :
.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 -
.Ed
.Sh SEE ALSO