Move ssh-keygen -W handling code to match upstream
This commit is contained in:
parent
af48d54136
commit
43cceff82c
14
ssh-keygen.c
14
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:
|
||||
|
|
Loading…
Reference in New Issue