Add ability for ssh2_userkey_loadpub() to return the key comment.

[PuTTY.git] / windows / wincons.c

diff --git a/windows/wincons.c b/windows/wincons.c
index d3ff56d1037125ea0ccddaee2bcb353edfe2e9ad..c38fa011372fbaf272441497324c19a57423ac96 100644 (file)
--- a/windows/wincons.c
+++ b/windows/wincons.c
@@ -258,7 +258,7 @@ int askappend(void *frontend, Filename filename,
 void old_keyfile_warning(void)
 {
     static const char message[] =
-       "You are loading an SSH 2 private key which has an\n"
+       "You are loading an SSH-2 private key which has an\n"
        "old version of the file format. This means your key\n"
        "file is not fully tamperproof. Future versions of\n"
        "PuTTY may stop supporting this private key format,\n"
@@ -271,6 +271,22 @@ void old_keyfile_warning(void)
     fputs(message, stderr);
 }
 
+/*
+ * Display the fingerprints of the PGP Master Keys to the user.
+ */
+void pgp_fingerprints(void)
+{
+    fputs("These are the fingerprints of the PuTTY PGP Master Keys. They can\n"
+         "be used to establish a trust path from this executable to another\n"
+         "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 "\n", stdout);
+}
+
 void console_provide_logctx(void *logctx)
 {
     console_logctx = logctx;