1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 18:07:59 +00:00
Commit Graph

2532 Commits

Author SHA1 Message Date
Simon Tatham
7b22e5b2ab Platform-independent fixes for NO_IPV6 compilation (prevent
segfaults on trying to access pfd->addressfamily which doesn't exist).

[originally from svn r5444]
2005-03-05 15:05:18 +00:00
Simon Tatham
5c5dc61522 Fixes for NO_IPV6 compilation under Unix.
[originally from svn r5443]
2005-03-05 15:04:48 +00:00
Jacob Nevins
c151955408 Fix potential fault where -L/-R/-D could accept a string too long for our
portfwd[] array. (Not sure what would happen in this case, mind.)
Also modify -L/-R/-D code to cope with IPv4/IPv6 tunnels in saved settings.

[originally from svn r5440]
2005-03-04 01:54:56 +00:00
Jacob Nevins
8316deb339 rm some magic numbers in ssh_setup_portfwd()
[originally from svn r5439]
2005-03-04 01:20:20 +00:00
Jacob Nevins
cd16a955b5 Fix minor imprecisions in cfg->portfwd[] bounds checking (which erred on the
side of rejecting input, not buffer overflow).

[originally from svn r5438]
2005-03-04 01:02:53 +00:00
Ben Harris
16c3026b28 Explicitly set MIN and TIME when in raw mode to request single characters
with no timeout.  This seems to make Plink work better on Solaris.

[originally from svn r5436]
2005-03-03 13:07:25 +00:00
Owen Dunn
3aa041b157 Draglists, implemented as up-down preference lists as in GTK.
[originally from svn r5434]
2005-03-02 23:33:59 +00:00
Jacob Nevins
3fc33c4118 More confusing "(BYTE *) & val" style punctuation.
I blame GNU indent, although its confusion is understandable.

[originally from svn r5432]
2005-03-02 15:53:50 +00:00
Jacob Nevins
2dfee45b91 nit: confusing punctuation
[originally from svn r5430]
2005-03-02 00:46:22 +00:00
Jacob Nevins
6be9bb74bb rm incorrect comment
[originally from svn r5429]
2005-03-02 00:31:33 +00:00
Jacob Nevins
ec76c24084 Fix off-by-one in memory management of PPK reading routine, which could cause
1-byte buffer overflow when reading .PPK files with long lines (>=128 bytes
in header value -- probably only happened in practice in the comment field).

[originally from svn r5427]
2005-03-01 23:48:45 +00:00
Owen Dunn
d403e31233 Close on exit. I'm not entirely happy with the distribution of this
across mac_closeterm() and notify_remote_exit() but it will do for now.
Also, "PuTTY (inactive)" looks strange as a Mac window title in a way it
doesn't on Unix or Windows.  Perhaps we should find another way of
indicating that a window contains a dead session?

[originally from svn r5424]
2005-03-01 21:38:06 +00:00
Jacob Nevins
41793f56d4 Update Inno Setup script. Tested with IS 5.0.8 on Win98SE; I think there are
a few things that will faze whatever we're using currently (2.0.19 or
thereabouts?), but nothing desperately modern. (NB, the 0.57 putty.iss works
fine with 5.0.8 and the installer is even 40k smaller.)

Notable changes:
 - Uninstallation now runs a variant of `putty -cleanup'. The variance is
   only in the text displayed; the user is still prompted, and the default
   action is (now) "keep" in both cases.
 - Optionally add an icon in the Quick Launch bar.
 - Make desktop item optionally for all users. (not tested)
 - "Create a Start Menu group" now handled via IS' own mechanism.

[originally from svn r5423]
2005-03-01 21:34:21 +00:00
Jacob Nevins
1e0aeea460 Mention `-cleanup' caveats on multi-user systems.
Mention installer in faq-cleanup.
Fix indexing snafu.

[originally from svn r5422]
2005-03-01 15:18:34 +00:00
Jacob Nevins
e3511e1387 VC didn't like PATH_MAX. Use MAX_PATH instead. (This macro is mentioned in
MSDN's SetCurrentDirectory() documentation, although I haven't found a
statement of where it's supposed to be defined.)

[originally from svn r5420]
2005-03-01 12:19:58 +00:00
Jacob Nevins
a2b583f137 Add context help to a couple of message boxes. Unfortunately the ones
I wanted to get to -- "software caused connection abort" and friends --
are going to be more involved (probably requiring some cross-platform
notion of help contexts), and these ones hardly seem worth the effort.
Still, I've done it now.

