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

Move ssh-keygen -T handling code to match upstream.
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 09d995ffb..07f78eefb 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -2467,12 +2467,6 @@ main(int argc, char **argv)
 		case 'j':
 			start_lineno = strtoul(optarg, NULL, 10);
 			break;
-		case 'T':
-			do_screen_candidates = 1;
-			if (strlcpy(out_file, optarg, sizeof(out_file)) >=
-			    sizeof(out_file))
-				fatal("Output filename too long");
-			break;
 		case 'K':
 			if (strlen(optarg) >= PATH_MAX)
 				fatal("Checkpoint filename too long");
@@ -2489,6 +2483,12 @@ main(int argc, char **argv)
 			if (BN_hex2bn(&start, optarg) == 0)
 				fatal("Invalid start point.");
 			break;
+		case 'T':
+			do_screen_candidates = 1;
+			if (strlcpy(out_file, optarg, sizeof(out_file)) >=
+			    sizeof(out_file))
+				fatal("Output filename too long");
+			break;
 #endif /* WITH_OPENSSL */
 		case '?':
 		default: