1
0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Commit Graph

125 Commits

Author SHA1 Message Date
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
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
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
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
fbc97830e9 PuTTY 0.84
Source commit: 74c128b1c46223d1ff41e055c5fadd44bf73dbe4
2026-05-30 01:01:18 +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
e3e7c1c6cd JCL 2.8.1
jcld28win32.inc:
Install.bat
Selected RAD Studio 11 32 bit
Kept all defaults
Checked Install selected only
Clicked Install
Copied all files that we use to thirdparty branch
Uninstall

Source commit: a4029c76ca6ba3df0c08a4a35cc5707660ccf5a8
2025-10-07 01:16:52 +02:00
Martin Prikryl
cfd13d0b81 JCL 2.8.5677 (46230863)
Source commit: b6a0a02b42954f3f39daf4fbcc56377947918300
2025-06-17 01:09:46 +02:00
Martin Prikryl
cfd8d4fb6b PuTTY 0.83
Source commit: b0090a95261e1444074c54571fefe51629b4204b
2025-02-09 00:56:05 +01:00
Martin Prikryl
8459471bad PuTTY Pre-release 0.83:2025-01-03.1e45199
Source commit: 1675133a3ca89ff21576d3c554b83fcb225d73c3
2025-01-05 00:55:14 +01:00
Martin Prikryl
40a4605884 ntru.c wasn't updated to PuTTY 0.82 version
Source commit: d15573b0c073224ff745d949d08e15695cf8815c
2024-12-28 01:01:20 +01:00
Martin Prikryl
dd6b6bb399 Synchronizing set of PuTTY files on thirdparty and main branches
Source commit: 1c3e3c03392fb78531d4422438f6af8f8739880f
2024-12-28 00:54:41 +01:00
Martin Prikryl
4c273d6840 Removing unneeded PuTTY files
(added in 0.78/6.0, but never really needed)

Source commit: f82f7ccdcf54dc626582e55c46af10fb81eac87e
2024-12-07 01:19:42 +01:00
Martin Prikryl
6c12cb97d7 PuTTY 0.82 + Giving up on trying to not-link PuTTY unicode implementation
Source commit: 510b30d0a40b051c780d3d3e69b3b57cf4e25a05
2024-12-05 14:57:30 +01:00
Martin Prikryl
0e0fe9048c Newly needed JCL files
(JclAnsiStrings was needed already before, but until now the few needed function were manually duplicated into the target files)

Source commit: 90fe814e9098ad9611addb3fb404dd45147ed9e6
2024-05-23 01:21:04 +02:00
Martin Prikryl
73c71c2709 JCL 2.8.5677 (6380ce72)
Source commit: a353617364b40ea8e697a5be0ec85dd588d15255
2024-05-23 01:13:27 +02:00
Martin Prikryl
aa71679e20 PuTTY 0.81
Source commit: 35dc31e2b42102abff4636642858c21ea74b8791
2024-04-16 12:14:36 +02:00
Martin Prikryl
1d7d01ad70 PuTTY 0.80
Source commit: 04e78706e91713a0bbe3be3d75fc7882165d974a
2023-12-20 13:39:56 +01:00
Martin Prikryl
582c23143c PuTTY 0.79
Source commit: 4a8d5c29ffe60f2cd05100d3257a5bdcd1626ae3
2023-08-27 01:17:08 +02:00
Martin Prikryl
82ed0ab10a PuTTY Pre-release 0.79:2023-08-24.27f0140
Source commit: c3526b15b5ac41f430909d228fe11655dcf46282
2023-08-25 01:16:32 +02:00
Martin Prikryl
f7bc002428 PuTTY Pre-release 0.79:2023-05-22.56b16bd
Source commit: b8854c20303cf71066ac3421b037f7bd737c21d6
2023-05-22 17:19:40 +02:00
Martin Prikryl
2d5f6de479 Bug 2188 – Work around key algorithm naming change in OpenSSH 7.7 and older
https://winscp.net/tracker/2188

Cherry picking from Pre-release of 0.79:
- userauth: fix replacement of embedded with detached RSA cert
https://git.tartarus.org/?p=simon/putty.git;a=commit;h=cfe6fd95a77202a77ba552437ab0ead5ebd11316
- Work around key algorithm naming change in OpenSSH <= 7.7
https://git.tartarus.org/?p=simon/putty.git;a=commit;h=d66335663406b70391f6e08c941c7cee2f07eea4

Source commit: 47f1eec6558a7ef2bf40602ff0786b2a4e7cbe6b
2023-05-20 01:19:30 +02:00
Martin Prikryl
a4b3791c54 PuTTY 0.78
Source commit: 4eba336bd557f717ffaa78be798684bf09042571
2022-12-03 00:54:15 +01:00
Martin Prikryl
38c2b63167 PngComponents V1.9.0
Source commit: 53b9aa78730ab3ec06ff8c73dfa0be6d8506c411
2022-06-21 00:59:56 +02:00
Martin Prikryl
0006b066e5 PuTTY 0.77
Source commit: 4460e89e63d91ff048baf208874bcb2ead90b835
2022-06-03 00:57:22 +02:00
Martin Prikryl
095f5140af PuTTY snapshot a101444d (New script to draw the icons as SVG – 2022-03-18 – current)
Source commit: 8c85471f1d873833dd2e36c97a111c0f297df200
2022-03-30 01:17:44 +02:00
Martin Prikryl
6c875ff226 PuTTY 2022-02-22.d73a6d6
Latest version as on now, but primarily to get "HTTP proxy fixes"

