Merge branch 'thirdparty_dev' into dev

Conflicts:
	source/putty/ssh.c

Source commit: cf764e14ff13da4f5831b29c41bef63cecfcf5ce

source/putty/putty.h

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

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
  *    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.
  *
  *  - OUR_V2_BIGWIN is the window size we advertise for the only
@@ -7334,7 +7334,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.
 	 */
 	{
-	    int i, j;
+	    int i, j, nkeys = 0;
 	    char *list = NULL;
 	    for (i = 0; i < lenof(hostkey_algs); i++) {
 		if (hostkey_algs[i].alg == ssh->hostkey)
@@ -7353,13 +7353,15 @@ static void do_ssh2_transport(Ssh ssh, const void *vin, int inlen,
 			newlist = dupprintf("%s", hostkey_algs[i].alg->name);
 		    sfree(list);
 		    list = newlist;
+		    nkeys++;
 		}
 	    }
 	    if (list) {
 		logeventf(ssh,
 			  "Server also has %s host key%s, but we "
 			  "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);
 	    }
 	}

source/putty/ssh.h

@@ -504,7 +504,7 @@ void aes_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len);
 /*
  * 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

source/putty/version.h

@@ -1,5 +1,5 @@
 /* Generated by automated build script */
 #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

source/putty/windows/winsecur.c

@@ -241,7 +241,7 @@ int setprocessacl(char *error)
     int ret=FALSE;
     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_DUP_HANDLE |
 	PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION |