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

1983 Commits

Author SHA1 Message Date
Jacob Nevins
a90f643907 Add `--unix' mode to generate ~/.putty/sshhostkeys from known_hosts.
(should now be called `kh2putty.py')

[originally from svn r3508]
2003-10-14 23:23:28 +00:00
Jacob Nevins
f2676b6ccc Remove dead comment about writing settings, and query one about reading them.
[originally from svn r3507]
2003-10-14 21:01:12 +00:00
Jacob Nevins
9860f1a10c We now have Unix ports of PSCP and PSFTP.
[originally from svn r3506]
2003-10-14 19:57:50 +00:00
Simon Tatham
4d76ca6658 Actually fix winnet-if2lo, I think. Tested in an ad-hoc manner by
deliberately making a connection from nemesis's real IP address to
its loopback address; not tested in the original failing case of SMB.

[originally from svn r3503]
2003-10-12 14:12:54 +00:00
Simon Tatham
e30aed9a6f The WinSock library is now loaded at run-time, which means we can
attempt to load WS2 and then fall back to WS1 if that fails. This
should allow us to use WS2-specific functionality to find out the
local system's list of IP addresses, thus fixing winnet-if2lo, while
degrading gracefully back to the previous behaviour if that
functionality is unavailable. (I haven't yet actually done this; I've
just laid the groundwork.)
This checkin _may_ cause instability; it seemed fine to me on
initial testing, but it's a bit of an upheaval and I wouldn't like
to make bets on it just yet.

[originally from svn r3502]
2003-10-12 13:46:12 +00:00
Jacob Nevins
8e2fd15bd5 Remove all the "assert(len>0)" which forbade zero-length writes across the
from_backend() interface, after having made all implementations safe against
being called with len==0 and possibly-NULL/undefined "data".

(This includes making misc.c:bufchain_add() more robust in this area.)

Assertion was originally added 2002-03-01; e.g., see plink.c:1.53 [r1571].

I believe this now shouldn't break anything.

This should hopefully make `ppk-empty-comment' finally GO AWAY. (Tested
with Unix PuTTY.)

[originally from svn r3500]
[r1571 == fdbd697801]
2003-10-12 13:16:39 +00:00
Jacob Nevins
5415873b3f Add random commentary to SOCKS code.
Also fix what I think are a couple of very minor bugs in SOCKS4; one won't
affect anyone AFAIK, and the other is unlikely to cause trouble.

[originally from svn r3497]
2003-10-10 22:58:53 +00:00
Jacob Nevins
4de860abcf In SOCKS5 dynamic forwarding, we were echoing back DST.{ADDR,PORT} as
BND.{ADDR,PORT}. Besides being clearly wrong, correspondence with
Sascha Schwarz suggests that this can confuse some SOCKS5 clients
(Aventail and sockscap32) which seem to assume that the reply must
have ATYP=1 (IPv4 literal) and so get the length wrong.

Now all replies have ATYP=1 with BND.{ADDR,PORT} = 0.0.0.0:0 -- this
apparently follows practice in OpenSSH. (We don't have enough info to
fill these fields in correctly.)

[originally from svn r3496]
2003-10-10 21:20:01 +00:00
Jacob Nevins
c8a6df1e1c missed a bit in last commit
[originally from svn r3490]
2003-10-08 21:39:54 +00:00
Owen Dunn
a03d04ba75 Cosmetic, to fix ssh2-des-cbc-is-std
[originally from svn r3488]
2003-10-08 20:09:55 +00:00
Jacob Nevins
c36ec63d28 `baltic-default-translation': change default Baltic (CP1257) encoding from
8859-4 to 8859-13 as suggested by Vaidrius Petrauskas, on the grounds that
he has a .lt address and sounds like he knows what he's talking about.

[originally from svn r3485]
2003-10-07 21:31:21 +00:00
Simon Tatham
72c53fcb75 My ASN.1 decoder returned wrong IDs for anything above 0x1E! Good
job it's never had to yet. Ahem.

[originally from svn r3479]
2003-10-03 21:21:23 +00:00
Simon Tatham
150b6e0a87 PSCP in SFTP mode now uses the fast download/upload manager.
[originally from svn r3472]
2003-09-29 15:39:56 +00:00
Simon Tatham
efa05f9752 Obvious memory leak in new fast download management. Oops.
[originally from svn r3471]
2003-09-29 15:39:36 +00:00
Simon Tatham
77cc301862 Uploads turn out to be much easier than downloads, so here's faster
upload support in PSFTP as well.

[originally from svn r3470]
2003-09-28 14:24:01 +00:00
Simon Tatham
bc83c59aa7 First cut at speeding up SFTP. Generic download-management code in
sftp.c, and psftp.c now uses that instead of going it alone. Should
in principle be easily installed in PSCP as well, but I haven't done
it yet; also it only handles downloads, not uploads, and finally it
doesn't yet properly calculate the correct number of parallel
requests to queue. Still, it's a start, and in my own tests it
seemed to perform as expected (download speed suddenly became
roughly what you'd expect from the available bandwidth, and
decreased by roughly the expected number of round-trip times).

