X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinutils.c;h=31b98d18620a055e1d9bbf05fe5a25c640ad2861;hb=f2e76e07dad155a2fdc68930a2e96d6aa2682391;hp=f68405bcdf5eb4ff6b06726cd4358869b591e935;hpb=2ebdd3799d7806d8b569d1591efb2a94b588dec7;p=PuTTY.git

diff --git a/windows/winutils.c b/windows/winutils.c
index f68405bc..31b98d18 100644
--- a/windows/winutils.c
+++ b/windows/winutils.c
@@ -94,7 +94,7 @@ void filereq_free(filereq *state)
 /* Callback function to launch context help. */
 static VOID CALLBACK message_box_help_callback(LPHELPINFO lpHelpInfo)
 {
-    char *context = NULL;
+    const char *context = NULL;
 #define CHECK_CTX(name) \
     do { \
 	if (lpHelpInfo->dwContextId == WINHELP_CTXID_ ## name) \
@@ -142,10 +142,12 @@ void pgp_fingerprints(void)
 		"one. See the manual for more information.\n"
 		"(Note: these fingerprints have nothing to do with SSH!)\n"
 		"\n"
-		"PuTTY Master Key (RSA), 1024-bit:\n"
-		"  " PGP_RSA_MASTER_KEY_FP "\n"
-		"PuTTY Master Key (DSA), 1024-bit:\n"
-		"  " PGP_DSA_MASTER_KEY_FP,
+                "PuTTY Master Key as of 2015 (RSA, 4096-bit):\n"
+                "  " PGP_MASTER_KEY_FP "\n\n"
+                "Original PuTTY Master Key (RSA, 1024-bit):\n"
+                "  " PGP_RSA_MASTER_KEY_FP "\n"
+                "Original PuTTY Master Key (DSA, 1024-bit):\n"
+                "  " PGP_DSA_MASTER_KEY_FP,
 		"PGP fingerprints", MB_ICONINFORMATION | MB_OK,
 		HELPCTXID(pgp_fingerprints));
 }
@@ -363,7 +365,7 @@ void split_into_argv(char *cmdline, int *argc, char ***argv,
 
 		    if (quotes > 0) {
 			/* Outside a quote segment, a quote starts one. */
-			if (!quote) quotes--, quote = 1;
+			if (!quote) quotes--;
 
 			/* Now we produce (n+1)/3 literal quotes... */
 			for (i = 3; i <= quotes+1; i += 3) *q++ = '"';