Darren Tucker [Sun, 23 Nov 2008 03:03:19 +0000 (14:03 +1100)]
- (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 Rice [Wed, 19 Nov 2008 05:26:41 +0000 (21:26 -0800)]
- (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@
Darren Tucker [Tue, 11 Nov 2008 05:40:22 +0000 (16:40 +1100)]
- 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@
Darren Tucker [Tue, 11 Nov 2008 05:39:44 +0000 (16:39 +1100)]
- 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)
Damien Miller [Wed, 5 Nov 2008 05:30:06 +0000 (16:30 +1100)]
- 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.
Damien Miller [Wed, 5 Nov 2008 05:20:46 +0000 (16:20 +1100)]
- djm@cvs.openbsd.org 2008/11/04 08:22:13
[auth.h auth2.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h]
[readconf.c readconf.h servconf.c servconf.h ssh2.h ssh_config.5]
[sshconnect2.c sshd_config.5 jpake.c jpake.h schnorr.c auth2-jpake.c]
[Makefile.in]
Add support for an experimental zero-knowledge password authentication
method using the J-PAKE protocol described in F. Hao, P. Ryan,
"Password Authenticated Key Exchange by Juggling", 16th Workshop on
Security Protocols, Cambridge, April 2008.
This method allows password-based authentication without exposing
the password to the server. Instead, the client and server exchange
cryptographic proofs to demonstrate of knowledge of the password while
revealing nothing useful to an attacker or compromised endpoint.
This is experimental, work-in-progress code and is presently
compiled-time disabled (turn on -DJPAKE in Makefile.inc).
"just commit it. It isn't too intrusive." deraadt@
Damien Miller [Mon, 3 Nov 2008 09:18:12 +0000 (20:18 +1100)]
- (djm) [contrib/sshd.pam.generic contrib/caldera/sshd.pam]
[contrib/redhat/sshd.pam] Move pam_nologin to account group from
incorrect auth group in example files;
patch from imorgan AT nas.nasa.gov
Damien Miller [Mon, 3 Nov 2008 09:16:01 +0000 (20:16 +1100)]
- (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd]
Make example scripts generate keys with default sizes rather than fixed,
non-default 1024 bits; patch from imorgan AT nas.nasa.gov
Damien Miller [Mon, 3 Nov 2008 08:24:45 +0000 (19:24 +1100)]
- stevesk@cvs.openbsd.org 2008/10/10 16:43:27
[ssh_config.5]
use 'Privileged ports can be forwarded only when logging in as root on
the remote machine.' for RemoteForward just like ssh.1 -R.
ok djm@ jmc@
Damien Miller [Mon, 3 Nov 2008 08:23:10 +0000 (19:23 +1100)]
- djm@cvs.openbsd.org 2008/10/09 03:50:54
[servconf.c sshd_config.5]
support setting PermitEmptyPasswords in a Match block
requested in PR3891; ok dtucker@
Damien Miller [Mon, 3 Nov 2008 08:22:37 +0000 (19:22 +1100)]
- djm@cvs.openbsd.org 2008/10/08 23:34:03
[ssh.1 ssh.c]
Add -y option to force logging via syslog rather than stderr.
Useful for daemonised ssh connection (ssh -f). Patch originally from
and ok'd by markus@
Damien Miller [Mon, 3 Nov 2008 08:22:09 +0000 (19:22 +1100)]
aadt@cvs.openbsd.org 2008/10/03 23:56:28
[sshconnect2.c]
Repair strnvis() buffersize of 4*n+1, with termination gauranteed by the
function.
spotted by des@freebsd, who commited an incorrect fix to the freebsd tree
and (as is fairly typical) did not report the problem to us. But this fix
is correct.
ok djm
Damien Miller [Mon, 3 Nov 2008 08:21:21 +0000 (19:21 +1100)]
- jmc@cvs.openbsd.org 2008/10/03 13:08:12
[sshd.8]
do not give an example of how to chmod files: we can presume the user
knows that. removes an ambiguity in the permission of authorized_keys;
ok deraadt
Damien Miller [Mon, 3 Nov 2008 08:20:10 +0000 (19:20 +1100)]
- markus@cvs.openbsd.org 2008/09/11 14:22:37
[compat.c compat.h nchan.c ssh.c]
only send eow and no-more-sessions requests to openssh 5 and newer;
fixes interop problems with broken ssh v2 implementations; ok djm@
Damien Miller [Mon, 3 Nov 2008 08:19:12 +0000 (19:19 +1100)]
- djm@cvs.openbsd.org 2008/09/06 12:24:13
[kex.c]
OpenSSL 0.9.8h supplies a real EVP_sha256 so we do not need our
replacement anymore
(ID sync only for portable - we still need this)
Damien Miller [Mon, 3 Nov 2008 08:17:57 +0000 (19:17 +1100)]
- djm@cvs.openbsd.org 2008/08/21 04:09:57
[session.c]
allow ForceCommand internal-sftp with arguments. based on patch from
michael.barabanov AT gmail.com; ok markus@
Damien Miller [Mon, 3 Nov 2008 08:16:20 +0000 (19:16 +1100)]
- grunk@cvs.openbsd.org 2008/07/25 07:05:16
[key.c]
In random art visualization, make sure to use the end marker only at the
end. Initial diff by Dirk Loss, tweaks and ok djm@
Darren Tucker [Fri, 29 Aug 2008 21:32:37 +0000 (07:32 +1000)]
- (dtucker) [openbsd-compat/bsd-poll.c] correctly check for number of FDs
larger than FD_SETSIZE (OpenSSH only ever uses poll with one fd). Patch
from Nicholas Marriott.
Damien Miller [Wed, 23 Jul 2008 07:40:04 +0000 (17:40 +1000)]
- djm@cvs.openbsd.org 2008/07/23 07:36:55
[servconf.c]
do not try to print options that have been compile-time disabled
in config test mode (sshd -T); report from nix-corp AT esperi.org.uk
ok dtucker@
Darren Tucker [Thu, 17 Jul 2008 09:03:49 +0000 (19:03 +1000)]
- (dtucker) [openbsd-compat/bsd-cygwin_util.c] Remove long-unneeded compat
code, replace with equivalent cygwin library call. Patch from vinschen
at redhat.comi, ok djm@.
Damien Miller [Thu, 17 Jul 2008 08:57:19 +0000 (18:57 +1000)]
- djm@cvs.openbsd.org 2008/07/17 08:51:07
[auth2-hostbased.c]
strip trailing '.' from hostname when HostbasedUsesNameFromPacketOnly=yes
report and patch from res AT qoxp.net (bz#1200); ok markus@
Damien Miller [Mon, 14 Jul 2008 11:37:36 +0000 (21:37 +1000)]
- (djm) [openbsd-compat/fake-rfc2553.c openbsd-compat/fake-rfc2553.h]
return EAI_FAMILY when trying to lookup unsupported address family;
from vinschen AT redhat.com
Damien Miller [Mon, 14 Jul 2008 02:02:24 +0000 (12:02 +1000)]
- (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to
avoid clash with sin(3) function; reported by
cristian.ionescu-idbohrn AT axis.com
Damien Miller [Mon, 14 Jul 2008 01:29:24 +0000 (11:29 +1000)]
- djm@cvs.openbsd.org 2008/07/13 22:16:03
[sftp.c]
increase number of piplelined requests so they properly fill the
(recently increased) channel window. prompted by rapier AT psc.edu;
ok markus@
Damien Miller [Mon, 14 Jul 2008 01:28:58 +0000 (11:28 +1000)]
- djm@cvs.openbsd.org 2008/07/13 22:13:07
[channels.c]
use struct sockaddr_storage instead of struct sockaddr for accept(2)
address argument. from visibilis AT yahoo.com in bz#1485; ok markus@
Damien Miller [Mon, 14 Jul 2008 01:28:29 +0000 (11:28 +1000)]
- sthen@cvs.openbsd.org 2008/07/13 21:22:52
[ssh-keygen.c]
Change "ssh-keygen -F [host] -l" to not display random art unless
-v is also specified, making it consistent with the manual and other
uses of -l.
ok grunk@
Damien Miller [Sat, 12 Jul 2008 07:12:29 +0000 (17:12 +1000)]
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2008/07/12 04:52:50
[channels.c]
unbreak; move clearing of cctx struct to before first use
reported by dkrause@
Damien Miller [Fri, 11 Jul 2008 07:35:09 +0000 (17:35 +1000)]
- stevesk@cvs.openbsd.org 2008/07/07 23:32:51
[key.c]
/*NOTREACHED*/ for lint warning:
warning: function key_equal falls off bottom without returning value
ok djm@
Damien Miller [Wed, 9 Jul 2008 10:54:05 +0000 (20:54 +1000)]
- (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM
account check failure path. The vulnerable format buffer is supplied
from PAM and should not contain attacker-supplied data.
Damien Miller [Fri, 4 Jul 2008 23:44:53 +0000 (09:44 +1000)]
- djm@cvs.openbsd.org 2008/07/04 23:30:16
[auth1.c auth2.c]
Make protocol 1 MaxAuthTries logic match protocol 2's.
Do not treat the first protocol 2 authentication attempt as
a failure IFF it is for method "none".
Makes MaxAuthTries' user-visible behaviour identical for
protocol 1 vs 2.
ok dtucker@
Damien Miller [Fri, 4 Jul 2008 23:36:58 +0000 (09:36 +1000)]
- (djm) [atomicio.c configure.ac] Disable poll() fallback in atomiciov for
Tru64. readv doesn't seem to be a comparable object there.
bz#1386, patch from dtucker@ ok me
Damien Miller [Fri, 4 Jul 2008 22:59:43 +0000 (08:59 +1000)]
- (djm) [auth.c] Fixed test for locked account on HP/UX with shadowed
passwords disabled. bz#1083 report & patch from senthilkumar_sen AT
hotpop.com, w/ dtucker@
Damien Miller [Fri, 4 Jul 2008 13:10:49 +0000 (23:10 +1000)]
- (djm) [atomicio.c channels.c clientloop.c defines.h includes.h]
[packet.c scp.c serverloop.c sftp-client.c ssh-agent.c ssh-keyscan.c]
[sshd.c] Explicitly handle EWOULDBLOCK wherever we handle EAGAIN, on
some platforms (HP nonstop) it is a distinct errno;
bz#1467 reported by sconeu AT yahoo.com; ok dtucker@
Darren Tucker [Fri, 4 Jul 2008 03:51:12 +0000 (13:51 +1000)]
- djm@cvs.openbsd.org 2008/07/04 03:44:59
[servconf.c groupaccess.h groupaccess.c]
support negation of groups in "Match group" block (bz#1315); ok dtucker@
Darren Tucker [Fri, 4 Jul 2008 02:53:50 +0000 (12:53 +1000)]
- djm@cvs.openbsd.org 2008/07/02 13:47:39
[ssh.1 ssh.c]
When forking after authentication ("ssh -f") with ExitOnForwardFailure
enabled, delay the fork until after replies for any -R forwards have
been seen. Allows for robust detection of -R forward failure when
using -f (similar to bz#92); ok dtucker@
Darren Tucker [Wed, 2 Jul 2008 12:56:09 +0000 (22:56 +1000)]
- djm@cvs.openbsd.org 2008/07/02 12:36:39
[auth2-none.c auth2.c]
Make protocol 2 MaxAuthTries behaviour a little more sensible:
Check whether client has exceeded MaxAuthTries before running
an authentication method and skip it if they have, previously it
would always allow one try (for "none" auth).
Preincrement failure count before post-auth test - previously this
checked and postincremented, also to allow one "none" try.
Together, these two changes always count the "none" auth method
which could be skipped by a malicious client (e.g. an SSH worm)
to get an extra attempt at a real auth method. They also make
MaxAuthTries=0 a useful way to block users entirely (esp. in a
sshd_config Match block).
Also, move sending of any preauth banner from "none" auth method
to the first call to input_userauth_request(), so worms that skip
the "none" method get to see it too.
Darren Tucker [Wed, 2 Jul 2008 12:37:30 +0000 (22:37 +1000)]
- dtucker@cvs.openbsd.org 2008/07/02 12:03:51
[auth-rsa.c auth.c auth2-pubkey.c auth.h]
Merge duplicate host key file checks, based in part on a patch from Rob
Holland via bz #1348 . Also checks for non-regular files during protocol
1 RSA auth. ok djm@
projects / thirdparty / openssh-portable.git / log
