1
0
mirror of https://github.com/winscp/winscp.git synced 2026-10-28 15:35:08 +03:00

30 Commits

Author SHA1 Message Date
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
6963f08ffd Enabling all warnings in all projects and only selectively disabling those that are needed
with aim to eventually update the code to need as little warnings disabled as needed.

Some code updates (and even fixes) to avoid warning done already

Source commit: 5c45a6f56c52e7b0c5034ed9980cd65259a7372b
2025-12-04 01:16:16 +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
25df2381f1 Updating code to PuTTY 0.82
Source commit: ddf59fef3b75f5efff8bf82fecdd61ef49970fd2
2024-12-05 16:51:39 +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
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
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
29b6be6f0a Support for NTRU Prime post-quantum key exchange
https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/ntru.html

Source commit: 33d0e948a119c5cbdc61f22b30b0d5d2ed1b96d2
2023-01-07 00:54:35 +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
2d148fc649 Merge branch 'thirdparty'
# Conflicts:

#	source/putty/proxy/proxy.c
#	source/putty/windows/network.c

Source commit: f6c4f9badfec50adaf6ea0861446b536685ee49e
2022-06-03 00:59:04 +02:00
Martin Prikryl
0006b066e5 PuTTY 0.77
Source commit: 4460e89e63d91ff048baf208874bcb2ead90b835
2022-06-03 00:57:22 +02: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
ffe653e587 Merge branch 'thirdparty'
Source commit: d9343ddb7cfc8f10fd01ed9d1c6f6dfdc8515ab2
2021-11-25 16:11:09 +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
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)

Source commit: c82fe372e18d04bc35d4e07990a22727b354eb07
2021-11-23 19:03:58 +01:00
Martin Prikryl
a8561e0d4f Merge branch 'thirdparty'
Source commit: b3439b97984a07b49a2dcd87c54a0f7492551a8a
2020-11-26 13:20:25 +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
5d189553be Actually adding the implementation of do_defaults for eef27ac3
Source commit: 0b16e1e0dd34d6fcb273919d78b8f62bd596f873
2019-10-11 00:52:08 +02:00