Move -M handling code to match upstream.

1 files changed, 6 insertions, 5 deletions

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)