[originally from svn r3468]
2003-09-27 17:52:34 +00:00
Jacob Nevins
e3018a08e8 Clarify what happens when you enter a code page that's not listed.
[originally from svn r3467]
2003-09-26 13:04:56 +00:00
Jacob Nevins
3250a5b0f0 Note what versions of SOCKS are implemented for dynamic port forwarding.
[originally from svn r3464]
2003-09-25 12:38:02 +00:00
Jacob Nevins
61ad562f72 Imply that some features that have been implemented may appear on the Wishlist
but not the Changes page, as this is now often the case.

[originally from svn r3459]
2003-09-23 10:12:02 +00:00
Jacob Nevins
701ad46226 Mention Windows on Alpha as worth mentioning
[originally from svn r3458]
2003-09-23 10:05:06 +00:00
Jacob Nevins
2cde290c77 Oops. Fix a bug in my `keyfile-diagnostic' work which caused SSH-2 key loading
in pageant (and presumably puttygen) to crash.

[originally from svn r3450]
2003-09-10 12:30:10 +00:00
Jacob Nevins
95d5a91c24 Implement `default-colours' on Windows based loosely on Michael Wardle's patch.
[originally from svn r3444]
2003-09-03 20:14:38 +00:00
Jacob Nevins
dbe68abfff Add pscp to .cvsignore
[originally from svn r3443]
2003-09-03 18:37:35 +00:00
Jacob Nevins
3796897d7c Change an incorrect comment about "PuTTY-User-Key-File-2" private key format
after discussion with Simon.

[originally from svn r3440]
2003-09-02 19:02:06 +00:00
Jacob Nevins
15ac9c09eb When loading SSH-2 key, ignore passphrase argument if key is unencrypted.
This should get rid of a problem that three or four people reported where
PuTTY intermittently reports "Unable to load private key" (MAC failed).

(ssh.c:do_ssh2_authconn() should also initialise its passphrase so it's not
passing garbage passphrases around, of course, but I haven't yet worked out
where the best place in the auth loop to do that would be.)

[originally from svn r3439]
2003-09-02 19:00:17 +00:00
Simon Tatham
f6835045f8 Include stdlib.h for exit() - thanks Colin.
[originally from svn r3436]
2003-09-02 09:52:13 +00:00
Simon Tatham
b104be3b00 Remove CRs. Oops :-/
[originally from svn r3435]
2003-09-02 09:00:35 +00:00
Ben Harris
f68c785aa4 Add support for a DESTDIR variable in the Unix makefile to set the root of the
installation tree (for building packages etc).

[originally from svn r3433]
2003-09-01 21:27:36 +00:00
Jacob Nevins
eebc7529ed Work towards wish `keyfile-diagnostic'. Many sshpubk.c keyfile-loading
functions have sprouted `**errorstr' arguments, which if non-NULL can
return a textual error message. The interface additions are patchy and
ad-hoc since this seemed to suit the style of the existing interfaces.

I've since realised that most of this is masked by sanity-checking that
gets done before these functions are called, but it will at least report
MAC failures and the like (tested on Unix), which was the original point
of the exercise.

Note that not everyone who could be using this information is at the
moment.

[originally from svn r3430]
2003-08-29 22:52:57 +00:00
Jacob Nevins
0a293ae208 dupstr() should cope with being passed NULL
[originally from svn r3429]
2003-08-29 22:14:04 +00:00
Jacob Nevins
4eff79612a Minimal fixes to minimal plink man page.
[originally from svn r3428]
2003-08-29 19:41:57 +00:00
Jacob Nevins
2504a53d72 Add "-s" option to Unix plink too.
Compiled, but not tested as Unix plink seems to be segfaulting today.

[originally from svn r3427]
2003-08-29 19:21:49 +00:00
Jacob Nevins
5690a72640 New option for plink: "-s" specifies that the remote command is an SSH-2
subsystem. (pinched from OpenSSH)

[originally from svn r3426]
2003-08-29 19:06:22 +00:00
Simon Tatham
d1e9569b05 ... and there's a Unix port of PSCP. Ooh.
[originally from svn r3422]
2003-08-25 14:30:59 +00:00
Simon Tatham
4e8325c967 Fix a couple of blatant memory leaks; thanks to Ruurd Beerstra for
pointing at least one of them out.

[originally from svn r3421]
2003-08-25 14:18:14 +00:00
Simon Tatham
bfb9b28393 Windows PSCP now links against winsftp.c, and scp.c is now a
platform-independent source file. Haven't yet added the extra
abstraction routines to uxsftp.c to create a Unix PSCP port, but it
shouldn't take long.
Also in this checkin, a change of semantics in platform_default_s():
now strings returned from it are expected to be dynamically allocated.

[originally from svn r3420]
2003-08-25 13:53:41 +00:00
Simon Tatham
66fa6f320e And just to prove that psftp.c really is now platform-independent
... here's a Unix port of PSFTP. Woo. (Oddly PSCP looks to be
somewhat harder; there's more Windows code interleaved than there
was in PSFTP.)

