dtucker [Sun, 21 Jun 2009 07:56:51 +0000 (07:56 +0000)]
- stevesk@cvs.openbsd.org 2009/04/21 15:13:17
[sshd_config.5]
clarify we cd to user's home after chroot; ok markus@ on
earlier version; tweaks and ok jmc@
dtucker [Sun, 21 Jun 2009 07:50:15 +0000 (07:50 +0000)]
- tobias@cvs.openbsd.org 2009/03/23 19:38:04
[ssh-agent.c]
My previous commit didn't fix the problem at all, so stick at my first
version of the fix presented to dtucker.
Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de).
ok dtucker
dtucker [Sun, 21 Jun 2009 07:49:36 +0000 (07:49 +0000)]
- tobias@cvs.openbsd.org 2009/03/23 08:31:19
[ssh-agent.c]
Fixed a possible out-of-bounds memory access if the environment variable
SHELL is shorter than 3 characters.
with input by and ok dtucker
dtucker [Sun, 21 Jun 2009 07:48:52 +0000 (07:48 +0000)]
- jmc@cvs.openbsd.org 2009/03/19 15:15:09
[ssh.1]
for "Ciphers", just point the reader to the keyword in ssh_config(5), just
as we do for "MACs": this stops us getting out of sync when the lists
change;
fixes documentation/6102, submitted by Peter J. Philipp
alternative fix proposed by djm
ok markus
dtucker [Mon, 4 May 2009 02:52:47 +0000 (02:52 +0000)]
- (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
variable declarations. Should prevent unused warnings anywhere it's set
(only Crays as far as I can tell) and be a no-op everywhere else.
tim [Wed, 18 Mar 2009 18:25:02 +0000 (18:25 +0000)]
- (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
Based on patch from vinschen at redhat com.
dtucker [Sun, 8 Mar 2009 00:40:27 +0000 (00:40 +0000)]
- (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
version of Cygwin. Patch from vinschen at redhat com.
dtucker [Sat, 7 Mar 2009 11:22:35 +0000 (11:22 +0000)]
- (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg
in openssl 0.9.6) so add an explicit test for it.
dtucker [Sat, 7 Mar 2009 01:01:47 +0000 (01:01 +0000)]
- (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
to use them. Allows building with older OpenSSL versions.
dtucker [Fri, 6 Mar 2009 23:22:10 +0000 (23:22 +0000)]
- (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
has a /dev/random).
djm [Thu, 5 Mar 2009 13:58:39 +0000 (13:58 +0000)]
- djm@cvs.openbsd.org 2009/03/05 11:30:50
[uuencode.c]
document what these functions do so I don't ever have to recuse into
b64_pton/ntop to remember their return values
djm [Thu, 5 Mar 2009 13:58:22 +0000 (13:58 +0000)]
- djm@cvs.openbsd.org 2009/03/05 07:18:19
[auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
[sshconnect2.c]
refactor the (disabled) Schnorr proof code to make it a little more
generally useful
djm [Sat, 21 Feb 2009 01:45:18 +0000 (01:45 +0000)]
- djm@cvs.openbsd.org 2009/02/18 04:31:21
[schnorr.c]
signature should hash over the entire group, not just the generator
(this is still disabled code)
djm [Mon, 16 Feb 2009 04:21:39 +0000 (04:21 +0000)]
- (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]
[regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled
interop tests from FATAL error to a warning. Allows some interop
tests to proceed if others are missing necessary prerequisites.
djm [Sat, 14 Feb 2009 05:33:09 +0000 (05:33 +0000)]
- djm@cvs.openbsd.org 2009/02/12 03:16:01
[serverloop.c]
tighten check for -R0:... forwarding: only allow dynamic allocation
if want_reply is set in the packet
djm [Sat, 14 Feb 2009 05:28:21 +0000 (05:28 +0000)]
- djm@cvs.openbsd.org 2009/02/12 03:00:56
[canohost.c canohost.h channels.c channels.h clientloop.c readconf.c]
[readconf.h serverloop.c ssh.c]
support remote port forwarding with a zero listen port (-R0:...) to
dyamically allocate a listen port at runtime (this is actually
specified in rfc4254); bz#1003 ok markus@
djm [Sat, 14 Feb 2009 05:26:19 +0000 (05:26 +0000)]
- dtucker@cvs.openbsd.org 2009/02/02 11:15:14
[sftp.c]
Initialize a few variables to prevent spurious "may be used
uninitialized" warnings from newer gcc's. ok djm@
djm [Thu, 12 Feb 2009 02:12:21 +0000 (02:12 +0000)]
- (djm) [configure.ac loginrec.c] bz#1421: fix lastlog support for OSX.
OSX provides a getlastlogxbyname function that automates the reading of
a lastlog file. Also, the pututxline function will update lastlog so
there is no need for loginrec.c to do it explicitly. Collapse some
overly verbose code while I'm in there.
dtucker [Sun, 1 Feb 2009 11:19:54 +0000 (11:19 +0000)]
- (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in
channels.c too, so move the definition for non-IP6 platforms to defines.h
where it can be shared.
tim [Thu, 29 Jan 2009 20:30:01 +0000 (20:30 +0000)]
- (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
If the CYGWIN environment variable is empty, the installer script
should not install the service with an empty CYGWIN variable, but
rather without setting CYGWNI entirely.
tim [Wed, 28 Jan 2009 20:50:04 +0000 (20:50 +0000)]
- (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x.
The information given for the setting of the CYGWIN environment variable
is wrong for both releases so I just removed it, together with the
unnecessary (Cygwin 1.5.x) or wrong (Cygwin 1.7.x) default setting.
djm [Wed, 28 Jan 2009 05:38:41 +0000 (05:38 +0000)]
- markus@cvs.openbsd.org 2009/01/26 09:58:15
[cipher.c cipher.h packet.c]
Work around the CPNI-957037 Plaintext Recovery Attack by always
reading 256K of data on packet size or HMAC errors (in CBC mode only).
Help, feedback and ok djm@
Feedback from Martin Albrecht and Paterson Kenny
djm [Wed, 28 Jan 2009 05:31:22 +0000 (05:31 +0000)]
- djm@cvs.openbsd.org 2009/01/22 10:02:34
[clientloop.c misc.c readconf.c readconf.h servconf.c servconf.h]
[serverloop.c ssh-keyscan.c ssh.c sshd.c]
make a2port() return -1 when it encounters an invalid port number
rather than 0, which it will now treat as valid (needed for future work)
adjust current consumers of a2port() to check its return value is <= 0,
which in turn required some things to be converted from u_short => int
make use of int vs. u_short consistent in some other places too
feedback & ok markus@
djm [Wed, 28 Jan 2009 05:30:33 +0000 (05:30 +0000)]
- djm@cvs.openbsd.org 2009/01/22 09:49:57
[channels.c]
oops! I committed the wrong version of the Channel->path diff,
it was missing some tweaks suggested by stevesk@
djm [Wed, 28 Jan 2009 05:29:49 +0000 (05:29 +0000)]
- djm@cvs.openbsd.org 2009/01/22 09:46:01
[channels.c channels.h session.c]
make Channel->path an allocated string, saving a few bytes here and
there and fixing bz#1380 in the process; ok markus@
djm [Wed, 28 Jan 2009 05:27:31 +0000 (05:27 +0000)]
- stevesk@cvs.openbsd.org 2009/01/15 17:38:43
[readconf.c]
1) use obsolete instead of alias for consistency
2) oUserKnownHostsFile not obsolete but oGlobalKnownHostsFile2 is
so move the comment.
3) reorder so like options are together
ok djm@
djm [Wed, 28 Jan 2009 05:23:06 +0000 (05:23 +0000)]
- djm@cvs.openbsd.org 2009/01/01 21:17:36
[kexgexs.c]
fix hash calculation for KEXGEX: hash over the original client-supplied
values and not the sanity checked versions that we acutally use;
bz#1540 reported by john.smith AT arrows.demon.co.uk
ok markus@
djm [Wed, 28 Jan 2009 05:22:34 +0000 (05:22 +0000)]
- djm@cvs.openbsd.org 2009/01/01 21:14:35
[channels.c]
call channel destroy callbacks on receipt of open failure messages.
fixes client hangs when connecting to a server that has MaxSessions=0
set spotted by imorgan AT nas.nasa.gov; ok markus@
djm [Wed, 28 Jan 2009 05:14:09 +0000 (05:14 +0000)]
- sobrado@cvs.openbsd.org 2008/12/09 15:35:00
[sftp.1 sftp.c]
update for the synopses displayed by the 'help' command, there are a
few missing flags; add 'bye' to the output of 'help'; sorting and spacing.
jmc@ suggested replacing .Oo/.Oc with a single .Op macro.
ok jmc@
djm [Wed, 28 Jan 2009 05:13:04 +0000 (05:13 +0000)]
- stevesk@cvs.openbsd.org 2008/12/09 03:20:42
[channels.c servconf.c]
channel_print_adm_permitted_opens() should deal with all the printing
for that config option. suggested by markus@; ok markus@ djm@
dtucker@
djm [Wed, 21 Jan 2009 09:29:20 +0000 (09:29 +0000)]
- (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make
ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity"
key). Patch from cjwatson AT debian.org
djm [Tue, 9 Dec 2008 03:12:05 +0000 (03:12 +0000)]
- djm@cvs.openbsd.org 2008/12/09 02:58:16
[readconf.c]
don't leave junk (free'd) pointers around in Forward *fwd argument on
failure; avoids double-free in ~C -L handler when given an invalid
forwarding specification; bz#1539 report from adejong AT debian.org
via Colin Watson; ok markus@ dtucker@
djm [Tue, 9 Dec 2008 03:11:49 +0000 (03:11 +0000)]
- djm@cvs.openbsd.org 2008/12/09 02:39:59
[sftp.c]
Deal correctly with failures in remote stat() operation in sftp,
correcting fail-on-error behaviour in batchmode. bz#1541 report and
fix from anedvedicky AT gmail.com; ok markus@
djm [Tue, 9 Dec 2008 03:11:32 +0000 (03:11 +0000)]
- djm@cvs.openbsd.org 2008/12/09 02:38:18
[clientloop.c]
The ~C escape handler does not work correctly for multiplexed sessions -
it opens a commandline on the master session, instead of on the slave
that requested it. Disable it on slave sessions until such time as it
is fixed; bz#1543 report from Adrian Bridgett via Colin Watson
ok markus@
djm [Sun, 7 Dec 2008 22:55:02 +0000 (22:55 +0000)]
- markus@cvs.openbsd.org 2008/12/02 19:08:59
[serverloop.c]
backout 1.149, since it's not necessary and openssh clients send
broken CHANNEL_FAILURE/SUCCESS messages since about 2004; ok djm@
djm [Sun, 7 Dec 2008 22:54:40 +0000 (22:54 +0000)]
- markus@cvs.openbsd.org 2008/12/02 19:01:07
[clientloop.c]
we have to use the recipient's channel number (RFC 4254) for
SSH2_MSG_CHANNEL_SUCCESS/SSH2_MSG_CHANNEL_FAILURE messages,
otherwise we trigger 'Non-public channel' error messages on sshd
systems with clientkeepalive enabled; noticed by sturm; ok djm;
dtucker [Mon, 1 Dec 2008 10:40:48 +0000 (10:40 +0000)]
- markus@cvs.openbsd.org 2008/11/21 15:47:38
[packet.c]
packet_disconnect() on padding error, too. should reduce the success
probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18
ok djm@
dtucker [Mon, 1 Dec 2008 10:34:28 +0000 (10:34 +0000)]
- (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}] Add new doc files
and tweak the is-sshd-running check in ssh-host-config. Patch from
vinschen at redhat com.
dtucker [Sun, 23 Nov 2008 03:03:19 +0000 (03:03 +0000)]
- (dtucker) [monitor_fdpass.c] Reduce diff vs OpenBSD by moving some
declarations, removing an unnecessary union member and adding whitespace.
ok djm some time ago.
tim [Wed, 19 Nov 2008 05:26:41 +0000 (05:26 +0000)]
- (tim) [addrmatch.c configure.ac] Some platforms do not have sin6_scope_id
member of sockaddr_in6. Also reported in Bug 1491 by David Leonard. OK and
feedback by djm@
dtucker [Tue, 11 Nov 2008 05:40:22 +0000 (05:40 +0000)]
- stevesk@cvs.openbsd.org 2008/11/11 03:55:11
[channels.c]
for sshd -T print 'permitopen any' vs. 'permitopen' for case of no
permitopen's; ok and input dtucker@
dtucker [Tue, 11 Nov 2008 05:39:44 +0000 (05:39 +0000)]
- stevesk@cvs.openbsd.org 2008/11/11 02:58:09
[servconf.c]
USE_AFS not referenced so remove #ifdef. fixes sshd -T not printing
kerberosgetafstoken. ok dtucker@
(Id sync only, we still want the ifdef in portable)
djm [Wed, 5 Nov 2008 05:30:06 +0000 (05:30 +0000)]
- stevesk@cvs.openbsd.org 2008/11/04 19:18:00
[readconf.c]
because parse_forward() is now used to parse all forward types (DLR),
and it malloc's space for host variables, we don't need to malloc
here. fixes small memory leaks.
previously dynamic forwards were not parsed in parse_forward() and
space was not malloc'd in that case.