Commit Graph

6670 Commits

Author SHA1 Message Date
Darren Tucker 4430a86c14 - djm@cvs.openbsd.org 2012/06/01 00:47:35
[multiplex.sh forwarding.sh]
     append to rather than truncate test log; bz#2013 from openssh AT
     roumenpetrov.
2012-06-30 15:03:28 +10:00
Darren Tucker 301390316c - dtucker@cvs.openbsd.org 2012/05/13 01:42:32
[regress/addrmatch.sh]
     Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
     to match.  Feedback and ok djm@ markus@.
2012-06-30 15:01:22 +10:00
Damien Miller ee3c196ec7 - naddy@cvs.openbsd.org 2012/06/29 13:57:25
[ssh_config.5 sshd_config.5]
     match the documented MAC order of preference to the actual one; ok dtucker@

(actual patch accidentally committed with previous)
2012-06-30 08:35:59 +10:00
Damien Miller db4f8e8618 - dtucker@cvs.openbsd.org 2012/06/28 05:07:45
[mac.c myproposal.h ssh_config.5 sshd_config.5]
     Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
     from draft6 of the spec and will not be in the RFC when published.  Patch
     from mdb at juniper net via bz#2023, ok markus.
2012-06-30 08:34:59 +10:00
Damien Miller 560de922b1 - dtucker@cvs.openbsd.org 2012/06/26 11:02:30
[sandbox-systrace.c]
     Add mquery to the list of allowed syscalls for "UsePrivilegeSeparation
     sandbox" since malloc now uses it.  From johnw.mail at gmail com.
2012-06-30 08:33:53 +10:00
Damien Miller ea8582931f - dtucker@cvs.openbsd.org 2012/06/22 14:36:33
[sftp.c]
     Remove unused variable leftover from tab-completion changes.
     From Steve.McClellan at radisys com, ok markus@
2012-06-30 08:33:32 +10:00
Damien Miller 5f58a87768 - dtucker@cvs.openbsd.org 2012/06/22 12:30:26
[monitor.c sshconnect2.c]
     remove dead code following 'for (;;)' loops.
     From Steve.McClellan at radisys com, ok markus@
2012-06-30 08:33:17 +10:00
Damien Miller 97f43bbfc9 - dtucker@cvs.openbsd.org 2012/06/21 00:16:07
[addrmatch.c]
     fix strlcpy truncation check.  from carsten at debian org, ok markus
2012-06-30 08:32:29 +10:00
Darren Tucker 8908da7dce - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
pointer deref in the client when built with LDNS and using DNSSEC with a
   CNAME.  Patch from gregdlg+mr at hochet info.
2012-06-28 15:21:32 +10:00
Darren Tucker 62dcd63f5e - (dtucker) [contrib/cygwin/ssh-host-config] Ensure that user sshd runs as
can logon as a service.  Patch from vinschen at redhat com.
2012-06-22 22:02:42 +10:00
Damien Miller 6c6da33d31 - djm@cvs.openbsd.org 2012/06/20 04:42:58
[clientloop.c serverloop.c]
     initialise accept() backoff timer to avoid EINVAL from select(2) in
     rekeying
2012-06-20 22:31:26 +10:00
Damien Miller f8268503d1 - jmc@cvs.openbsd.org 2012/06/19 21:35:54
[sshd_config.5]
     tweak previous; ok markus
2012-06-20 21:54:15 +10:00
Damien Miller c24da77015 - markus@cvs.openbsd.org 2012/06/19 18:25:28
[servconf.c servconf.h sshd_config.5]
     sshd_config: extend Match to allow AcceptEnv and {Allow,Deny}{Users,Groups}
     this allows 'Match LocalPort 1022' combined with 'AllowUser bauer'
     ok djm@ (back in March)
2012-06-20 21:53:58 +10:00
Damien Miller 36378c6413 - dtucker@cvs.openbsd.org 2012/06/18 12:17:18
[ssh.1]
     Clarify description of -W.  Noted by Steve.McClellan at radisys com, ok jmc
2012-06-20 21:53:25 +10:00
Damien Miller b9902cf6f6 - dtucker@cvs.openbsd.org 2012/06/18 12:07:07
[ssh.1 sshd.8]
     Remove mention of 'three' key files since there are now four.  From
     Steve.McClellan at radisys com.
