فهرست منبع

Merge branch 'thirdparty'

Source commit: 59e298e83f9891d9aac94b1ea2d27c38ecd41b64
Martin Prikryl 8 ماه پیش
والد
کامیت
7d468363f9
3فایلهای تغییر یافته به همراه11 افزوده شده و 4 حذف شده
  1. 2 0
      source/putty/crypto/kex-hybrid.c
  2. 5 0
      source/putty/defs.h
  3. 4 4
      source/putty/version.h

+ 2 - 0
source/putty/crypto/kex-hybrid.c

@@ -155,6 +155,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));
@@ -255,6 +256,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));

+ 5 - 0
source/putty/defs.h

@@ -58,6 +58,11 @@
 #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

+ 4 - 4
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