diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:55:37 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:57:07 +1000 |
commit | 43cceff82cc20413cce58ba3375e19684e62cec4 (patch) | |
tree | 1b742d3acc33cd0820caaad2e39bae04015e2819 | |
parent | af48d541360b1d7737b35740a4b1ca34e1652cd9 (diff) |
Move ssh-keygen -W handling code to match upstream
-rw-r--r-- | ssh-keygen.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 07f78eefb..bf7ade952 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -2448,13 +2448,6 @@ main(int argc, char **argv) | |||
2448 | break; | 2448 | break; |
2449 | #ifdef WITH_OPENSSL | 2449 | #ifdef WITH_OPENSSL |
2450 | /* Moduli generation/screening */ | 2450 | /* Moduli generation/screening */ |
2451 | case 'W': | ||
2452 | generator_wanted = (u_int32_t)strtonum(optarg, 1, | ||
2453 | UINT_MAX, &errstr); | ||
2454 | if (errstr) | ||
2455 | fatal("Desired generator has bad value: %s (%s)", | ||
2456 | optarg, errstr); | ||
2457 | break; | ||
2458 | case 'G': | 2451 | case 'G': |
2459 | do_gen_candidates = 1; | 2452 | do_gen_candidates = 1; |
2460 | if (strlcpy(out_file, optarg, sizeof(out_file)) >= | 2453 | if (strlcpy(out_file, optarg, sizeof(out_file)) >= |
@@ -2489,6 +2482,13 @@ main(int argc, char **argv) | |||
2489 | sizeof(out_file)) | 2482 | sizeof(out_file)) |
2490 | fatal("Output filename too long"); | 2483 | fatal("Output filename too long"); |
2491 | break; | 2484 | break; |
2485 | case 'W': | ||
2486 | generator_wanted = (u_int32_t)strtonum(optarg, 1, | ||
2487 | UINT_MAX, &errstr); | ||
2488 | if (errstr) | ||
2489 | fatal("Desired generator has bad value: %s (%s)", | ||
2490 | optarg, errstr); | ||
2491 | break; | ||
2492 | #endif /* WITH_OPENSSL */ | 2492 | #endif /* WITH_OPENSSL */ |
2493 | case '?': | 2493 | case '?': |
2494 | default: | 2494 | default: |