Martin Prikryl
0a91a3e4e3
Merge branch 'thirdparty'
...
# Conflicts:
# source/putty/ssh/connection2.c
Source commit: 4413da04be2a27098da2488953e6e86301be66cd
2026-08-26 16:07:38 +02:00
Martin Prikryl
b3732d9b70
PuTTY 0.85
...
Source commit: c9fb0e3663609e43f0fc37e1e96e9f2177809f15
2026-08-26 16:06:53 +02:00
Martin Prikryl
6f632e38a9
Merge branch 'hotfix'
...
Source commit: bb4d452ea03a6de19b972c809f65a4318955e559
2026-08-26 16:03:42 +02:00
Martin Prikryl
fec8b0d00d
Merge branch 'thirdparty_hotfix' into hotfix
...
# Conflicts:
# source/putty/ssh/connection2.c
Source commit: b4afce76ac7977473f5f01de24061065eecc66f2
2026-08-26 00:46:09 +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
Martin Prikryl
f670f4ebb1
Resetting differences to official PuTTY that are no longer needed
...
Most, if not all, were for compatibility with the classic C++Builder compiler (declarations in the middle of code + inline structure initializers)
Source commit: a9f38c3a07777e538c3c6e0fbdd38e9d68327dfa
2025-12-06 01:29:35 +01:00
Martin Prikryl
3f4e41fee0
Clang imposed changes that should be noop and have no effect on classic compiler
...
Mostly:
– incorrectly identified uninitialized variables
– explicit static global variables
– const, sign and down casts and safety
– typename use
– semicolon after function implementation
– unused variables, fields, arguments and macros
– field initialization order
– exact include filename case
– redundant in code macros already defined at project level
(cherry picked from commit f7f00c631e
2025-03-13 16:46:26 +01:00
Martin Prikryl
f7f00c631e
Clang imposed changes that should be noop and have no effect on classic compiler
...
Mostly:
– incorrectly identified uninitialized variables
– explicit static global variables
– const, sign and down casts and safety
– typename use
– semicolon after function implementation
– unused variables, fields, arguments and macros
– field initialization order
– exact include filename case
– redundant in code macros already defined at project level
Source commit: 5c1338d95bd275082288dd1e773a033df6e379cd
2025-03-13 16:39:24 +01:00
Martin Prikryl
85bddc2c5c
Merge branch 'thirdparty_dev' into dev
...
Source commit: 4d92009391120144deb49f4cae233abae481b71f
2025-01-05 00:58:01 +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
a561deeac4
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/crypto/ecc-ssh.c
# source/putty/crypto/rsa.c
# source/putty/errsock.c
# source/putty/network.h
# source/putty/proxy/proxy.c
# source/putty/putty.h
# source/putty/ssh/mainchan.c
# source/putty/ssh/portfwd.c
# source/putty/ssh/ssh.c
# source/putty/sshpubk.c
# source/putty/utils/conf.c
# source/putty/utils/tempseat.c
# source/putty/windows/gss.c
# source/putty/windows/handle-socket.c
# source/putty/windows/network.c
# source/putty/windows/platform.h
# source/putty/windows/storage.c
# source/putty/windows/unicode.c
# source/putty/windows/utils/filename.c
Source commit: bf2485b229a3855694c35c518f72482b97ca47c5
2024-12-05 14:59:26 +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
c430f61927
Merge branch 'thirdparty'
...
# Conflicts:
# source/putty/crypto/dsa.c
# source/putty/ssh.h
Source commit: c94a42a988944ffab541a8532e3325c322f14b63
2024-04-16 12:17:09 +02:00
Martin Prikryl
aa71679e20
PuTTY 0.81
...
Source commit: 35dc31e2b42102abff4636642858c21ea74b8791
2024-04-16 12:14:36 +02:00
Martin Prikryl
a65773c31c
Merge branch 'thirdparty_dev' into dev
...
Source commit: 70dad0f1516d5eba6d33587b07ece8d3aac4babc
2023-12-20 13:43:16 +01:00
Martin Prikryl
1d7d01ad70
PuTTY 0.80
...
Source commit: 04e78706e91713a0bbe3be3d75fc7882165d974a
2023-12-20 13:39:56 +01:00
Martin Prikryl
db87bc1810
Bug 2145: Support for OpenSSH certificates for host verification
...
https://winscp.net/tracker/2145
Source commit: 9dda484bf38f9a72b61a2c3d8e7dd8892ee96c2b
2023-09-08 08:59:22 +02:00
Martin Prikryl
281f907939
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/ssh/connection2.c
# source/putty/ssh/ppl.h
# source/putty/ssh/transport2.c
# source/putty/ssh/userauth2-client.c
Source commit: 84a1449cae5af55c4a6671f80e82114fc0adc781
2023-05-22 17:22:05 +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
fd87a21d8e
Merge branch 'thirdparty'
...
Source commit: b9b21a03857190846c383f21387a297f6f5eaf25
2023-05-20 01:22:23 +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
e8229fd72a
Bug 2162: Failure when doing agent forwarding with Pageant 0.74 or older
...
https://winscp.net/tracker/2162
Source commit: cd13e0ed61e2e4a0cd3da1b203cbead9326db40d
2023-02-01 01:34:34 +01:00
Martin Prikryl
48106ee1b6
Bug 1873: Support for OpenSSH certificates for user authentication
...
https://winscp.net/tracker/1873
Source commit: fc13a226065092a102456a27242ac69151cb1d15
2022-12-14 01:00:41 +01:00
Martin Prikryl
ec808580ce
Minimal changes needed to compile against PuTTY 0.78 and pass tests
...
Source commit: c717fcdc41b9be7bb3a88e06fc49d45eaf0cfa44
2022-12-03 00:57:29 +01:00
Martin Prikryl
53826431d2
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/crypto/aes-select.c
# source/putty/crypto/aes-sw.c
# source/putty/crypto/aes.h
# source/putty/crypto/arcfour.c
# source/putty/crypto/blowfish.c
# source/putty/crypto/chacha20-poly1305.c
# source/putty/crypto/des.c
# source/putty/crypto/dsa.c
# source/putty/crypto/ecc-ssh.c
# source/putty/crypto/hmac.c
# source/putty/crypto/rsa.c
# source/putty/ssh.h
# source/putty/ssh/common_p.c
# source/putty/ssh/kex2-client.c
# source/putty/ssh/ppl.h
# source/putty/ssh/ssh.c
# source/putty/ssh/transport2.c
# source/putty/ssh/transport2.h
# source/putty/ssh/userauth2-client.c
# source/putty/sshpubk.c
# source/putty/utils/tempseat.c
# source/putty/windows/agent-client.c
# source/putty/windows/gss.c
# source/putty/windows/network.c
# source/putty/windows/storage.c
Source commit: ca42122a58b67cfc547e8691e9f22c1ed8356cd6
2022-12-03 00:56:05 +01:00
Martin Prikryl
a4b3791c54
PuTTY 0.78
...
Source commit: 4eba336bd557f717ffaa78be798684bf09042571
2022-12-03 00:54:15 +01:00
Martin Prikryl
b21a098cc1
Merge branch 'thirdparty'
...
# Conflicts:
# source/putty/misc.h
# source/putty/network.h
# source/putty/putty.h
# source/putty/sshpubk.c
# source/putty/storage.h
# source/putty/windows/gss.c
# source/putty/windows/handle-io.c
# source/putty/windows/handle-socket.c
# source/putty/windows/network.c
# source/putty/windows/platform.h
# source/putty/windows/storage.c
Source commit: 135140e906397a3426f77c0b3d2cf54f7a3ffed8
2022-02-04 19:47:59 +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
0a567870cf
Thread safe replacement of handles_by_evtomain global
...
Before it was used for local proxy command only, so probability of problems was relatively small. In PuTTY 0.75 it's used even for Pageant communication.
(cherry picked from commit 675cfb552b
2021-11-23 21:03:38 +01:00
Martin Prikryl
542b4ead44
Updating code to PuTTY 0.75
...
(cherry picked from commit b69328d92d
2021-11-23 19:09:04 +01:00
Martin Prikryl
728b629e55
Merge branch 'thirdparty'
...
Source commit: 05678fe0aae03547c0b2c2aa990ab6d1b225978d
2021-11-23 19:06:45 +01:00
Martin Prikryl
0e0239f51b
PuTTY 0.75
...
(cherry picked from commit d7a42c8169
2021-11-23 19:03:58 +01:00
Martin Prikryl
9e315e3f5f
Empty line added by mistake in 6b951b95
...
(cherry picked from commit 37d9770b56
2021-11-23 16:32:09 +01:00
Martin Prikryl
307619dd88
Bug 1986: Support for PPK version 3 keys
...
https://winscp.net/tracker/1986
Source commit: 96acc7e21d3a9ef78274bcda7e380d2660b585d0
2021-05-20 00:49:37 +02:00
Martin Prikryl
1ce80fd4a6
Merge branch 'thirdparty'
...
# Conflicts:
# source/putty/WINDOWS/wingss.c
# source/putty/WINDOWS/winstuff.h
# source/putty/mpint.c
# source/putty/putty.h
# source/putty/ssh1login.c
# source/putty/ssh2connection-client.c
# source/putty/ssh2connection.c
# source/putty/ssh2transport.c
# source/putty/ssh2userauth.c
# source/putty/sshcommon.c
# source/putty/sshppl.h
# source/putty/sshprng.c
# source/putty/version.h
Source commit: 5f621e1bc26d7af3bbf5b45451578044d93de86e
2020-11-26 13:15:52 +01:00
Martin Prikryl
bdec885e89
PuTTY 0.74
...
(cherry picked from commit bdb218e281
2020-11-26 13:14:05 +01:00
Martin Prikryl
c4b7d2c71d
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/WINDOWS/wingss.c
# source/putty/WINDOWS/winhandl.c
# source/putty/WINDOWS/winhsock.c
# source/putty/WINDOWS/winnet.c
# source/putty/WINDOWS/winpgntc.c
# source/putty/WINDOWS/winstore.c
# source/putty/import.c
# source/putty/logging.c
# source/putty/mainchan.c
# source/putty/proxy.c
# source/putty/ssh.c
# source/putty/ssh1connection-client.c
# source/putty/ssh2connection-client.c
# source/putty/ssh2userauth.c
# source/putty/sshmd5.c
# source/putty/sshpubk.c
# source/putty/sshrsa.c
# source/putty/sshsh256.c
# source/putty/sshsha.c
# source/putty/storage.h
# source/putty/utils.c
# source/putty/x11fwd.c
Source commit: 8e49ad4df32f586004373762d351a630e89d01b0
2019-10-03 01:20:37 +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
63a489c5af
Merge branch 'thirdparty_dev' into dev
...
Plus changes to make the code compilable on Embarcadero compiler
# Conflicts:
# source/putty/WINDOWS/winnet.c
# source/putty/WINDOWS/winpgntc.c
# source/putty/mainchan.c
# source/putty/misc.h
# source/putty/network.h
# source/putty/ssh.c
# source/putty/ssh.h
# source/putty/ssh1connection.c
# source/putty/ssh2transport.c
# source/putty/sshchan.h
# source/putty/sshecc.c
# source/putty/sshrand.c
Source commit: 6ac71c835baaf38587b4384ad16e3909c34aa85d
2019-07-23 01:16:45 +02:00
Martin Prikryl
fa0fb17ea4
PuTTY 0.72
...
Source commit: 80999b893a18fa0a255efe5532144b8da7f863db
2019-07-23 01:06:22 +02:00
Martin Prikryl
7d3c61ffdf
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/WINDOWS/winhsock.c
# source/putty/WINDOWS/winmisc.c
# source/putty/be_misc.c
# source/putty/ssh2userauth.c
# source/putty/sshcommon.c
# source/putty/sshecc.c
# source/putty/sshrsa.c
# source/putty/utils.c
Source commit: ca8a7a7d97c9f76ebbcffd6bdaa78894ef318582
2019-05-12 02:20:38 +02:00
Martin Prikryl
c8474497e4
PuTTY snapshot abfc751c (Update version number for 0.71 release - 2019-03-16)
...
Source commit: 86d690c216aba2a5c82254c67e397210870b01b3
2019-05-12 02:07:26 +02:00
Martin Prikryl
c40fa8b7c3
Updating code to PuTTY 59c8df41
...
Source commit: 3857972e1cbd46ce7574f8b4b6bd03f400d65880
2019-05-12 01:42:24 +02:00
Martin Prikryl
344ff73638
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/WINDOWS/winstore.c
# source/putty/WINDOWS/winstuff.h
# source/putty/misc.h
# source/putty/ssh.h
# source/putty/ssh2transport.c
# source/putty/sshppl.h
Source commit: ad85ff351f80ac2199e705606713fd92bc18355e
2019-05-12 01:30:46 +02:00
Martin Prikryl
13cbc72169
PuTTY snapshot 59c8df41 (Remove duplicate coroutine macros - 2019-02-28)
...
Source commit: 07b44a3062ae50923551536397784ace9ff89d8e
2019-05-12 01:17:34 +02:00
Martin Prikryl
a6de10a805
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/WINDOWS/winhsock.c
# source/putty/WINDOWS/winnet.c
# source/putty/WINDOWS/winpgntc.c
# source/putty/WINDOWS/winstuff.h
# source/putty/misc.c
# source/putty/mpint.c
# source/putty/mpint_i.h
# source/putty/ssh.c
# source/putty/ssh2userauth.c
# source/putty/sshdss.c
# source/putty/sshecc.c
# source/putty/sshpubk.c
# source/putty/sshrsa.c
Source commit: 90885833c1f338f612044c5cbadea7ef0c0e719c
2019-05-11 02:46:16 +02:00
Martin Prikryl
5b18554834
PuTTY snapshot 85550641 (uxpty.c: initialise pty->pending_eof - 2019-02-13)
...
Source commit: 8c5c9b1e2c213312e68b7da55a68af6f97d980ff
2019-05-11 02:33:22 +02:00
Martin Prikryl
45b42d0a42
Updating code to PuTTY a5911f76
...
Source commit: 2efb2a7381494d8f24e0f7cff9ecab9f9a5cea15
2019-05-11 02:20:06 +02:00
Martin Prikryl
d4b25265d7
Merge branch 'thirdparty_dev' into dev
...
# Conflicts:
# source/putty/mpint.c
# source/putty/sshrsa.c
# source/putty/sshsh256.c
Source commit: 6eb947d7fa26ee450a7847304727c2484a0cb601
2019-05-11 02:08:32 +02:00
Martin Prikryl
c1f64d6b16
PuTTY snapshot a5911f76 (Fix null dereference in ssh_unthrottle - 2019-01-29)
...
Source commit: fe665ca91c847abb60aa13f448c784a6ee5d63f0
2019-05-11 01:55:40 +02:00
