=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.1,v retrieving revision 1.18 retrieving revision 1.18.2.2 diff -u -r1.18 -r1.18.2.2 --- src/usr.bin/ssh/ssh-keygen.1 2000/05/08 17:26:04 1.18 +++ src/usr.bin/ssh/ssh-keygen.1 2000/11/08 21:31:21 1.18.2.2 @@ -1,16 +1,40 @@ .\" -*- nroff -*- .\" -.\" ssh-keygen.1 -.\" .\" Author: Tatu Ylonen -.\" .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland .\" All rights reserved .\" -.\" Created: Sat Apr 22 23:55:14 1995 ylo +.\" As far as I am concerned, the code I have written for this software +.\" can be used freely for any purpose. Any derived versions of this +.\" software must be clearly marked as such, and if the derived work is +.\" incompatible with the protocol description in the RFC file, it must be +.\" called by a name other than "ssh" or "Secure Shell". .\" -.\" $Id: ssh-keygen.1,v 1.18 2000/05/08 17:26:04 hugh Exp $ .\" +.\" Copyright (c) 1999,2000 Markus Friedl. All rights reserved. +.\" Copyright (c) 1999 Aaron Campbell. All rights reserved. +.\" Copyright (c) 1999 Theo de Raadt. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (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 September 25, 1999 .Dt SSH-KEYGEN 1 .Os @@ -23,7 +47,7 @@ .Op Fl b Ar bits .Op Fl N Ar new_passphrase .Op Fl C Ar comment -.Op Fl f Ar keyfile +.Op Fl f Ar output_keyfile .Nm ssh-keygen .Fl p .Op Fl P Ar old_passphrase @@ -31,13 +55,13 @@ .Op Fl f Ar keyfile .Nm ssh-keygen .Fl x -.Op Fl f Ar keyfile +.Op Fl f Ar input_keyfile .Nm ssh-keygen .Fl X -.Op Fl f Ar keyfile +.Op Fl f Ar input_keyfile .Nm ssh-keygen .Fl y -.Op Fl f Ar keyfile +.Op Fl f Ar input_keyfile .Nm ssh-keygen .Fl c .Op Fl P Ar passphrase @@ -45,7 +69,7 @@ .Op Fl f Ar keyfile .Nm ssh-keygen .Fl l -.Op Fl f Ar keyfile +.Op Fl f Ar input_keyfile .Nm ssh-keygen .Fl R .Sh DESCRIPTION @@ -144,8 +168,9 @@ This option will read a private OpenSSH DSA format file and print a SSH2-compatible public key to stdout. .It Fl X -This option will read a -SSH2-compatible public key file and print an OpenSSH DSA compatible public key to stdout. +This option will read a unencrypted +SSH2-compatible private (or public) key file and +print an OpenSSH compatible private (or public) key to stdout. .It Fl y This option will read a private OpenSSH DSA format file and print an OpenSSH DSA public key to stdout. @@ -188,6 +213,7 @@ on all machines where you wish to log in using DSA authentication. There is no need to keep the contents of this file secret. +.El .Sh AUTHOR Tatu Ylonen .Pp @@ -214,10 +240,6 @@ supports one-time password authentication with .Xr skey 1 . .El -.Pp -The libraries described in -.Xr ssl 8 -are required for proper operation. .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-add 1 ,