Side-effect: Pageant now uses the same `hinst' and `hwnd' globals as
everything else. Tested basic functionality.

[originally from svn r5417]
2005-03-01 01:16:57 +00:00
Jacob Nevins
f538bd6d4c Make it clearer that `-m' is only usable with SSH.
[originally from svn r5416]
2005-03-01 00:33:18 +00:00
Jacob Nevins
182a511ec3 Move the MessageBox-with-help function out into winutils.c, although it's
still only used for the host key popups. Side-effects:
 - requested_help is a winstuff.h global
 - Pageant now defines winstuff.h globals

(Also, my previous fix to my improved host-key dialogs only got the "changed"
case, not the "unknown" case. Some days I shouldn't be let near a keyboard.)

[originally from svn r5415]
2005-03-01 00:00:09 +00:00
Jacob Nevins
f246144c44 Make things other than Pageant use request_file(), why not, although all of
its funkiness is switched off so the behaviour is the same as before.

[originally from svn r5414]
2005-02-28 02:51:51 +00:00
Jacob Nevins
d7b50f8066 Fix for pageant-dirhandle': a new wrapper functions request_file()' maintains
a separate CWD for the file requester, so that when the Open File box is not
open Pageant should stay where it was started.
(Also some other minor cleanups in this area of Pageant.)

[originally from svn r5413]
[this svn revision also touched putty-wishlist]
2005-02-28 02:40:43 +00:00
Jacob Nevins
c81aca2126 PSFTP now needs wildcard.o, and was only getting it by luck. Make it explicit.
[originally from svn r5411]
2005-02-28 00:17:09 +00:00
Jacob Nevins
e5d5da8bdd Move SaneDialogBox()/SaneEndDialog() from winmisc.c to windlg.c, since they
seem to be PuTTY(tel)-specific (at least at the moment). Might save a bit
of space in the other binaries.

[originally from svn r5410]
2005-02-27 23:57:17 +00:00
Jacob Nevins
c60aa6b2f5 Improve Pageant's error reporting for private key load failures.
[originally from svn r5409]
2005-02-27 23:15:22 +00:00
Jacob Nevins
bd6eadd196 Improvements to PuTTYgen error reporting:
- will now display a reason when it fails to load a key
 - uses existing error return from native keys
 - import.c had a lot of error descriptions which weren't going anywhere;
   since the strings are probably taking up space in the binary, we
   may as well use them

[originally from svn r5408]
2005-02-27 23:01:11 +00:00
Owen Dunn
114b750d93 Warn on close. Also warn before use.
[originally from svn r5407]
2005-02-27 13:53:08 +00:00
Jacob Nevins
eba099d006 Pull out the common compiler-specific workarounds and so on from individual
resource files into windows/rcstuff.h.

[originally from svn r5405]
2005-02-26 17:43:47 +00:00
Jacob Nevins
1b3b065afc Allow mkfiles.pl to put multiple verbatim sections in a Makefile, and use
one of these for the MacOSX CFLAGS tweak.

[originally from svn r5404]
2005-02-26 17:30:41 +00:00
Jacob Nevins
d88995b856 The comment that Private-Hash: was not allowed in DSS PuTTY-User-Key-File-1
keys was apparently incorrect; prior to r1413, it was both allowed, and
generated for passphraseless keys. Remove it and associated validation so that
people are able to load such keys into PuTTYgen to upgrade them, as suggested.

[originally from svn r5403]
[r1413 == 6608016fc2]
2005-02-26 15:50:29 +00:00
Simon Tatham
ce802e55dd Fix segfault on forcible window closure.
[originally from svn r5402]
2005-02-26 15:13:13 +00:00
Simon Tatham
fe8114d90b Sort out close-on-exit, connection_fatal(), fatalbox(), and
[SessionWindow dealloc] (which was required in order to avoid
segfaulting when a redraw timer fired for a closed session window!).

[originally from svn r5400]
2005-02-26 13:37:07 +00:00
Jacob Nevins
f9363925c6 We weren't correctly discounting "." and ".." when they came from
FindFirstFile(), with hilarious consequences for recursive transfers in
PSFTP. (PSCP appears to behave fine; it does its own "."/".." removal.)

[originally from svn r5398]
2005-02-26 00:41:36 +00:00
Jacob Nevins
d94e865cf9 Makefile.lcc mentions version.o instead of .obj (not that it matters, probably)
[originally from svn r5397]
2005-02-25 21:26:30 +00:00
Simon Tatham
e902c235ad Per Gunnar Floe spotted a reversed test in sftp_cleanup_requests().
[originally from svn r5394]
2005-02-25 09:59:24 +00:00
Jacob Nevins
a519e8edfc Add RT_MANIFEST arguments to dependencies for Windows resource objects.
[originally from svn r5393]
2005-02-24 22:45:50 +00:00
Jacob Nevins
d13338f581 Some copyright dates that were missed in the Mac port.
[originally from svn r5392]
2005-02-24 20:28:10 +00:00
Owen Dunn
71e91e2bcc Support for setting some options like keepalive, oobinline, nodelay, and
SO_REUSEADDR for ot_newlistener().  Also handle remote-initiated
disconnections.

[originally from svn r5388]
2005-02-23 21:19:53 +00:00
Simon Tatham
6d47285462 Fallout from my change in the semantics of cfg.remote_cmd_ptr.
Spotted by Alano na Alania.

[originally from svn r5386]
2005-02-23 09:25:39 +00:00
Owen Dunn
54d45f602c A first attempt at listening sockets in Open Transport.
[originally from svn r5385]
2005-02-22 23:40:47 +00:00
Simon Tatham
ee56a6b48f Remove the two logevent calls passing NULL as the first argument.
This was copied straight from winnet.c and I don't believe it's
_ever_ been valid in the Unix front end.

[originally from svn r5384]
2005-02-22 23:30:09 +00:00
Jacob Nevins
62f83a3666 Rearrange verify_ssh_host_key() for robustness in the face of strangeness, in
the same manner as windows/windlg.c (but tested this time :)

[originally from svn r5380]
2005-02-21 23:43:49 +00:00
Jacob Nevins
bb874319fb Ahem. Fix my hostkey dialog fix so that storing the host key doesn't
close the connection.

[originally from svn r5379]
2005-02-21 23:34:41 +00:00
Ben Harris
f09e3841de Make sure that auth->xdmseen is initialised (to NULL) even if it's not used.
[originally from svn r5375]
2005-02-21 18:13:51 +00:00
Jacob Nevins
38c9737e19 Change "are you sure you want to close this window" default back to what it
was ("yes"). Partly because it was inconsistent with gtkdlg.c, and partly
because it was annoying me.

[originally from svn r5371]
2005-02-20 23:26:47 +00:00
Jacob Nevins
651cedc7fb On Windows, MessageBoxIndirect() was sometimes failing to pop up the host key
dialog and returning an unexpected value (0), causing everything to silently
behave as if the user had said "allow this connection but don't store host
key"!

Initialising (MSGBOXPARAMS).hInstance seems to have cured this (although the
MSDN docs seemed to indicate it wouldn't be used) -- if so, it's been broken
since r5309 on 2004-02-15 -- but since this was something of a Heisenbug, and
the behaviour was so catastrophic when MessageBoxIndirect() behaved oddly, I've
rearranged the code to default to cancelling, and added an assertion for
visibility.

(Windows PuTTY still seems to be broken wrt servers that send NEWKEYS while
we're waiting for the user, which happens to include the "SSH-2.0-2.4.1 SSH
Secure Shell OpenVMS V1.0" I'm testing against. I don't know why. The above bug
may also have been limited to this circumstance.)

[originally from svn r5370]
[r5309 == 99122767f5]
2005-02-20 23:00:17 +00:00
Jacob Nevins
140688e77f Another failure to crStop(0) on user abort, this time for SSH-1 cipher
askalg(). That should be the last one.

[originally from svn r5369]
2005-02-20 21:00:16 +00:00
Owen Dunn
8f5075e182 Support the drop-down menu part of the editbox control (combobox). This
cuts and pastes a lot of code from macctrl_popup, which perhaps should be
consolidated.  Also change the effective line codepage when it is changed
with Change Settings.

[originally from svn r5363]
2005-02-20 12:54:10 +00:00
Simon Tatham
97154e55da Bump version numbers. (Forgot to do this _before_ dropping the 0.57
tag, but that's OK because SVN doesn't distinguish tags from
branches anyway...)

[originally from svn r5361]
2005-02-20 10:51:02 +00:00
Simon Tatham
893d187b81 Additional robustness to SFTP packet parsing and memory allocation.
[originally from svn r5358]
2005-02-20 10:30:05 +00:00
Ben Harris
3c44ce243f Correct some comments based on feedback from Thomas Dickey.
[originally from svn r5356]
2005-02-19 21:56:25 +00:00
Owen Dunn
27e62034ce Grey the titles of group boxes when the config box is not frontmost.
Edit box values still fail to be greyed.

[originally from svn r5355]
2005-02-19 15:53:26 +00:00