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

44 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
bfa8432e08 Enabling packet logging
Source commit: 8f93056ed17e8c6eea0a3128553efeea446bcbfb
2024-12-21 01:16:36 +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
1eefd46566 Merge branch 'thirdparty_dev' into dev
Source commit: aaac937e6a438623d3956fbdcc4e97a595fa6783
2023-08-25 01:19:12 +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
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
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
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)

Source commit: 74b747e0ae4aa934eddccbbd083e7938866c3799
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
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
0145a336d6 Merge branch 'thirdparty_dev' into dev
# Conflicts:
#	source/putty/WINDOWS/winhandl.c
#	source/putty/WINDOWS/winnet.c
#	source/putty/WINDOWS/winpgntc.c
#	source/putty/WINDOWS/winproxy.c
#	source/putty/WINDOWS/winstore.c
#	source/putty/callback.c

#	source/putty/mainchan.c
#	source/putty/network.h
#	source/putty/portfwd.c
#	source/putty/putty.h
#	source/putty/ssh.c
#	source/putty/ssh.h
#	source/putty/ssh1login.c
#	source/putty/ssh2connection.h
#	source/putty/ssh2userauth.c
#	source/putty/sshaes.c
#	source/putty/sshcommon.c
#	source/putty/sshcrcda.c
#	source/putty/sshppl.h
#	source/putty/sshpubk.c
#	source/putty/sshrsa.c
#	source/putty/sshsh256.c
#	source/putty/x11fwd.c

Source commit: 857836e9a3a338f3fe8c30cbd6378e9b3802bc7e
2019-04-25 00:47:59 +02:00
Martin Prikryl
2cb6655162 PuTTY snapshot 85770b20 (Add missing expire_timer_context in ssh2_transport_free 2018-11-23)
Source commit: 3ba846b71bb159ae427ba7cacdfb3a8366c31c18
2019-04-24 18:19:21 +02:00
Martin Prikryl
ae7814670c Merge branch 'thirdparty_dev' into dev
# Conflicts:
#	source/putty/ssh.h
#	source/putty/ssh2connection.c
#	source/putty/ssh2transport.c

Source commit: 7d651cd7b2147cf6e0340332abb42a4f779bde27
2019-04-17 01:16:54 +02:00
Martin Prikryl
b294a58f70 PuTTY snapshot d3a9142d (Allow channels not to close immediately after two EOFs - 2018-10-21)
This includes 554e8f399 (Restore missing Event Log entries from SSH layers), what should fix re-key tests

Source commit: 51a0493c5f4dc6f3474374136d56473e5bbd7867
2019-04-17 01:03:26 +02:00
Martin Prikryl
1e599ffa91 Updating code to b4c8fd9d
Source commit: 9185b8e78c509be716a7a265aa5cc3a3870a6378
2019-04-16 02:47:39 +02:00
Martin Prikryl
e8993e53c9 Updating code to PuTTY 109df9f4
Source commit: 551deb1bf65b34cf4c505b174ad9cf8008e3b369
2019-04-13 01:55:52 +02:00
Martin Prikryl
8c53e971df Merge branch 'thirdparty_dev' into dev
# Conflicts:
#	source/putty/WINDOWS/winnet.c
#	source/putty/proxy.c
#	source/putty/putty.h
#	source/putty/ssh.c
#	source/putty/sshverstring.c

Source commit: bec055381ca051974fc5a45a7691225bccf9b5b1
2019-04-13 01:42:56 +02:00
Martin Prikryl
9145deef64 PuTTY snapshot 109df9f4 (Remove frontend_keypress() - 2018-10-11)
Source commit: f634f5fbd229e7df3869bd30beb230e41ddb9d04
2019-04-13 01:29:11 +02:00
Martin Prikryl
23fa18ee2d Merge branch 'thirdparty_dev' into dev
Source commit: 83a7777aedf46d1686ff636d0869081e1e524fcf
2019-04-12 17:59:50 +02:00
Martin Prikryl
eb041bc556 PuTTY snapshot bf61af19 (ssh2 conn: don't set mainchan_eof_sent when we didn't - 2018-10-03)
Source commit: adb4173ec9bbb2de4e7873f20cae15c7ac6a8b92
2019-04-12 17:56:17 +02:00
Martin Prikryl
477c7e886f Merge branch 'thirdparty_dev' into dev
Source commit: 47cb485bf609714fb13ee4f011dcea016f93602a
2019-04-12 16:22:38 +02:00
Martin Prikryl
61c7b51420 PuTTY snapshot 57553bda (sshshare: notify cl when last downstream goes away - 2018-09-28)
Source commit: c41ad6a0ef7e1eaacdd7720d90c0af124f6a0563
2019-04-12 16:18:57 +02:00
Martin Prikryl
a029c98fdf Updating code to PuTTY 2ca0070f (+ d624ae2a and fb07fccf)
Includes two additional later commits that are necessary for at least basic operation:
d624ae2a - Fix double-free bug in (non-EC) Diffie-Hellman
fb07fccf - Fix failure to handle SSH_MSG_EXTENDED_DATA

