summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-09-12 13:55:37 +1000
committerDarren Tucker <dtucker@zip.com.au>2016-09-12 13:57:07 +1000
commit43cceff82cc20413cce58ba3375e19684e62cec4 (patch)
tree1b742d3acc33cd0820caaad2e39bae04015e2819 /ssh-keygen.c
parentaf48d541360b1d7737b35740a4b1ca34e1652cd9 (diff)
downloadopenssh-git-43cceff82cc20413cce58ba3375e19684e62cec4.tar.gz
Move ssh-keygen -W handling code to match upstream
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 07f78eef..bf7ade95 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -2448,13 +2448,6 @@ main(int argc, char **argv)
break;
#ifdef WITH_OPENSSL
/* Moduli generation/screening */
- case 'W':
- generator_wanted = (u_int32_t)strtonum(optarg, 1,
- UINT_MAX, &errstr);
- if (errstr)
- fatal("Desired generator has bad value: %s (%s)",
- optarg, errstr);
- break;
case 'G':
do_gen_candidates = 1;
if (strlcpy(out_file, optarg, sizeof(out_file)) >=
@@ -2489,6 +2482,13 @@ main(int argc, char **argv)
sizeof(out_file))
fatal("Output filename too long");
break;
+ case 'W':
+ generator_wanted = (u_int32_t)strtonum(optarg, 1,
+ UINT_MAX, &errstr);
+ if (errstr)
+ fatal("Desired generator has bad value: %s (%s)",
+ optarg, errstr);
+ break;
#endif /* WITH_OPENSSL */
case '?':
default: