[ssh-keygen.1 ssh-keygen.c]
     style, noted by stevesk; sort flags in usage
This commit is contained in:
Ben Lindstrom 2001-04-22 17:19:46 +00:00
parent 160ec62dce
commit 2857d9cf77
3 changed files with 8 additions and 5 deletions

View File

@ -19,6 +19,9 @@
- markus@cvs.openbsd.org 2001/04/22 13:32:27 - markus@cvs.openbsd.org 2001/04/22 13:32:27
[sftp-server.8 sftp.1 ssh.1 sshd.8] [sftp-server.8 sftp.1 ssh.1 sshd.8]
xref draft-ietf-secsh-* xref draft-ietf-secsh-*
- markus@cvs.openbsd.org 2001/04/22 13:41:02
[ssh-keygen.1 ssh-keygen.c]
style, noted by stevesk; sort flags in usage
20010421 20010421
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5222,4 +5225,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1158 2001/04/22 17:17:46 mouring Exp $ $Id: ChangeLog,v 1.1159 2001/04/22 17:19:46 mouring Exp $

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-keygen.1,v 1.37 2001/04/22 13:25:37 markus Exp $ .\" $OpenBSD: ssh-keygen.1,v 1.38 2001/04/22 13:41:02 markus Exp $
.\" .\"
.\" -*- nroff -*- .\" -*- nroff -*-
.\" .\"
@ -157,7 +157,7 @@ This option will read an unencrypted private (or public) key file
in SSH2-compatible format and print an OpenSSH compatible private in SSH2-compatible format and print an OpenSSH compatible private
(or public) key to stdout. (or public) key to stdout.
.Nm .Nm
does also read the also reads the
.Sq SECSH Public Key File Format . .Sq SECSH Public Key File Format .
This option allows importing keys from several commercial This option allows importing keys from several commercial
SSH implementations. SSH implementations.

View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.57 2001/04/22 13:25:37 markus Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.58 2001/04/22 13:41:02 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -628,7 +628,7 @@ do_change_comment(struct passwd *pw)
void void
usage(void) usage(void)
{ {
printf("Usage: %s [-lBpqxiec] [-t type] [-b bits] [-f file] [-C comment] " printf("Usage: %s [-ceilpqyB] [-t type] [-b bits] [-f file] [-C comment] "
"[-N new-pass] [-P pass]\n", __progname); "[-N new-pass] [-P pass]\n", __progname);
exit(1); exit(1);
} }