Source commit: 6713f7869e31b2cb3921400442300befebd3881a
2019-04-11 01:11:02 +02:00
Martin Prikryl
bca28b11c2 Merge branch 'thirdparty_dev' into dev
# Conflicts:
#	source/putty/putty.h
#	source/putty/ssh.c
#	source/putty/ssh.h

Source commit: d0b35e8c439c5443b2c3face135e64348559cdd1
2019-04-09 03:15:30 +02:00
Martin Prikryl
36e2ca25e8 PuTTY snapshot f4fbaa1b (Rework special-commands system to add an integer argument - 2018-09-24)
Source commit: d27d0102cd65e4b665ff24b59caf62de7a959a6a
2019-04-09 03:01:40 +02:00
Martin Prikryl
97deb3c60e Merge branch 'thirdparty_dev' into dev
# Conflicts:
#	source/putty/callback.c
#	source/putty/portfwd.c
#	source/putty/putty.h
#	source/putty/ssh.c

Source commit: 468ac26ca2ae9badcc1a617afe382e4ad2b0b184
2019-04-05 08:18:04 +02:00
Martin Prikryl
aff4559cbd PuTTY snapshot 65b65bb (Expose the structure tag 'crcda_ctx' - 2019-09-19)
Source commit: 8320144ae87014ecea25fa6756683ae08f5b57a9
2019-04-05 08:14:34 +02:00
Martin Prikryl
8ce20a988b Merge branch 'thirdparty_dev' into dev + Plus minimal changes in code needed to make it compile and pass unit tests + Other changes are pending
What is pending:
- AES is now again compiled using Borland compiler (previously by VS)
- Add support for HW SHA

What is lost and needs to be re-implemented:
- Custom fixes for vulnerabilities fixed in PuTTY 0.71 (will be added implicitly, once merge of PuTTY 0.71 is complete)
- callback.c is now locked more heavily - should be optimized.

Note: Or would-be thread-safety changes to callback.c were obviously not thread safe as they would call callbacks for other sessions from thread for another session (as there's only one callback queue) - This needs to be solved

# Conflicts:
#	source/putty/WINDOWS/wingss.c
#	source/putty/WINDOWS/winhsock.c
#	source/putty/WINDOWS/winnet.c
#	source/putty/callback.c

#	source/putty/proxy.c
#	source/putty/putty.h
#	source/putty/ssh.c
#	source/putty/ssh.h
#	source/putty/sshaes.c
#	source/putty/sshdh.c
#	source/putty/sshpubk.c
#	source/putty/sshrsa.c
#	source/putty/sshsh256.c
#	source/putty/version.h
#	source/putty/x11fwd.c

Source commit: d7d9798d5b0c01f4a797d0a2ace8856e32909158
2019-03-25 17:04:46 +01:00
Martin Prikryl
bd04f8db3d PuTTY snapshot 6c924ba
Source commit: eab2f5e9605eae408def8bc04edd45de3c181512
2019-03-19 01:39:17 +01:00
Martin Prikryl
11d0bb9038 Merge branch 'thirdparty_dev' into dev
Conflicts:
	source/putty/WINDOWS/winproxy.c
	source/putty/misc.c
	source/putty/proxy.c
	source/putty/ssh.c
	source/putty/sshbn.h
	source/putty/sshpubk.c

Source commit: e85dbbd7b3a324935d9a8f0fb2e38a8e7efd199a
2018-01-25 12:37:59 +01:00
Martin Prikryl
dc38a129e8 PuTTY development snapshot 2015-12-22 (51465fa)
http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commit;h=51465fac73742602003db2c445109a3526fad16e

Source commit: 4be3baa88efbf134b652e84fdf871c74ca4b27fe
2018-01-25 12:36:57 +01:00
Martin Prikryl
896787318d Merge branch 'thirdparty_dev' into dev
Conflicts:
	source/putty/WINDOWS/winmisc.c

Source commit: 4b6b991e6b041adb028f5711edd7bcde14473329
2018-01-24 16:35:52 +01:00
Martin Prikryl
5daf2e0776 PuTTY 0.66
Source commit: 332cd6a0dc85b619c24c03c842e78bd59a88a329
2018-01-24 15:22:37 +01:00
Martin Prikryl
d8f92984b9 First public commit of dev branch
Source commit: 98cb9d870efc1c60826db4398ec35c5cbe809e6a
2018-01-24 14:13:46 +01:00
Martin Prikryl
dbdc880e40 Synchronizing with source repository
Source commit: d41684695918967891179b2fa63337c66f60094b
2018-01-19 20:17:25 +01:00