Source commit: 78ea3fb48af64f32a6f306da5bc81d659932cf6e
2022-02-24 01:01:02 +01:00
Martin Prikryl
9dae2237ad Removing unused PuTTY source files
(cherry picked from commit 2ab20bb81b)

Source commit: e7a2e0d74967048861eaf0c19c53f6e4193bc1ef
2022-02-07 11:57:20 +01:00
Martin Prikryl
936ab62732 PuTTY 0.77 2022-01-22 Pre-release
Source commit: fe07f3c4a6b19aa55f5b7d58e66cb55365edc059
2022-02-04 19:45:22 +01:00
Martin Prikryl
79cb29ddec Removing support for SSH-1
(cherry picked from commit 5dfcf1eb9f)

# Conflicts:

#	source/putty/ssh.c

#	source/putty/sshbpp.h

(cherry picked from commit 9e4470ac40)

Source commit: a090a2683d56dcfa4614fafada60cebe79eeea6b
2022-01-26 10:52:04 +01:00
Martin Prikryl
c7cc91c877 PuTTY 0.76
(cherry picked from commit 2514e9cd8f)

Source commit: ef37c31941c97b0b9afe2f08b4a7a8763827bc13
2021-11-25 16:08:27 +01:00
Martin Prikryl
4942b4a436 Resetting WinSCP-specific changes committed by mistake to the thirdparty (dev) branch in d7a42c81
(cherry picked from commit b5f61c2f2f)

Source commit: 77cec098012502036005eb77b6623ec5fc2c81ec
2021-11-25 16:03:30 +01:00
Martin Prikryl
f1dc309048 PngComponents V1.7.0
(cherry picked from commit be3748280d)

Source commit: 108462d6d21a5d39a1ce7b23965d0b7e53e9b000
2021-11-25 00:54:10 +01:00
Martin Prikryl
0e0239f51b PuTTY 0.75
(cherry picked from commit d7a42c8169)

Source commit: c82fe372e18d04bc35d4e07990a22727b354eb07
2021-11-23 19:03:58 +01:00
Martin Prikryl
2505af6c14 Updating settings.c to PuTTY 0.74
(cherry picked from commit 1f95b6bf9a)

Source commit: cabe99fd8c55580223f6b522f6ab1c589061473d
2020-11-26 13:19:03 +01:00
Martin Prikryl
fc86e24c6f Updating settings.c and windefs.c to PuTTY 0.73 (whitespaces only)
(cherry picked from commit d2839a68be)

Source commit: 8dd2d677eac24674b5316bcd1f3ba2f5c301369a
2020-11-26 13:18:04 +01:00
Martin Prikryl
4f64fd76ee Actually adding the implementation of do_defaults for eef27ac3
(cherry picked from commit 5d189553be)

This was by mistake previously added directly to the main code branch, but not to the thirdparty. Consequently we did not update the code with later PuTTY releases.

(cherry picked from commit 85c8d207bd)

Source commit: 530faffb051e61a40eb42bf7d2539d09dabf6c00
2020-11-26 13:17:05 +01:00
Martin Prikryl
bdec885e89 PuTTY 0.74
(cherry picked from commit bdb218e281)

Source commit: 74b747e0ae4aa934eddccbbd083e7938866c3799
2020-11-26 13:14:05 +01:00
Martin Prikryl
74fde48a7b Add BinarySource_REWIND_TO (needed for vuln-agent-keylist-used-after-free)
Source commit: 292513fc1327996c060401b85008f420b7764b6e
2020-07-03 09:06:02 +02:00
Martin Prikryl
a26fd8b155 PuTTY vulnerability vuln-agent-keylist-used-after-free
Cherry picked for 5.17 branch
https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/vuln-agent-keylist-used-after-free.html

Source commit: 71a0c1191922cd2b42608f488f1933bf3607479e
2020-07-03 03:23:18 +02:00
Martin Prikryl
addd95d8da PuTTY 0.73
Source commit: f9a543ae2503920497576c5e917a81ce90c1e2fa
2019-10-03 01:29:45 +02:00
Martin Prikryl
59f0cf607f PuTTY snapshot 5d718ef6 (Whitespace rationalisation of entire code base - 2019-09-08)
Source commit: 463b42db4276fe78643a1139b8f0ba840bad4cf7
2019-10-03 01:10:19 +02:00
Martin Prikryl
006577dcb9 PuTTY snapshot b60230db (Windows: fix resizing of a maximised window - 2019-09-08)
[just before 5d718ef6 (Whitespace rationalisation of entire code base)]

Source commit: d3dfee1f5f7d2a9e2bc58023e4d57236abdd4b10
2019-10-03 00:50:24 +02:00
Martin Prikryl
fa0fb17ea4 PuTTY 0.72
Source commit: 80999b893a18fa0a255efe5532144b8da7f863db
2019-07-23 01:06:22 +02:00
Martin Prikryl
fbfbd32349 Merge branch 'thirdparty' into thirdparty_dev
Source commit: c0388cbdd14562d019610a8d739ef41f373e1c30
2019-07-19 16:59:18 +02:00