2012-06-20 21:52:58 +10:00
Damien Miller 7192433633 - dtucker@cvs.openbsd.org 2012/06/18 11:49:58
[ssh_config.5]
     RSA instead of DSA twice.  From Steve.McClellan at radisys com
2012-06-20 21:52:38 +10:00
Damien Miller 276dcfd7f7 - dtucker@cvs.openbsd.org 2012/06/18 11:43:53
[jpake.c]
     correct sizeof usage.  patch from saw at online.de, ok deraadt
2012-06-20 21:52:18 +10:00
Damien Miller 2e7decfcc0 - djm@cvs.openbsd.org 2012/06/01 01:01:22
[mux.c]
     fix memory leak when mux socket creation fails; bz#2002 from bert.wesarg
     AT googlemail.com
2012-06-20 21:52:00 +10:00
Damien Miller 7f12157c0a - djm@cvs.openbsd.org 2012/06/01 00:49:35
[PROTOCOL.mux]
     correct types of port numbers (integers, not strings); bz#2004 from
     bert.wesarg AT googlemail.com
2012-06-20 21:51:29 +10:00
Damien Miller 3bde12aeef - djm@cvs.openbsd.org 2012/05/23 03:28:28
[dns.c dns.h key.c key.h ssh-keygen.c]
     add support for RFC6594 SSHFP DNS records for ECDSA key types.
     patch from bugzilla-m67 AT nulld.me in bz#1978; ok + tweak markus@
2012-06-20 21:51:11 +10:00
Damien Miller ac58ce86e6 - djm@cvs.openbsd.org 2012/01/07 21:11:36
[mux.c]
     fix double-free in new session handler
     NB. Id sync only
2012-06-20 21:50:47 +10:00
Damien Miller 140df63e1f - djm@cvs.openbsd.org 2011/12/04 23:16:12
[mux.c]
     revert:

     > revision 1.32
     > date: 2011/12/02 00:41:56;  author: djm;  state: Exp;  lines: +4 -1
     > fix bz#1948: ssh -f doesn't fork for multiplexed connection.
     > ok dtucker@

     it interacts badly with ControlPersist
2012-06-20 21:46:57 +10:00
Damien Miller efc6fc995d - djm@cvs.openbsd.org 2011/12/02 00:41:56
[mux.c]
     fix bz#1948: ssh -f doesn't fork for multiplexed connection.
     ok dtucker@
2012-06-20 21:44:56 +10:00
Darren Tucker ba9ea3200d - dtucker@cvs.openbsd.org 2012/05/19 06:30:30
[sshd_config.5]
     Document PermitOpen none.  bz#2001, patch from Loganaden Velvindron
