Martin Prikryl
c2b33b0ab8
Merge branch 'thirdparty' into thirdparty_dev
...
Source commit: b3c635d0bc952db5330b472a85b31c8b5508db6a
2026-10-07 16:39:11 +02:00
Martin Prikryl
9c19e6d63c
Expat 2.9.0
...
Source commit: 9520d6bddf1be7c834a80342838ef015b8ea9999
2026-10-07 00:39:45 +02:00
Martin Prikryl
88bc64b2f7
Merge branch 'thirdparty' into thirdparty_dev
...
Source commit: 1d66c7725b914100dd24ce5505852e12ef31e919
2026-10-01 00:41:46 +02:00
Martin Prikryl
76ef84ee9f
OpenSSL 3.5.9
...
Source commit: 576ad7c53795c8bad0ac3c54f37ffd83319c0077
2026-10-01 00:38:31 +02:00
Martin Prikryl
1135b2ee10
JclStreams unit is not being used
...
Source commit: 481d128d5f19978a3b955b62c9c53bde3c25c23c
2026-09-26 00:36:44 +02:00
Martin Prikryl
e3f0c9318c
JCL 2.9.9331 (as of 10b92737)
...
includes: Fix two bugs in the JCLDebug address to source lookup
(though it does not seem to have any positive impact on exception stack trace collection)
Source commit: e49c36ce4a97a6eeb4a1f43743893fdab854ba50
2026-09-26 00:35:44 +02:00
Martin Prikryl
6814e509cf
Expat 2.8.5
...
Source commit: 1faef679c1850b80451cfda839d0a3b1ea197c41
2026-09-26 00:34:43 +02:00
Martin Prikryl
a07c0db352
Merge branch 'thirdparty' into thirdparty_dev
...
Source commit: 2b551128daa4fd3c68e55523c2d8de2e6b61636a
2026-09-03 16:42:15 +02:00
Martin Prikryl
f48325f758
Expat 2.8.4
...
Source commit: 47ffe2198fed8a585d5ca8d6d7124598408897bd
2026-09-02 00:35:39 +02:00
Martin Prikryl
9b97647b53
Merge branch 'thirdparty' into thirdparty_dev
...
Source commit: 430099d74de2146d2b55eef6de7b4dbb0a5cccdb
2026-08-27 00:39:19 +02:00
Martin Prikryl
a168770743
OpenSSL 3.5.8
...
Source commit: ba6936b76d9bf4f428bfbc29abbe02df58a16e65
2026-08-27 00:35:11 +02:00
Martin Prikryl
b3732d9b70
PuTTY 0.85
...
Source commit: c9fb0e3663609e43f0fc37e1e96e9f2177809f15
2026-08-26 16:06:53 +02:00
Martin Prikryl
9d2ab68f0f
Merge branch 'thirdparty_hotfix' into thirdparty
...
Source commit: 29cd13353b04e1e8333d6a4e5308ca72111e9029
2026-08-26 16:04:08 +02:00
Simon Tatham
2b1419f914
Validate Argon2 parameters when loading a PPK file.
...
This prevents a couple of different possible crashes if a PPK file
constructed by something other than PuTTYgen contains invalid
parameters. If parallelism is 0 then the Argon2 code can divide by
zero; if the memory requirement is too small for the parallelism then
it can overrun a buffer.
Signed-off-by: Martin Prikryl <martin@winscp.net >
Source commit: e66db8e4bd600fd9d92467fb8b6cc31cd86fc0ad
2026-08-26 00:45:11 +02:00
Simon Tatham
f4157b1cd4
Reject remote max packet size 0 when opening channels.
...
This case led to a tight loop in ssh2_try_send, which would calculate
the largest size of data packet it could send on a channel as the min
of various things including the max packet size; find, of course, that
the largest size was therefore 0; send no data; and loop round again
to keep trying.
There's nothing you can sensibly do about that by the time you get to
ssh2_try_send, so a better response is to reject the connection at
open time.
When the connection is initiated from the far end (i.e. we receive
CHANNEL_OPEN) we can do this relatively nondestructively, by rejecting
just that one channel-open request. When it's initiated from our end,
and the CHANNEL_OPEN_CONFIRMATION we got back contained the zero
maxpkt, there's no similar protocol method for rejecting the
confirmation, so instead we disconnect the whole SSH session.
(That seems harsh, but I think it's reasonable, because one reason for
aborting an SSH connection is that you genuinely don't _know_ what
your client can legally do next – and this is exactly that situation.)
Signed-off-by: Martin Prikryl <martin@winscp.net >
Source commit: 5b7de97f5fcb3f4b957e9585ea15018831c8b547
2026-08-26 00:44:50 +02:00
Simon Tatham
28b3293ac1
Fix buffer overflow in ETM mode packet decode.
...
The space allocated for the decrypted packet was 4 bytes too small,
because we end up reading (s->packetlen + s->maclen) bytes into it,
but we allocated the buffer based on the largest possible size of
(s->len + s->maclen). The two differ by 4. So if a packet is within 4
bytes of the largest size accepted by the check of s->len against
OUR_V2_PACKETLIMIT, then it overruns the buffer allocated for the
following BPP_READ.
Thanks to Yukihiro Nakamura for spotting this.
Signed-off-by: Martin Prikryl <martin@winscp.net >
Source commit: dc1ea030899bc7ec7ed4388cfc01757c41816f0c
2026-08-26 00:44:30 +02:00
Martin Prikryl
570749eb9d
Merge branch 'thirdparty' into thirdparty_dev
...
Source commit: b4f7f270a752918a7fadcca757ea4bb39ca339fa
2026-08-22 01:28:19 +02:00
Martin Prikryl
f8247526e4
Expat 2.8.3
...
Source commit: 12eb4234f9ccfec589a52cd7d76da604e75e1da1
2026-08-16 01:26:34 +02:00
Martin Prikryl
fc2b9236e9
Expat 2.8.2
...
Source commit: 0542fa1babe450ff98112f020e675f6feb6dffe0
2026-06-27 00:56:14 +02:00
Martin Prikryl
5d97b8536c
Merge branch 'thirdparty_dev' into thirdparty
...
Source commit: 1c336eeed58e33f7af7dbcab60fc5bb25d048ca2
2026-06-22 17:15:01 +02:00
Martin Prikryl
538bc331dd
Merge branch 'thirdparty' into thirdparty_hotfix
...
Source commit: 2c3cdff2c1af637c9ccf0aa5dee28772eb42cc97
2026-06-22 17:13:15 +02:00
Martin Prikryl
ddb5169345
JCL 2.9.9331 (as of 9ad7db4, though the last affecting the included files is c669fd1)
...
Source commit: 9db09f5310783c27512d41d53bff85f9f0bfc63e
2026-06-17 01:02:07 +02:00
Martin Prikryl
fd2d89bb47
Syncing ignore rules with dev branch
...
Source commit: b5069ce60aeb569660d9b4f4cb1a50500690f532
2026-06-17 00:57:17 +02:00
Martin Prikryl
86d1ef99b1
OpenSSL 3.5.7
...
Source commit: 1c948c123bc7fe5c5dd0d6fd7a725eba2fc8af3d
2026-06-11 00:57:07 +02:00
Martin Prikryl
73b1d4fc76
Merge branch 'thirdparty' into thirdparty_dev
...
Source commit: 12526721edcc2390c0c67f4fa0b69689f648ef79
2026-06-02 01:29:45 +02:00
Martin Prikryl
f0ce0b0a1e
Merge branch 'thirdparty_hotfix' into thirdparty
...
Source commit: 109ed37d677485c2d53f226882338cff6195d87a
2026-06-02 01:16:45 +02:00
Martin Prikryl
95ac37750b
rsakex-double-free and ecdsa-remotely-triggerable-assertion fixes from PuTTY 0.84
...
Source commit: 5fae646d5c4e8b820fe0a423f2758c33259f0b4e
2026-06-02 01:14:19 +02:00
Martin Prikryl
94af53fd2d
rsakex-double-free and ecdsa-remotely-triggerable-assertion fixes from PuTTY 0.84
...
(cherry picked from commit 5fae646d5c4e8b820fe0a423f2758c33259f0b4e)
Source commit: 309869e4787025160d0b47f342a26e18e8605d89
2026-06-02 01:04:36 +02:00
Martin Prikryl
fbc97830e9
PuTTY 0.84
...
Source commit: 74c128b1c46223d1ff41e055c5fadd44bf73dbe4
2026-05-30 01:01:18 +02:00
Martin Prikryl
1879dc7a0d
Expat 2.8.1
...
Source commit: 22774117d76e43bc57ff1e12423ca6ee12c75830
2026-05-14 00:59:49 +02:00
Martin Prikryl
8e40068507
JCL configuration file for 64-bit
...
Same steps as for jcld28win32.inc, just with "RAD Studio 11 64 bit"
Source commit: 9cc0e019d35253d4f71862c01703d063ff63d7b6
2026-05-07 00:58:55 +02:00
Martin Prikryl
481b19aba5
Expat 2.8.0
...
Source commit: 74e09188924a23353c8da0927f68f70858e44e88
2026-04-28 07:10:02 +02:00
Martin Prikryl
a1e18b6312
OpenSSL 3.5.6
...
Source commit: 8fbe63cb73d53c5cf2262c44d963a7ed0aa4c241
2026-04-08 17:09:23 +02:00
Martin Prikryl
51fe63f6e3
Fake/Noop merge of OpenSSL 3.3.7 as we use OpenSSL 3.5 on the dev branch
...
Merge branch 'thirdparty' into thirdparty_dev
# Conflicts:
# libs/openssl/CHANGES.md
# libs/openssl/NEWS.md
# libs/openssl/VERSION.dat
# libs/openssl/apps/lib/app_provider.c
# libs/openssl/apps/lib/cmp_mock_srv.c
# libs/openssl/crypto/bn/bn_mont.c
# libs/openssl/crypto/cms/cms_asn1.c
# libs/openssl/crypto/cms/cms_dh.c
# libs/openssl/crypto/cms/cms_smime.c
# libs/openssl/crypto/conf/conf_lib.c
# libs/openssl/crypto/evp/digest.c
# libs/openssl/crypto/evp/e_des3.c
# libs/openssl/crypto/evp/evp_enc.c
# libs/openssl/crypto/evp/kem.c
# libs/openssl/crypto/http/http_client.c
# libs/openssl/crypto/init.c
# libs/openssl/crypto/perlasm/x86_64-xlate.pl
# libs/openssl/crypto/pkcs7/pk7_lib.c
# libs/openssl/crypto/riscvcap.c
# libs/openssl/crypto/x509/pcy_tree.c
# libs/openssl/crypto/x509/v3_san.c
# libs/openssl/crypto/x509/x509_vfy.c
# libs/openssl/crypto/x509/x_pubkey.c
# libs/openssl/doc/man1/CA.pl.pod
# libs/openssl/doc/man1/openssl-ciphers.pod.in
# libs/openssl/doc/man3/EVP_EncryptInit.pod
# libs/openssl/doc/man7/provider-base.pod
# libs/openssl/include/crypto/aes_platform.h
# libs/openssl/include/crypto/evp.h
# libs/openssl/include/openssl/core_dispatch.h
# libs/openssl/include/openssl/types.h
# libs/openssl/providers/fips-sources.checksums
# libs/openssl/providers/fips.checksum
# libs/openssl/providers/implementations/ciphers/ciphercommon.c
# libs/openssl/providers/implementations/kem/rsa_kem.c
# libs/openssl/providers/implementations/signature/dsa_sig.c
# libs/openssl/providers/implementations/signature/ecdsa_sig.c
# libs/openssl/providers/implementations/signature/sm2_sig.c
# libs/openssl/providers/implementations/storemgmt/file_store.c
# libs/openssl/providers/implementations/storemgmt/winstore_store.c
# libs/openssl/test/asn1_encode_test.c
# libs/openssl/test/bntest.c
# libs/openssl/test/evp_extra_test.c
# libs/openssl/test/ossl_store_test.c
# libs/openssl/test/recipes/80-test_cms.t
# libs/openssl/test/recipes/80-test_ocsp.t
# libs/openssl/test/sslapitest.c
# libs/openssl/util/mkerr.pl
# libs/openssl/util/platform_symbols/windows-symbols.txt
# libs/openssl/util/wrap.pl.in
Source commit: 7b7deb6234bc92970d820c25b1f10cd403bff5a1
2026-04-08 15:15:54 +02:00
Martin Prikryl
ad3406fad9
OpenSSL 3.3.7
...
Source commit: 88fdb4d0805580453d3eda76a0950fcf5c75c704
2026-04-08 15:03:44 +02:00
Martin Prikryl
02eafe0288
Merge branch 'thirdparty_hotfix' into thirdparty
...
Source commit: 0abc746690d8bf93ae303dddd2c9d1d4d1bc13cd
2026-04-08 12:58:25 +02:00
Martin Prikryl
8c498dcbac
Expat 2.7.5
...
(cherry picked from commit ef26f43dee
2026-04-06 13:00:08 +02:00
Martin Prikryl
c2172b65ae
Expat 2.7.4
...
(cherry picked from commit 9830812690
2026-04-06 12:57:53 +02:00
Martin Prikryl
fae0318289
neon 0.37.1
...
Source commit: c37fcebdcfd5eb3f4181be05ecfe0de9365dac65
2026-03-19 01:38:17 +01:00
Martin Prikryl
5ad2bb89b6
Merge branch 'thirdparty' into thirdparty_dev
...
Source commit: 6825732fcf58cb870af112219026e32d55e6a62d
2026-03-19 01:14:22 +01:00
Martin Prikryl
ef26f43dee
Expat 2.7.5
...
Source commit: 007e278da76849e3b8b6643ee79e7c493eb495af
2026-03-19 01:11:04 +01:00
Martin Prikryl
a24a1842ec
Expat 2.7.4
...
(cherry picked from commit 9830812690
2026-03-19 01:08:41 +01:00
Martin Prikryl
e883e08efd
neon 0.37.0
...
Source commit: a5d0f35f8e2d7d27812c57c74e315e8fdd733200
2026-03-10 01:15:18 +01:00
Martin Prikryl
9830812690
Expat 2.7.4
...
Source commit: 728260fa517017952e5613c861af24ed90103b9a
2026-02-02 08:20:12 +01:00
Martin Prikryl
a3d1ddb18f
OpenSSL 3.5.5
...
Source commit: 6e1d3a2b8ad5e23bd17bd3f028e864dbd8533dc2
2026-01-29 01:29:09 +01:00
Martin Prikryl
b1646559da
Fake/Noop merge of OpenSSL 3.3.6 as we use OpenSSL 3.5 on the dev branch
...
Merge branch 'thirdparty' into thirdparty_dev
Source commit: 9c99bb876db02428b7913074b6fc41bc58326ed7
2026-01-28 13:33:26 +01:00
Martin Prikryl
255fc56feb
OpenSSL 3.3.6
...
Source commit: eefce3591c68209f873dcdd2c2e06d72cde9d4e5
2026-01-28 13:21:37 +01:00
Martin Prikryl
05ece8ad5a
neon 0.36.0
...
Source commit: 9d1b1674546e1740cb864b7653b304d919d84061
2025-11-28 16:36:38 +01:00
Martin Prikryl
2f855773b3
libs3 Commit 98f667b2 (2024-04-24)
...
No relevant changes
Source commit: 39958cec990324aed938ca5fbd1b9b373a92bf70
2025-11-22 01:23:46 +01:00
Martin Prikryl
1cb9ac3efd
Neon commit c0584f37 (Catch ERR_LIB_SYS errors and handle map the returned errno correctly)
...
Needed for compatibility with OpenSSH 3.4+
https://github.com/notroj/neon/pull/214
https://github.com/notroj/neon/issues/213
Source commit: 297818a98b00154e9110d0f3bb1ffe2842195072
2025-11-21 01:15:11 +01:00
