From d8c3cfbb018825c6c86547165ddaf11924901c49 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 12 Sep 2016 13:30:50 +1000 Subject: Move -M handling code to match upstream. --- ssh-keygen.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'ssh-keygen.c') diff --git a/ssh-keygen.c b/ssh-keygen.c index 0149a090d..09d995ffb 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) -- cgit v1.2.3