From aaeaae00a9e652afe5bf1300f00f45ef1904033d Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 2 Sep 2015 18:31:24 +0100 Subject: [PATCH] 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? (cherry picked from commit e88b8d21f2f7a73cd9e2f21bcb408b2abebd0667) --- putty.h | 2 ++ unix/uxmisc.c | 6 ++++-- windows/wincons.c | 6 ++++-- windows/winutils.c | 10 ++++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/putty.h b/putty.h index e030df79..add92c8b 100644 --- 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 e65a3869..61a44d57 100644 --- a/unix/uxmisc.c +++ b/unix/uxmisc.c @@ -162,9 +162,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 508be3f8..198ff9a7 100644 --- 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 f68405bc..ef0db921 100644 --- 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)); }