Handle packets with no type byte by returning SSH_MSG_UNIMPLEMENTED.

[PuTTY.git] / unix / uxmisc.c

diff --git a/unix/uxmisc.c b/unix/uxmisc.c
index 95133a0393e4379d93cecb7695f238caeda30328..a7a2fcb93576bf7248a409757458a41fdbe0b827 100644 (file)
--- a/unix/uxmisc.c
+++ b/unix/uxmisc.c
@@ -95,16 +95,23 @@ Filename *filename_deserialise(void *vdata, int maxsize, int *used)
     return filename_from_str(data);
 }
 
+char filename_char_sanitise(char c)
+{
+    if (c == '/')
+        return '.';
+    return c;
+}
+
 #ifdef DEBUG
 static FILE *debug_fp = NULL;
 
-void dputs(char *buf)
+void dputs(const char *buf)
 {
     if (!debug_fp) {
        debug_fp = fopen("debug.log", "w");
     }
 
-    write(1, buf, strlen(buf));
+    if (write(1, buf, strlen(buf)) < 0) {} /* 'error check' to placate gcc */
 
     fputs(buf, debug_fp);
     fflush(debug_fp);
@@ -163,9 +170,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);
 }