diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:30:50 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-09-12 13:51:04 +1000 |
| commit | d8c3cfbb018825c6c86547165ddaf11924901c49 (patch) | |
| tree | f0651592e7a5c446a0497256c2e420f9e4dff713 /ssh-keygen.c | |
| parent | 7b63cf6dbbfa841c003de57d1061acbf2ff22364 (diff) | |
| download | openssh-git-d8c3cfbb018825c6c86547165ddaf11924901c49.tar.gz | |
Move -M handling code to match upstream.
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 0149a090..09d995ff 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -2455,11 +2455,6 @@ main(int argc, char **argv) fatal("Desired generator has bad value: %s (%s)", optarg, errstr); break; - case 'M': - memory = (u_int32_t)strtonum(optarg, 1, UINT_MAX, &errstr); - if (errstr) - fatal("Memory limit is %s: %s", errstr, optarg); - break; case 'G': do_gen_candidates = 1; if (strlcpy(out_file, optarg, sizeof(out_file)) >= @@ -2483,6 +2478,12 @@ main(int argc, char **argv) fatal("Checkpoint filename too long"); checkpoint = xstrdup(optarg); break; + case 'M': + memory = (u_int32_t)strtonum(optarg, 1, UINT_MAX, + &errstr); + if (errstr) + fatal("Memory limit is %s: %s", errstr, optarg); + break; case 'S': /* XXX - also compare length against bits */ if (BN_hex2bn(&start, optarg) == 0) |