[originally from svn r3419]
2003-08-24 13:22:17 +00:00
Simon Tatham
e0801815c8 Next phase of general SFTP reworking: psftp.c is now a platform-
independent source file. All Windowsisms have been moved out to
winsftp.c.

[originally from svn r3418]
2003-08-24 12:47:46 +00:00
Jacob Nevins
40dc8b940c Fix for `slow-startup-printer': use PRINTER_INFO_4 on NT-class systems, which
apparently tries less hard to find printers so won't slow the system down.

Tested on 2000 and 98; in both cases printer enumeration and printing worked
as well as they did in 2003-08-21.

Made a single shared copy of osVersion in winmisc.c so that printing.c can
find it. Made other users (window.c, pageant.c) use this copy.

[originally from svn r3411]
2003-08-21 19:48:45 +00:00
Simon Tatham
46f26ee483 Richard B's patch to enable users to explicitly request shadow bold
by disabling bold-font-name guessing (if their bold fonts are ugly).
I've turned the UI inside out, but the meat is pretty much the same.

[originally from svn r3410]
2003-08-21 18:39:17 +00:00
Simon Tatham
7798a59987 Richard B's patch to support X cut buffers as well as ordinary
selections, meaning that (a) a pterm can leave copied text in the
cut buffer after it terminates so that applications can pick it up
even though it isn't still around to deliver the selection in
person, and (b) pterm can pick up things left in this way by other
apps.
Downside is that all of this only happens in ISO8859-1, because X is
weird like that.

[originally from svn r3409]
2003-08-21 18:07:27 +00:00
Simon Tatham
11c9c018ec Richard Boulton's patch for improved correctness in selection
handling (generally, selection request timestamps should be set to
the timestamp on the event that caused them).

[originally from svn r3408]
2003-08-21 18:03:06 +00:00
Jacob Nevins
92db92af5a Control of 'addr' is now handed over to {platform_,}new_connection() and
sk_new() on invocation; these functions become responsible for (eventually)
freeing it. The caller must not do anything with 'addr' after it's been passed
in. (Ick.)

Why:
A SOCKS5 crash appears to have been caused by overzealous freeing of
a SockAddr (ssh.c:1.257 [r2492]), which for proxied connections is
squirreled away long-term (and this can't easily be avoided).

It would have been nice to make a copy of the SockAddr, in case the caller has
a use for it, but one of the implementations (uxnet.c) hides a "struct
addrinfo" in there, and we have no defined way to duplicate those. (None of the
current callers _do_ have a further use for the SockAddr.)

As far as I can tell, everything _except_ proxying only needs addr for the
duration of the call, so sk_addr_free()s immediately. If I'm mistaken, it
should at least be easier to find the offending free()...

[originally from svn r3383]
[r2492 == bdd6633970]
2003-08-07 16:04:33 +00:00
Jacob Nevins
f110a51d1f Clarify that '-m' takes a _local_ file.
ref. <kjt9hv49dagqmvru0nq9qcc0f5p11vg0ma@4ax.com>

[originally from svn r3368]
2003-07-16 08:28:31 +00:00
Jacob Nevins
d534d4e104 Add SSH-1 password camouflage bug detection for version OSU_1.4alpha3 of the
OSU VMS SSH server <http://kcgl1.eng.ohio-state.edu/~jonesd/ssh/>.

The changelog appears to indicate that the server was fixed for pwplain1 at
1.5alpha4, and for IGNORE and DEBUG messages at 1.5alpha6. However I'm going
to go on the reports we've had as I haven't tested this; and they indicate
only that 1.5alpha6 is known not to require any bug compatibility modes.

(I wasn't sure whether to add this at all, given that upgrading to version
OSU_1.5alpha6 is an easy way to fix the problem. However, there is precedent
for adding detection for old versions of servers which have since been fixed.)

[originally from svn r3359]
2003-07-12 13:45:21 +00:00
Jacob Nevins
ef14e3959a Add section on "Access denied". This was mostly inspired by the password
camouflage problems with SSH-1.5-OSU_1.4alpha3.

[originally from svn r3358]
2003-07-12 13:25:43 +00:00
Jacob Nevins
8cc836095e Mention Roald Ribe's success with OpenWatcom and Makefile.vc
[originally from svn r3332]
2003-07-06 09:34:03 +00:00
Owen Dunn
893c432a77 Consider bells as a display event.
[originally from svn r3329]
2003-07-05 11:35:33 +00:00
Simon Tatham
5bd604f53f Phase 1a of SFTP re-engineering: fix the glaring memory and request
ID leak in the previous checkin. Oops :-)

[originally from svn r3319]
2003-06-29 14:47:14 +00:00
Simon Tatham
3e44064f32 First phase of SFTP re-engineering. Each base-level fxp_* function
has been split into a send half and a receive half, so that callers
can set several requests in motion at a time and deal with the
responses in whatever order they arrive.

[originally from svn r3318]
2003-06-29 14:26:09 +00:00