summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh-keyscan.1
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2013-12-06 13:39:50 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2013-12-06 13:39:50 +0000
commita290ddcba332424443fa2507428cf4bdfd415bac (patch)
tree77d1dc09898f6b40a269e48d8520cffd5bb31dc0 /usr.bin/ssh/ssh-keyscan.1
parent4b5b44f5080b9b0bd2e297236bde454a7b1d32aa (diff)
support ed25519 keys (hostkeys and user identities) using the public domain
ed25519 reference code from SUPERCOP, see http://ed25519.cr.yp.to/software.html feedback, help & ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.1')
-rw-r--r--usr.bin/ssh/ssh-keyscan.15
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.1 b/usr.bin/ssh/ssh-keyscan.1
index c35ea05e048..79dd6aa1c0a 100644
--- a/usr.bin/ssh/ssh-keyscan.1
+++ b/usr.bin/ssh/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keyscan.1,v 1.31 2013/07/16 00:07:52 schwarze Exp $
+.\" $OpenBSD: ssh-keyscan.1,v 1.32 2013/12/06 13:39:49 markus 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: July 16 2013 $
+.Dd $Mdocdate: December 6 2013 $
.Dt SSH-KEYSCAN 1
.Os
.Sh NAME
@@ -137,6 +137,7 @@ is either
.Dq ecdsa-sha2-nistp256 ,
.Dq ecdsa-sha2-nistp384 ,
.Dq ecdsa-sha2-nistp521 ,
+.Dq ssh-ed25519 ,
.Dq ssh-dss
or
.Dq ssh-rsa .