From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 12 Sep 2016 03:55:37 +0000 (+1000)
Subject: Move ssh-keygen -W handling code to match upstream
X-Git-Tag: V_7_4_P1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43cceff82cc20413cce58ba3375e19684e62cec4;p=thirdparty%2Fopenssh-portable.git

Move ssh-keygen -W handling code to match upstream
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 07f78eefb..bf7ade952 100644
--- 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: