summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <djm>2011-10-18 05:05:38 +0000
committerdjm <djm>2011-10-18 05:05:38 +0000
commit8eece754c96ef2ece26351c10060d73f8f3deb1c (patch)
tree4b700f0a946ad0bc8124cbe871c4c8d7f1a09d02
parent7b759ecf70d52a64c7431c543818ea36b5cfefde (diff)
downloadopenssh-8eece754c96ef2ece26351c10060d73f8f3deb1c.tar.gz
- jmc@cvs.openbsd.org 2011/10/16 15:02:41
[ssh-keygen.c] put -K in the right place (usage());
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f33f53b..9aaa421b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
- dtucker@cvs.openbsd.org 2011/10/16 11:02:46
[moduli.c ssh-keygen.1 ssh-keygen.c]
Add optional checkpoints for moduli screening. feedback & ok deraadt
+ - jmc@cvs.openbsd.org 2011/10/16 15:02:41
+ [ssh-keygen.c]
+ put -K in the right place (usage());
20111001
- (dtucker) [openbsd-compat/mktemp.c] Fix compiler warning. ok djm
diff --git a/ssh-keygen.c b/ssh-keygen.c
index bd15cccf..53b232d6 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.211 2011/10/16 11:02:46 dtucker Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.212 2011/10/16 15:02:41 jmc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1881,10 +1881,10 @@ usage(void)
fprintf(stderr, " -G file Generate candidates for DH-GEX moduli.\n");
fprintf(stderr, " -g Use generic DNS resource record format.\n");
fprintf(stderr, " -H Hash names in known_hosts file.\n");
- fprintf(stderr, " -K checkpt Write checkpoints to this file.\n");
fprintf(stderr, " -h Generate host certificate instead of a user certificate.\n");
fprintf(stderr, " -I key_id Key identifier to include in certificate.\n");
fprintf(stderr, " -i Import foreign format to OpenSSH key file.\n");
+ fprintf(stderr, " -K checkpt Write checkpoints to this file.\n");
fprintf(stderr, " -L Print the contents of a certificate.\n");
fprintf(stderr, " -l Show fingerprint of key file.\n");
fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n");