summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 598c29e99..ca7cfc8fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
17 - jmc@cvs.openbsd.org 2010/06/30 07:24:25 17 - jmc@cvs.openbsd.org 2010/06/30 07:24:25
18 [ssh-keygen.1] 18 [ssh-keygen.1]
19 tweak previous; 19 tweak previous;
20 - jmc@cvs.openbsd.org 2010/06/30 07:26:03
21 [ssh-keygen.c]
22 sort usage();
20 23
2120100627 2420100627
22 - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs 25 - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs
diff --git a/ssh-keygen.c b/ssh-keygen.c
index be08fbda6..48209380c 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.193 2010/06/29 23:15:30 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.194 2010/06/30 07:26:03 jmc Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1695,18 +1695,18 @@ usage(void)
1695 fprintf(stderr, " -i Import foreign format to OpenSSH key file.\n"); 1695 fprintf(stderr, " -i Import foreign format to OpenSSH key file.\n");
1696 fprintf(stderr, " -L Print the contents of a certificate.\n"); 1696 fprintf(stderr, " -L Print the contents of a certificate.\n");
1697 fprintf(stderr, " -l Show fingerprint of key file.\n"); 1697 fprintf(stderr, " -l Show fingerprint of key file.\n");
1698 fprintf(stderr, " -m key_fmt Conversion format for -e/-i (PEM|PKCS8|RFC4716).\n");
1699 fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n"); 1698 fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n");
1700 fprintf(stderr, " -n name,... User/host principal names to include in certificate\n"); 1699 fprintf(stderr, " -m key_fmt Conversion format for -e/-i (PEM|PKCS8|RFC4716).\n");
1701 fprintf(stderr, " -N phrase Provide new passphrase.\n"); 1700 fprintf(stderr, " -N phrase Provide new passphrase.\n");
1701 fprintf(stderr, " -n name,... User/host principal names to include in certificate\n");
1702 fprintf(stderr, " -O option Specify a certificate option.\n"); 1702 fprintf(stderr, " -O option Specify a certificate option.\n");
1703 fprintf(stderr, " -P phrase Provide old passphrase.\n"); 1703 fprintf(stderr, " -P phrase Provide old passphrase.\n");
1704 fprintf(stderr, " -p Change passphrase of private key file.\n"); 1704 fprintf(stderr, " -p Change passphrase of private key file.\n");
1705 fprintf(stderr, " -q Quiet.\n"); 1705 fprintf(stderr, " -q Quiet.\n");
1706 fprintf(stderr, " -R hostname Remove host from known_hosts file.\n"); 1706 fprintf(stderr, " -R hostname Remove host from known_hosts file.\n");
1707 fprintf(stderr, " -r hostname Print DNS resource record.\n"); 1707 fprintf(stderr, " -r hostname Print DNS resource record.\n");
1708 fprintf(stderr, " -s ca_key Certify keys with CA key.\n");
1709 fprintf(stderr, " -S start Start point (hex) for generating DH-GEX moduli.\n"); 1708 fprintf(stderr, " -S start Start point (hex) for generating DH-GEX moduli.\n");
1709 fprintf(stderr, " -s ca_key Certify keys with CA key.\n");
1710 fprintf(stderr, " -T file Screen candidates for DH-GEX moduli.\n"); 1710 fprintf(stderr, " -T file Screen candidates for DH-GEX moduli.\n");
1711 fprintf(stderr, " -t type Specify type of key to create.\n"); 1711 fprintf(stderr, " -t type Specify type of key to create.\n");
1712 fprintf(stderr, " -V from:to Specify certificate validity interval.\n"); 1712 fprintf(stderr, " -V from:to Specify certificate validity interval.\n");