2012-05-19 19:37:33 +10:00
Darren Tucker fbcf827559 - (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2012/05/13 01:42:32
     [servconf.h servconf.c sshd.8 sshd.c auth.c sshd_config.5]
     Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
     to match.  Feedback and ok djm@ markus@.
2012-05-19 19:37:01 +10:00
Darren Tucker 593538911a - (dtucker) [configure.ac contrib/Makefile] bz#1996: use AC_PATH_TOOL to find
pkg-config so it does the right thing when cross-compiling.  Patch from
   cjwatson at debian org.
2012-05-19 15:24:37 +10:00
Darren Tucker d0494fdb29 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
from cjwatson at debian org.
2012-05-19 14:25:39 +10:00
Darren Tucker e1a3ddf992 - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h>
to fix building on some plaforms.  Fom bowman at math utah edu and
   des at des no.
2012-05-04 11:05:45 +10:00
Darren Tucker d0d3fff483 - (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6
platform rather than exiting early, so that we still clean up and return
   status to test-exec.sh
2012-04-27 10:55:39 +10:00
Damien Miller 025bfd11d9 - (djm) [auth-krb5.c] Save errno across calls that might modify it;
ok dtucker@
2012-04-26 09:52:15 +10:00
Damien Miller 7584cb1ac4 - (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters
via Niels
2012-04-26 09:51:26 +10:00
Damien Miller ba77e1f673 - djm@cvs.openbsd.org 2012/04/23 08:18:17
[channels.c]
     fix function proto/source mismatch
2012-04-23 18:21:05 +10:00
Damien Miller 70b2d5550b - jmc@cvs.openbsd.org 2012/04/20 16:26:22
[ssh.1]
     use "brackets" instead of "braces", for consistency;
2012-04-22 11:26:10 +10:00
Damien Miller 4922315d1d - djm@cvs.openbsd.org 2012/04/20 03:24:23
[sftp.c]
     setlinebuf(3) is more readable than setvbuf(.., _IOLBF, ...)
2012-04-22 11:25:47 +10:00
Damien Miller 8fef9ebbab - djm@cvs.openbsd.org 2012/04/12 02:43:55
[sshd_config sshd_config.5]
     mention AuthorizedPrincipalsFile=none default
2012-04-22 11:25:10 +10:00
Damien Miller 23528816dc - djm@cvs.openbsd.org 2012/04/12 02:42:32
[servconf.c servconf.h sshd.c sshd_config sshd_config.5]
     VersionAddendum option to allow server operators to append some arbitrary
     text to the SSH-... banner; ok deraadt@ "don't care" markus@
2012-04-22 11:24:43 +10:00
Damien Miller 839f743464 - djm@cvs.openbsd.org 2012/04/11 13:34:17
[ssh-keyscan.1 ssh-keyscan.c]
     now that sshd defaults to offering ECDSA keys, ssh-keyscan should also
     look for them by default; bz#1971
2012-04-22 11:24:21 +10:00
Damien Miller a116d13c4d - djm@cvs.openbsd.org 2012/04/11 13:26:40
[sshd.c]
     don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
     while; ok deraadt@ markus@
2012-04-22 11:23:46 +10:00
Damien Miller 9fed161e67 - djm@cvs.openbsd.org 2012/04/11 13:17:54
[auth.c]
     Support "none" as an argument for AuthorizedPrincipalsFile to indicate
     no file should be read.
2012-04-22 11:21:43 +10:00
Damien Miller a6508753db - djm@cvs.openbsd.org 2012/04/11 13:16:19
[channels.c channels.h clientloop.c serverloop.c]
     don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
     while; ok deraadt@ markus@
2012-04-22 11:21:10 +10:00
Damien Miller c6081482b2 - dtucker@cvs.openbsd.org 2012/03/29 23:54:36
[channels.c channels.h servconf.c]
     Add PermitOpen none option based on patch from Loganaden Velvindron
     (bz #1949).  ok djm@
2012-04-22 11:18:53 +10:00
Damien Miller 48348fc3b4 - djm@cvs.openbsd.org 2012/03/28 07:23:22
[PROTOCOL.certkeys]
     explain certificate extensions/crit split rationale. Mention requirement
     that each appear at most once per cert.
2012-04-22 11:08:30 +10:00
Damien Miller 29cd188887 - guenther@cvs.openbsd.org 2012/03/15 03:10:27
[session.c]
     root should always be excluded from the test for /etc/nologin instead
     of having it always enforced even when marked as ignorenologin.  This
     regressed when the logic was incompletely flipped around in rev 1.251
     ok halex@ millert@
2012-04-22 11:08:10 +10:00
Damien Miller a563cced06 - djm@cvs.openbsd.org 2012/02/29 11:21:26
[ssh-keygen.c]
     allow conversion of RSA1 keys to public PEM and PKCS8; "nice" markus@
2012-04-22 11:07:28 +10:00
Damien Miller d5dacb43fa - (djm) Release openssh-6.0 2012-04-20 15:01:01 +10:00
Damien Miller bf2304167b - (djm) [README] Update URL to release notes. 2012-04-20 14:11:04 +10:00
Damien Miller 8beb320390 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Update for release 6.0
2012-04-20 10:58:34 +10:00
Damien Miller 398c0ffe0e - (djm) [configure.ac] Fix compilation error on FreeBSD, whose libutil
contains openpty() but not login()
2012-04-19 21:46:35 +10:00
Damien Miller e0956e3834 - (djm) [Makefile.in configure.ac sandbox-seccomp-filter.c] Add sandbox
mode for Linux's new seccomp filter; patch from Will Drewry; feedback
   and ok dtucker@
2012-04-04 11:27:54 +10:00
Damien Miller ce1ec9d4e2 - (djm) [openbsd-compat/bsd-cygwin_util.h] #undef _WIN32 to avoid incorrect
assumptions when building on Cygwin; patch from Corinna Vinschen
2012-03-30 14:07:05 +11:00