Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/ssh-keygen.1,v
rcsdiff: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/ssh-keygen.1,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.11.4.1
retrieving revision 1.12
diff -u -p -r1.11.4.1 -r1.12
--- src/crypto/external/bsd/openssh/dist/ssh-keygen.1	2015/04/30 06:07:30	1.11.4.1
+++ src/crypto/external/bsd/openssh/dist/ssh-keygen.1	2014/10/19 16:30:58	1.12
@@ -1,5 +1,5 @@
-.\"	$NetBSD: ssh-keygen.1,v 1.11.4.1 2015/04/30 06:07:30 riz Exp $
-.\"	$OpenBSD: ssh-keygen.1,v 1.125 2015/02/24 15:24:05 naddy Exp $
+.\"	$NetBSD: ssh-keygen.1,v 1.12 2014/10/19 16:30:58 christos Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.122 2014/03/31 13:39:34 jmc Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -38,7 +38,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 24 2015
+.Dd March 31 2014
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -76,8 +76,6 @@
 .Op Fl f Ar keyfile
 .Nm ssh-keygen
 .Fl l
-.Op Fl v
-.Op Fl E Ar fingerprint_hash
 .Op Fl f Ar input_keyfile
 .Nm ssh-keygen
 .Fl B
@@ -145,7 +143,7 @@ generates, manages and converts authenti
 .Xr ssh 1 .
 .Nm
 can create RSA keys for use by SSH protocol version 1 and
-DSA, ECDSA, Ed25519 or RSA keys for use by SSH protocol version 2.
+DSA, ECDSA, ED25519 or RSA keys for use by SSH protocol version 2.
 The type of key to be generated is specified with the
 .Fl t
 option.
@@ -256,7 +254,7 @@ flag determines the key length by select
 curve sizes: 256, 384 or 521 bits.
 Attempting to use bit lengths other than these three values for ECDSA keys
 will fail.
-Ed25519 keys have a fixed length and the
+ED25519 keys have a fixed length and the
 .Fl b
 flag will be ignored.
 .It Fl C Ar comment
@@ -274,14 +272,6 @@ When used in combination with
 this option indicates that a CA key resides in a PKCS#11 token (see the
 .Sx CERTIFICATES
 section for details).
-.It Fl E Ar fingerprint_hash
-Specifies the hash algorithm used when displaying key fingerprints.
-Valid options are:
-.Dq md5
-and
-.Dq sha256 .
-The default is
-.Dq sha256 .
 .It Fl e
 This option will read a private or public OpenSSH key file and
 print to stdout the key in one of the formats specified by the
@@ -819,7 +809,7 @@ There is no need to keep the contents of
 .It Pa ~/.ssh/id_ecdsa
 .It Pa ~/.ssh/id_ed25519
 .It Pa ~/.ssh/id_rsa
-Contains the protocol version 2 DSA, ECDSA, Ed25519 or RSA
+Contains the protocol version 2 DSA, ECDSA, ED25519 or RSA
 authentication identity of the user.
 This file should not be readable by anyone but the user.
 It is possible to
@@ -835,7 +825,7 @@ will read this file when a login attempt
 .It Pa ~/.ssh/id_ecdsa.pub
 .It Pa ~/.ssh/id_ed25519.pub
 .It Pa ~/.ssh/id_rsa.pub
-Contains the protocol version 2 DSA, ECDSA, Ed25519 or RSA
+Contains the protocol version 2 DSA, ECDSA, ED25519 or RSA
 public key for authentication.
 The contents of this file should be added to
 .Pa ~/.ssh/authorized_keys