Merge branch 'thirdparty' into thirdparty_dev

Source commit: 7763b0b8ded9327b0cec0d13ecdaf4e38944f94a

source/putty/crypto/kex-hybrid.c

@@ -146,6 +146,7 @@ static bool hybrid_client_getkey(ecdh_key *ek, ptrlen remoteKey, BinarySink *bs)
     if (!ecdh_key_getkey(s->classical, classical_data,
                          BinarySink_UPCAST(classical_key))) {
         ssh_hash_free(h);
+        strbuf_free(classical_key);
         return false;                  /* classical DH key didn't validate */
     }
     s->alg->reformat(ptrlen_from_strbuf(classical_key), BinarySink_UPCAST(h));
@@ -238,6 +239,7 @@ static bool hybrid_server_getkey(ecdh_key *ek, ptrlen remoteKey, BinarySink *bs)
     if (!ecdh_key_getkey(s->classical, classical_data,
                          BinarySink_UPCAST(classical_key))) {
         ssh_hash_free(h);
+        strbuf_free(classical_key);
         return false;                  /* classical DH key didn't validate */
     }
     s->alg->reformat(ptrlen_from_strbuf(classical_key), BinarySink_UPCAST(h));

source/putty/defs.h

@@ -53,6 +53,11 @@ uintmax_t strtoumax(const char *nptr, char **endptr, int base);
 #define SIZEu "zu"
 #endif
 
+#if !HAVE_WMEMCHR
+/* Work around lack of wmemchr in older MSVC */
+wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n);
+#endif
+
 #if defined __GNUC__ || defined __clang__
 /*
  * On MinGW, the correct compiler format checking for vsnprintf() etc

source/putty/doc/plink.but

@@ -41,7 +41,7 @@ use Plink:
 
 \c C:\>plink --help
 \c Plink: command-line connection utility
-\c Release 0.82
+\c Release 0.83
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:

source/putty/doc/pscp.but

@@ -39,7 +39,7 @@ use PSCP:
 
 \c C:\>pscp -h
 \c PuTTY Secure Copy client
-\c Release 0.82
+\c Release 0.83
 \c Usage: pscp [options] [user@]host:source target
 \c        pscp [options] source [source...] [user@]host:target
 \c        pscp [options] -ls [user@]host:filespec

source/putty/doc/puttydoc.txt

@@ -12,7 +12,7 @@ not described here; and the pterm and command-line puttygen and pageant
 utilities are not described at all. The only Unix-specific documentation
 that currently exists is the man pages.
 
-This manual is copyright 1997-2024 Simon Tatham. All rights reserved. You
+This manual is copyright 1997-2025 Simon Tatham. All rights reserved. You
 may distribute this documentation under the MIT licence. See appendix D for
 the licence text in full.
 
@@ -5649,7 +5649,7 @@ Chapter 5: Using PSCP to transfer files securely
 
          C:\>pscp -h
          PuTTY Secure Copy client
-         Release 0.82
+         Release 0.83
          Usage: pscp [options] [user@]host:source target
                 pscp [options] source [source...] [user@]host:target
                 pscp [options] -ls [user@]host:filespec
@@ -6571,7 +6571,7 @@ Chapter 7: Using the command-line connection tool Plink
 
          C:\>plink --help
          Plink: command-line connection utility
-         Release 0.82
+         Release 0.83
          Usage: plink [options] [user@]host [command]
                 ("host" can also be a PuTTY saved session name)
          Options:
@@ -10933,7 +10933,7 @@ Appendix C: PPK file format
 Appendix D: PuTTY Licence
 -------------------------
 
-       PuTTY is copyright 1997-2024 Simon Tatham.
+       PuTTY is copyright 1997-2025 Simon Tatham.
 
        Portions copyright Robert de Bath, Joris van Rantwijk, Delian
        Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
@@ -12878,4 +12878,4 @@ Appendix I: PuTTY privacy considerations
        cannot make any promises about the behaviour of modified versions
        distributed by other people.
 
-[PuTTY pre-release 0.83:2025-01-03.1e45199]
+[PuTTY release 0.83]

source/putty/doc/version.but

@@ -1 +1 @@
-\versionid PuTTY pre-release 0.83:2025-01-03.1e45199
+\versionid PuTTY release 0.83

source/putty/version.h

@@ -1,5 +1,5 @@
 /* Generated by automated build script */
-#define PRERELEASE 0.83
-#define TEXTVER "Pre-release 0.83:2025-01-03.1e45199"
-#define SSHVER "-Prerelease-0.83:20250103.1e45199"
-#define BINARY_VERSION 0,82,33807,0
+#define RELEASE 0.83
+#define TEXTVER "Release 0.83"
+#define SSHVER "-Release-0.83"
+#define BINARY_VERSION 0,83,0,0