Move ssh-keygen -W handling code to match upstream

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 07f78eefb2a5200738f5e3fbfa81481f78924940..bf7ade952d9b97d18107920fb4388c2795222aa0 100644 (file)
--- a/ssh-keygen.c
+++ b/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: