Key rollover: put the new Master Key fingerprint in the tools.

For the moment we're also retaining the old ones. Not sure when will
be the best time to get rid of those; after the next release, perhaps?

diff --git a/putty.h b/putty.h
index 15ec5b9906c8a92e79690bb75a67e84b2c08dc57..4b22c38e80a28ef936ebebb57c0e1c341f66e5d7 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -31,6 +31,8 @@ typedef struct terminal_tag Terminal;
  * Fingerprints of the PGP master keys that can be used to establish a trust
  * path between an executable and other files.
  */
+#define PGP_MASTER_KEY_FP \
+    "440D E3B5 B7A1 CA85 B3CC  1718 AB58 5DC6 0467 6F7C"
 #define PGP_RSA_MASTER_KEY_FP \
     "8F 15 97 DA 25 30 AB 0D  88 D1 92 54 11 CF 0C 4C"
 #define PGP_DSA_MASTER_KEY_FP \

diff --git a/unix/uxmisc.c b/unix/uxmisc.c
index e6ad3906a97acc9c004a3944a9c8458f50d9e809..2e13b3bb93e11e3d7c09c015f309a0e24d75caa0 100644 (file)
--- a/unix/uxmisc.c
+++ b/unix/uxmisc.c
@@ -163,9 +163,11 @@ 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"
+         "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"
-         "PuTTY Master Key (DSA), 1024-bit:\n"
+         "Original PuTTY Master Key (DSA, 1024-bit):\n"
          "  " PGP_DSA_MASTER_KEY_FP "\n", stdout);
 }
 

diff --git a/windows/wincons.c b/windows/wincons.c
index b0ca5f2e262f0bc54ffac5c28967c396a1ccd84b..0b60e1849712a879477490f8803350a65517408a 100644 (file)
--- a/windows/wincons.c
+++ b/windows/wincons.c
@@ -281,9 +281,11 @@ 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"
+         "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"
-         "PuTTY Master Key (DSA), 1024-bit:\n"
+         "Original PuTTY Master Key (DSA, 1024-bit):\n"
          "  " PGP_DSA_MASTER_KEY_FP "\n", stdout);
 }
 

diff --git a/windows/winutils.c b/windows/winutils.c
index c81e7fe0c040744f5e0e5e950f6cab5685d3f33b..c49612e535795a066bcaee0f960bdb59c5d818f2 100644 (file)
--- a/windows/winutils.c
+++ b/windows/winutils.c
@@ -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));
 }