Centralise host key message formatting.

The format _strings_ were previously centralised into the platform-
independent console.c, as const char arrays. Now the actual formatting
operation is centralised as well, by means of console.c providing a
function that takes all the necessary parameters and returns a
formatted piece of text for the console.

Mostly this is so that I can add extra parameters to the message with
some confidence: changing a format string in one file and two fprintf
statements in other files to match seems like the kind of situation
you wish you hadn't got into in the first place :-)

1 files changed, 21 insertions, 13 deletions

diff --git a/console.c b/console.c
index 7155b9f0..ce70c104 100644
--- a/console.c
+++ b/console.c
@@ -9,11 +9,15 @@
 #include "misc.h"
 #include "console.h"
 
-const char hk_absentmsg_common_fmt[] =
-    "The server's host key is not cached. You have no guarantee\n"
-    "that the server is the computer you think it is.\n"
-    "The server's %s key fingerprint is:\n"
-    "%s\n";
+char *hk_absentmsg_common(const char *keytype, const char *fingerprint)
+{
+    return dupprintf(
+        "The server's host key is not cached. You have no guarantee\n"
+        "that the server is the computer you think it is.\n"
+        "The server's %s key fingerprint is:\n"
+        "%s\n", keytype, fingerprint);
+}
+
 const char hk_absentmsg_interactive_intro[] =
     "If you trust this host, enter \"y\" to add the key to\n"
     "PuTTY's cache and carry on connecting.\n"
@@ -25,14 +29,18 @@ const char hk_absentmsg_interactive_prompt[] =
     "Store key in cache? (y/n, Return cancels connection, "
     "i for more info) ";
 
-const char hk_wrongmsg_common_fmt[] =
-    "WARNING - POTENTIAL SECURITY BREACH!\n"
-    "The server's host key does not match the one PuTTY has\n"
-    "cached. This means that either the server administrator\n"
-    "has changed the host key, or you have actually connected\n"
-    "to another computer pretending to be the server.\n"
-    "The new %s key fingerprint is:\n"
-    "%s\n";
+char *hk_wrongmsg_common(const char *keytype, const char *fingerprint)
+{
+    return dupprintf(
+        "WARNING - POTENTIAL SECURITY BREACH!\n"
+        "The server's host key does not match the one PuTTY has\n"
+        "cached. This means that either the server administrator\n"
+        "has changed the host key, or you have actually connected\n"
+        "to another computer pretending to be the server.\n"
+        "The new %s key fingerprint is:\n"
+        "%s\n", keytype, fingerprint);
+}
+
 const char hk_wrongmsg_interactive_intro[] =
     "If you were expecting this change and trust the new key,\n"
     "enter \"y\" to update PuTTY's cache and continue connecting.\n"