diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2014-01-31 13:12:02 +0000 |
| commit | f7167e0ea0bf5aaabff9490453b3b71b3f1b4d51 (patch) | |
| tree | d32fb61cec38c52314210c3459fd436685dacdba /crypto/openssh/ssh-keyscan.1 | |
| parent | 9e90c870232242ab23aa7d473996f68cb1fe449d (diff) | |
| parent | 02d4c2ac3daa0f36264392972709ccd7676ab3e8 (diff) | |
| download | src-f7167e0ea0bf5aaabff9490453b3b71b3f1b4d51.tar.gz src-f7167e0ea0bf5aaabff9490453b3b71b3f1b4d51.zip | |
Upgrade to OpenSSH 6.5p1.
Notes
Notes:
svn path=/head/; revision=261320
Diffstat (limited to 'crypto/openssh/ssh-keyscan.1')
| -rw-r--r-- | crypto/openssh/ssh-keyscan.1 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/openssh/ssh-keyscan.1 b/crypto/openssh/ssh-keyscan.1 index 26b84f150741..9118e11b2889 100644 --- a/crypto/openssh/ssh-keyscan.1 +++ b/crypto/openssh/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.33 2013/12/07 11:58:46 naddy Exp $ .\" $FreeBSD$ .\" .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. @@ -7,7 +7,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd July 16, 2013 +.Dd December 7, 2013 .Dt SSH-KEYSCAN 1 .Os .Sh NAME @@ -90,7 +90,8 @@ The possible values are .Dq rsa1 for protocol version 1 and .Dq dsa , -.Dq ecdsa +.Dq ecdsa , +.Dq ed25519 , or .Dq rsa for protocol version 2. @@ -138,6 +139,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 . |