浏览代码

PuTTY 2016-04-17.b22c0b6

Source commit: c209d915eaee1a6971ba767d869692ed62567c8c
Martin Prikryl 9 年之前
父节点
当前提交
c18d848a43
共有 6 个文件被更改,包括 16 次插入13 次删除
  1. 1 1
      source/putty/WINDOWS/winsecur.c
  2. 5 4
      source/putty/doc/config.but
  3. 1 1
      source/putty/putty.h
  4. 5 3
      source/putty/ssh.c
  5. 1 1
      source/putty/ssh.h
  6. 3 3
      source/putty/version.h

+ 1 - 1
source/putty/WINDOWS/winsecur.c

@@ -231,7 +231,7 @@ int setprocessacl(char *error)
     int ret=FALSE;
     int ret=FALSE;
     PACL acl = NULL;
     PACL acl = NULL;
 
 
-    static const nastyace=WRITE_DAC | WRITE_OWNER |
+    static const DWORD nastyace=WRITE_DAC | WRITE_OWNER |
 	PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD |
 	PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD |
 	PROCESS_DUP_HANDLE |
 	PROCESS_DUP_HANDLE |
 	PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION |
 	PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION |

+ 5 - 4
source/putty/doc/config.but

@@ -2394,15 +2394,16 @@ PuTTY currently supports the following key exchange methods:
 2048-bit group.
 2048-bit group.
 
 
 \b \q{Group 1}: Diffie-Hellman key exchange with a well-known
 \b \q{Group 1}: Diffie-Hellman key exchange with a well-known
-1024-bit group. This is less secure \#{FIXME better words} than
-group 14, but may be faster with slow client or server machines,
-and may be the only method supported by older server software.
+1024-bit group. We no longer recommend using this method, and it's
+not used by default in new installations; however, it may be the
+only method supported by very old server software.
 
 
 \b \q{\ii{Group exchange}}: with this method, instead of using a fixed
 \b \q{\ii{Group exchange}}: with this method, instead of using a fixed
 group, PuTTY requests that the server suggest a group to use for key
 group, PuTTY requests that the server suggest a group to use for key
 exchange; the server can avoid groups known to be weak, and possibly
 exchange; the server can avoid groups known to be weak, and possibly
 invent new ones over time, without any changes required to PuTTY's
 invent new ones over time, without any changes required to PuTTY's
-configuration. We recommend use of this method, if possible.
+configuration. We recommend use of this method instead of the
+well-known groups, if possible.
 
 
 \b \q{\i{RSA key exchange}}: this requires much less computational
 \b \q{\i{RSA key exchange}}: this requires much less computational
 effort on the part of the client, and somewhat less on the part of
 effort on the part of the client, and somewhat less on the part of

+ 1 - 1
source/putty/putty.h

@@ -1158,7 +1158,7 @@ void ser_setup_config_box(struct controlbox *b, int midsession,
 /*
 /*
  * Exports from version.c.
  * Exports from version.c.
  */
  */
-extern char ver[];
+extern const char ver[];
 
 
 /*
 /*
  * Exports from unicode.c.
  * Exports from unicode.c.

+ 5 - 3
source/putty/ssh.c

@@ -384,7 +384,7 @@ static void ssh2_msg_something_unimplemented(Ssh ssh, struct Packet *pktin);
  *    ensure that the server never has any need to throttle its end
  *    ensure that the server never has any need to throttle its end
  *    of the connection), so we set this high as well.
  *    of the connection), so we set this high as well.
  * 
  * 
- *  - OUR_V2_WINSIZE is the maximum window size we present on SSH-2
+ *  - OUR_V2_WINSIZE is the default window size we present on SSH-2
  *    channels.
  *    channels.
  *
  *
  *  - OUR_V2_BIGWIN is the window size we advertise for the only
  *  - OUR_V2_BIGWIN is the window size we advertise for the only
@@ -7309,7 +7309,7 @@ static void do_ssh2_transport(Ssh ssh, const void *vin, int inlen,
 	 * Make a note of any other host key formats that are available.
 	 * Make a note of any other host key formats that are available.
 	 */
 	 */
 	{
 	{
-	    int i, j;
+	    int i, j, nkeys = 0;
 	    char *list = NULL;
 	    char *list = NULL;
 	    for (i = 0; i < lenof(hostkey_algs); i++) {
 	    for (i = 0; i < lenof(hostkey_algs); i++) {
 		if (hostkey_algs[i].alg == ssh->hostkey)
 		if (hostkey_algs[i].alg == ssh->hostkey)
@@ -7328,13 +7328,15 @@ static void do_ssh2_transport(Ssh ssh, const void *vin, int inlen,
 			newlist = dupprintf("%s", hostkey_algs[i].alg->name);
 			newlist = dupprintf("%s", hostkey_algs[i].alg->name);
 		    sfree(list);
 		    sfree(list);
 		    list = newlist;
 		    list = newlist;
+		    nkeys++;
 		}
 		}
 	    }
 	    }
 	    if (list) {
 	    if (list) {
 		logeventf(ssh,
 		logeventf(ssh,
 			  "Server also has %s host key%s, but we "
 			  "Server also has %s host key%s, but we "
 			  "don't know %s", list,
 			  "don't know %s", list,
-			  j > 1 ? "s" : "", j > 1 ? "any of them" : "it");
+			  nkeys > 1 ? "s" : "",
+			  nkeys > 1 ? "any of them" : "it");
 		sfree(list);
 		sfree(list);
 	    }
 	    }
 	}
 	}

+ 1 - 1
source/putty/ssh.h

@@ -489,7 +489,7 @@ void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len);
 /*
 /*
  * PuTTY version number formatted as an SSH version string. 
  * PuTTY version number formatted as an SSH version string. 
  */
  */
-extern char sshver[];
+extern const char sshver[];
 
 
 /*
 /*
  * Gross hack: pscp will try to start SFTP but fall back to scp1 if
  * Gross hack: pscp will try to start SFTP but fall back to scp1 if

+ 3 - 3
source/putty/version.h

@@ -1,5 +1,5 @@
 /* Generated by automated build script */
 /* Generated by automated build script */
 #define SNAPSHOT
 #define SNAPSHOT
-#define TEXTVER "Development snapshot 2016-04-07.8552f5c"
-#define SSHVER "PuTTY-Snapshot-2016-04-07.8552f5c"
-#define BINARY_VERSION 0,67,1038,0
+#define TEXTVER "Development snapshot 2016-04-17.b22c0b6"
+#define SSHVER "PuTTY-Snapshot-2016-04-17.b22c0b6"
+#define BINARY_VERSION 0,67,1048,0