]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
10 years agoLook for '${host}-ar' before 'ar'.
Darren Tucker [Thu, 16 Apr 2015 23:39:58 +0000 (09:39 +1000)] 
Look for '${host}-ar' before 'ar'.

This changes configure.ac to look for '${host}-ar' as set by
AC_CANONICAL_HOST before looking for the unprefixed 'ar'.
Useful when cross-compiling when all your binutils are prefixed.

Patch from moben at exherbo org via astrand at lysator liu se and
bz#2352.

10 years agoremove dependency on arpa/telnet.h
Damien Miller [Thu, 16 Apr 2015 01:40:20 +0000 (11:40 +1000)] 
remove dependency on arpa/telnet.h

10 years agoRemove duplicate include of pwd.h. bz#2337, patch from Mordy Ovits.
Darren Tucker [Wed, 15 Apr 2015 05:59:49 +0000 (15:59 +1000)] 
Remove duplicate include of pwd.h.  bz#2337, patch from Mordy Ovits.

10 years agoplatform's with openpty don't need pty_release
Damien Miller [Thu, 9 Apr 2015 00:14:48 +0000 (10:14 +1000)] 
platform's with openpty don't need pty_release

10 years agoupstream commit
djm@openbsd.org [Mon, 13 Apr 2015 02:04:08 +0000 (02:04 +0000)] 
upstream commit

deprecate ancient, pre-RFC4419 and undocumented
 SSH2_MSG_KEX_DH_GEX_REQUEST_OLD message; ok markus@ deraadt@ "seems
 reasonable" dtucker@

10 years agoupstream commit
dtucker@openbsd.org [Fri, 10 Apr 2015 05:16:50 +0000 (05:16 +0000)] 
upstream commit

Don't send hostkey advertisments
 (hostkeys-00@openssh.com) to current versions of Tera Term as they can't
 handle them.  Newer versions should be OK.  Patch from Bryan Drewery and
 IWAMOTO Kouichi, ok djm@

10 years agoupstream commit
djm@openbsd.org [Fri, 10 Apr 2015 00:08:55 +0000 (00:08 +0000)] 
upstream commit

include port number if a non-default one has been
 specified; based on patch from Michael Handler

10 years agoupstream commit
djm@openbsd.org [Tue, 7 Apr 2015 23:00:42 +0000 (23:00 +0000)] 
upstream commit

treat Protocol=1,2|2,1 as Protocol=2 when compiled
 without SSH1 support; ok dtucker@ millert@

10 years agoupstream commit
miod@openbsd.org [Sun, 5 Apr 2015 15:43:43 +0000 (15:43 +0000)] 
upstream commit

Do not use int for sig_atomic_t; spotted by
 christos@netbsd; ok markus@

10 years agoUse do{}while(0) for no-op functions.
Darren Tucker [Tue, 7 Apr 2015 00:48:04 +0000 (10:48 +1000)] 
Use do{}while(0) for no-op functions.

From FreeBSD.

10 years agoWrap blf.h include in ifdef. From FreeBSD.
Darren Tucker [Tue, 7 Apr 2015 00:47:15 +0000 (10:47 +1000)] 
Wrap blf.h include in ifdef.  From FreeBSD.

10 years agoFix misspellings of regress CONFOPTS env variables.
Darren Tucker [Mon, 6 Apr 2015 23:10:00 +0000 (09:10 +1000)] 
Fix misspellings of regress CONFOPTS env variables.

Patch from Bryan Drewery.

10 years agoupstream commit
djm@openbsd.org [Fri, 3 Apr 2015 22:17:27 +0000 (22:17 +0000)] 
upstream commit

correct return value in pubkey parsing, spotted by Ben Hawkes
 ok markus@

10 years agoupstream commit
djm@openbsd.org [Tue, 31 Mar 2015 22:59:01 +0000 (22:59 +0000)] 
upstream commit

adapt to recent hostfile.c change: when parsing
 known_hosts without fully parsing the keys therein, hostkeys_foreach() will
 now correctly identify KEY_RSA1 keys; ok markus@ miod@

10 years agoupstream commit
markus@openbsd.org [Tue, 24 Mar 2015 20:19:15 +0000 (20:19 +0000)] 
upstream commit

use ${SSH} for -Q instead of installed ssh

10 years agoupstream commit
djm@openbsd.org [Mon, 16 Mar 2015 22:46:14 +0000 (22:46 +0000)] 
upstream commit

make CLEANFILES clean up more of the tests' droppings

10 years agoupstream commit
djm@openbsd.org [Tue, 31 Mar 2015 22:57:06 +0000 (22:57 +0000)] 
upstream commit

downgrade error() for known_hosts parse errors to debug()
 to quiet warnings from ssh1 keys present when compiled !ssh1.

also identify ssh1 keys when scanning, even when compiled !ssh1

ok markus@ miod@

10 years agoupstream commit
djm@openbsd.org [Tue, 31 Mar 2015 22:55:50 +0000 (22:55 +0000)] 
upstream commit

fd leak for !ssh1 case; found by unittests; ok markus@

10 years agoupstream commit
djm@openbsd.org [Tue, 31 Mar 2015 22:55:24 +0000 (22:55 +0000)] 
upstream commit

don't fatal when a !ssh1 sshd is reexeced from a w/ssh1
 listener; reported by miod@; ok miod@ markus@

10 years agoupstream commit
tobias@openbsd.org [Tue, 31 Mar 2015 11:06:49 +0000 (11:06 +0000)] 
upstream commit

Comments are only supported for RSA1 keys. If a user
 tried to add one and entered his passphrase, explicitly clear it before exit.
 This is done in all other error paths, too.

ok djm

10 years agoupstream commit
jmc@openbsd.org [Mon, 30 Mar 2015 18:28:37 +0000 (18:28 +0000)] 
upstream commit

ssh-askpass(1) is the default, overridden by SSH_ASKPASS;
 diff originally from jiri b;

10 years agoupstream commit
djm@openbsd.org [Mon, 30 Mar 2015 00:00:29 +0000 (00:00 +0000)] 
upstream commit

fix uninitialised memory read when parsing a config file
 consisting of a single nul byte. Found by hanno AT hboeck.de using AFL; ok
 dtucker

10 years agoupstream commit
markus@openbsd.org [Thu, 26 Mar 2015 19:32:19 +0000 (19:32 +0000)] 
upstream commit

sigp and lenp are not optional in ssh_agent_sign(); ok
 djm@

10 years agoupstream commit
naddy@openbsd.org [Thu, 26 Mar 2015 12:32:38 +0000 (12:32 +0000)] 
upstream commit

don't try to load .ssh/identity by default if SSH1 is
 disabled; ok markus@

10 years agoupstream commit
djm@openbsd.org [Thu, 26 Mar 2015 07:00:04 +0000 (07:00 +0000)] 
upstream commit

ban all-zero curve25519 keys as recommended by latest
 CFRG curves draft; ok markus

10 years agoupstream commit
djm@openbsd.org [Thu, 26 Mar 2015 06:59:28 +0000 (06:59 +0000)] 
upstream commit

relax bits needed check to allow
 diffie-hellman-group1-sha1 key exchange to complete for chacha20-poly1305 was
 selected as symmetric cipher; ok markus

10 years agoupstream commit
markus@openbsd.org [Wed, 25 Mar 2015 19:29:58 +0000 (19:29 +0000)] 
upstream commit

ignore v1 errors on ssh-add -D; only try v2 keys on
 -l/-L (unless WITH_SSH1) ok djm@

10 years agoupstream commit
markus@openbsd.org [Wed, 25 Mar 2015 19:21:48 +0000 (19:21 +0000)] 
upstream commit

unbreak ssh_agent_sign (lenp vs *lenp)

10 years agoupstream commit
markus@openbsd.org [Tue, 24 Mar 2015 20:10:08 +0000 (20:10 +0000)] 
upstream commit

don't leak 'setp' on error; noted by Nicholas Lemonias;
 ok djm@

10 years agoupstream commit
markus@openbsd.org [Tue, 24 Mar 2015 20:09:11 +0000 (20:09 +0000)] 
upstream commit

consistent check for NULL as noted by Nicholas
 Lemonias; ok djm@

10 years agoupstream commit
markus@openbsd.org [Tue, 24 Mar 2015 20:03:44 +0000 (20:03 +0000)] 
upstream commit

correct fmt-string for size_t as noted by Nicholas
 Lemonias; ok djm@

10 years agoupstream commit
djm@openbsd.org [Tue, 24 Mar 2015 09:17:21 +0000 (09:17 +0000)] 
upstream commit

promote chacha20-poly1305@openssh.com to be the default
 cipher; ok markus

10 years agoupstream commit
djm@openbsd.org [Tue, 24 Mar 2015 01:29:19 +0000 (01:29 +0000)] 
upstream commit

Compile-time disable SSH protocol 1. You can turn it
 back on using the Makefile.inc knob if you need it to talk to ancient
 devices.

10 years agoupstream commit
djm@openbsd.org [Tue, 24 Mar 2015 01:11:12 +0000 (01:11 +0000)] 
upstream commit

fix double-negative error message "ssh1 is not
 unsupported"

10 years agoupstream commit
djm@openbsd.org [Mon, 23 Mar 2015 06:06:38 +0000 (06:06 +0000)] 
upstream commit

for ssh-keygen -A, don't try (and fail) to generate ssh
 v.1 keys when compiled without SSH1 support RSA/DSA/ECDSA keys when compiled
 without OpenSSL based on patch by Mike Frysinger; bz#2369

10 years agoupstream commit
djm@openbsd.org [Wed, 18 Mar 2015 01:44:21 +0000 (01:44 +0000)] 
upstream commit

KRL support doesn't need OpenSSL anymore, remove #ifdefs
 from around call

10 years agoupstream commit
djm@openbsd.org [Mon, 16 Mar 2015 11:09:52 +0000 (11:09 +0000)] 
upstream commit

#if 0 some more arrays used only for decrypting (we don't
 use since we only need encrypt for AES-CTR)

10 years agoupstream commit
jsg@openbsd.org [Wed, 11 Mar 2015 00:48:39 +0000 (00:48 +0000)] 
upstream commit

add back the changes from rev 1.206, djm reverted this by
 mistake in rev 1.207

10 years agoremove error() accidentally inserted for debugging
Damien Miller [Thu, 19 Mar 2015 22:11:59 +0000 (09:11 +1100)] 
remove error() accidentally inserted for debugging

pointed out by Christian Hesse

10 years agoportability fix: Solaris systems may not have a grep that understands -q V_6_8_P1
Tim Rice [Tue, 17 Mar 2015 05:49:20 +0000 (22:49 -0700)] 
portability fix: Solaris systems may not have a grep that understands -q

10 years agofix compile with clang
Damien Miller [Tue, 10 Mar 2015 23:35:26 +0000 (10:35 +1100)] 
fix compile with clang

10 years agomake unit tests work for !OPENSSH_HAS_ECC
Damien Miller [Tue, 10 Mar 2015 23:02:39 +0000 (10:02 +1100)] 
make unit tests work for !OPENSSH_HAS_ECC

10 years agoupstream commit
djm@openbsd.org [Sat, 7 Mar 2015 04:41:48 +0000 (04:41 +0000)] 
upstream commit

unbreak for w/SSH1 (default) case; ok markus@ deraadt@

10 years agounbreak hostkeys test for w/ SSH1 case
Damien Miller [Fri, 6 Mar 2015 02:39:20 +0000 (18:39 -0800)] 
unbreak hostkeys test for w/ SSH1 case

10 years agoupstream commit
djm@openbsd.org [Fri, 6 Mar 2015 01:40:56 +0000 (01:40 +0000)] 
upstream commit

fix sshkey_certify() return value for unsupported key types;
 ok markus@ deraadt@

10 years agoupdate version numbers to match version.h
Damien Miller [Wed, 4 Mar 2015 23:38:03 +0000 (15:38 -0800)] 
update version numbers to match version.h

10 years agoupstream commit
djm@openbsd.org [Wed, 4 Mar 2015 23:22:35 +0000 (23:22 +0000)] 
upstream commit

make these work with !SSH1; ok markus@ deraadt@

10 years agoupstream commit
djm@openbsd.org [Wed, 4 Mar 2015 21:12:59 +0000 (21:12 +0000)] 
upstream commit

make ssh-add -D work with !SSH1 agent

10 years agonetcat needs poll.h portability goop
Damien Miller [Wed, 4 Mar 2015 08:55:48 +0000 (00:55 -0800)] 
netcat needs poll.h portability goop

10 years agoupstream commit
markus@openbsd.org [Tue, 3 Mar 2015 22:35:19 +0000 (22:35 +0000)] 
upstream commit

make it possible to run tests w/o ssh1 support; ok djm@

10 years agoupstream commit
djm@openbsd.org [Wed, 4 Mar 2015 18:53:53 +0000 (18:53 +0000)] 
upstream commit

crank; ok markus, deraadt

10 years agomore --without-ssh1 fixes
Damien Miller [Tue, 3 Mar 2015 21:50:27 +0000 (13:50 -0800)] 
more --without-ssh1 fixes

10 years agofix merge both that broke --without-ssh1 compile
Damien Miller [Tue, 3 Mar 2015 21:48:48 +0000 (13:48 -0800)] 
fix merge both that broke --without-ssh1 compile

10 years agoupstream commit
djm@openbsd.org [Tue, 3 Mar 2015 21:21:13 +0000 (21:21 +0000)] 
upstream commit

add SSH1 Makefile knob to make it easier to build without
 SSH1 support; ok markus@

10 years agoupstream commit
djm@openbsd.org [Tue, 3 Mar 2015 20:42:49 +0000 (20:42 +0000)] 
upstream commit

expand __unused to full __attribute__ for better portability

10 years agoavoid warning
Damien Miller [Tue, 3 Mar 2015 20:41:27 +0000 (07:41 +1100)] 
avoid warning

10 years agoRevert "define __unused to nothing if not already defined"
Damien Miller [Tue, 3 Mar 2015 19:31:45 +0000 (06:31 +1100)] 
Revert "define __unused to nothing if not already defined"

This reverts commit 1598419e38afbaa8aa5df8dd6b0af98301e2c908.

Some system headers have objects named __unused

10 years agocheck for crypt and DES_crypt in openssl block
Damien Miller [Tue, 3 Mar 2015 18:02:45 +0000 (05:02 +1100)] 
check for crypt and DES_crypt in openssl block

fixes builds on systems that use DES_crypt; based on patch
from Roumen Petrov

10 years agodefine __unused to nothing if not already defined
Damien Miller [Tue, 3 Mar 2015 17:59:13 +0000 (04:59 +1100)] 
define __unused to nothing if not already defined

fixes builds on BSD/OS

10 years agoupstream commit
djm@openbsd.org [Tue, 3 Mar 2015 17:53:40 +0000 (17:53 +0000)] 
upstream commit

reorder logic for better portability; patch from Roumen
 Petrov

10 years agoupstream commit
djm@openbsd.org [Tue, 3 Mar 2015 06:48:58 +0000 (06:48 +0000)] 
upstream commit

Allow "ssh -Q protocol-version" to list supported SSH
 protocol versions. Useful for detecting builds without SSH v.1 support; idea
 and ok markus@

10 years agoupstream commit
millert@openbsd.org [Sun, 1 Mar 2015 15:44:40 +0000 (15:44 +0000)] 
upstream commit

Make sure we only call getnameinfo() for AF_INET or AF_INET6
 sockets. getpeername() of a Unix domain socket may return without error on
 some systems without actually setting ss_family so getnameinfo() was getting
 called with ss_family set to AF_UNSPEC.  OK djm@

10 years agoportability fixes for regress/netcat.c
Damien Miller [Sat, 28 Feb 2015 16:20:11 +0000 (08:20 -0800)] 
portability fixes for regress/netcat.c

Mostly avoiding "err(1, NULL)"

10 years agotwiddle another test for portability
Damien Miller [Sat, 28 Feb 2015 16:05:27 +0000 (08:05 -0800)] 
twiddle another test for portability

from Tom G. Christensen

10 years agotwiddle test for portability
Damien Miller [Fri, 27 Feb 2015 23:52:49 +0000 (15:52 -0800)] 
twiddle test for portability

10 years agomake regress/netcat.c fd passing (more) portable
Damien Miller [Fri, 27 Feb 2015 04:33:22 +0000 (20:33 -0800)] 
make regress/netcat.c fd passing (more) portable

10 years agocreate OBJ/valgrind-out before running unittests
Damien Miller [Fri, 27 Feb 2015 04:32:58 +0000 (20:32 -0800)] 
create OBJ/valgrind-out before running unittests

10 years agovalgrind support
Damien Miller [Thu, 26 Feb 2015 00:58:22 +0000 (16:58 -0800)] 
valgrind support

10 years agoupstream commit
djm@openbsd.org [Thu, 26 Feb 2015 20:45:47 +0000 (20:45 +0000)] 
upstream commit

don't printf NULL key comments; reported by Tom Christensen

10 years agoupstream commit
djm@openbsd.org [Wed, 25 Feb 2015 23:05:47 +0000 (23:05 +0000)] 
upstream commit

zero cmsgbuf before use; we initialise the bits we use
 but valgrind still spams warning on it

10 years agoupstream commit
djm@openbsd.org [Wed, 25 Feb 2015 19:54:02 +0000 (19:54 +0000)] 
upstream commit

fix small memory leak when UpdateHostkeys=no

10 years agoRevert "Work around finicky USL linker so netcat will build."
Tim Rice [Wed, 25 Feb 2015 17:56:48 +0000 (09:56 -0800)] 
Revert "Work around finicky USL linker so netcat will build."

This reverts commit d1db656021d0cd8c001a6692f772f1de29b67c8b.

No longer needed with commit 678e473e2af2e4802f24dd913985864d9ead7fb3

10 years agoupstream commit
djm@openbsd.org [Wed, 25 Feb 2015 17:29:38 +0000 (17:29 +0000)] 
upstream commit

don't leak validity of user in "too many authentication
 failures" disconnect message; reported by Sebastian Reitenbach

10 years agoupstream commit
naddy@openbsd.org [Tue, 24 Feb 2015 15:24:05 +0000 (15:24 +0000)] 
upstream commit

add -v (show ASCII art) to -l's synopsis; ok djm@

10 years agoRemove dependency on xmalloc.
Darren Tucker [Wed, 25 Feb 2015 17:12:58 +0000 (04:12 +1100)] 
Remove dependency on xmalloc.

Remove ssh_get_progname's dependency on xmalloc, which should reduce
link order problems.  ok djm@

10 years agoRestrict ECDSA and ECDH tests.
Darren Tucker [Wed, 25 Feb 2015 04:32:49 +0000 (15:32 +1100)] 
Restrict ECDSA and ECDH tests.

ifdef out some more ECDSA and ECDH tests when built against an OpenSSL
that does not have eliptic curve functionality.

10 years agoMove definition of _NSIG.
Darren Tucker [Wed, 25 Feb 2015 02:40:45 +0000 (13:40 +1100)] 
Move definition of _NSIG.

_NSIG is only unsed in one file, so move it there prevent redefinition
warnings reported by Kevin Brott.

10 years agoAdd includes.h for compatibility stuff.
Darren Tucker [Wed, 25 Feb 2015 02:17:40 +0000 (13:17 +1100)] 
Add includes.h for compatibility stuff.

10 years agoinclude netdb.h to look for MAXHOSTNAMELEN; ok tim
Damien Miller [Wed, 25 Feb 2015 00:50:06 +0000 (16:50 -0800)] 
include netdb.h to look for MAXHOSTNAMELEN; ok tim

10 years agoWork around finicky USL linker so netcat will build.
Tim Rice [Tue, 24 Feb 2015 18:42:08 +0000 (10:42 -0800)] 
Work around finicky USL linker so netcat will build.

10 years agoinclude includes.h to avoid build failure on AIX
Damien Miller [Tue, 24 Feb 2015 17:23:04 +0000 (09:23 -0800)] 
include includes.h to avoid build failure on AIX

10 years agoOriginal portability patch from djm@ for platforms missing err.h.
Tim Rice [Tue, 24 Feb 2015 15:56:47 +0000 (07:56 -0800)] 
Original portability patch from djm@ for platforms missing err.h.
Fix name space clash on Solaris 10. Still more to do for Solaris 10
to deal with msghdr structure differences. ok djm@

10 years agocleaner way fix dispatch.h portion of commit
Tim Rice [Tue, 24 Feb 2015 06:06:56 +0000 (22:06 -0800)] 
cleaner way fix dispatch.h portion of commit
a88dd1da119052870bb2654c1a32c51971eade16
(some systems have sig_atomic_t in signal.h, some in sys/signal.h)
Sounds good to me djm@

10 years agoportability fix: if we can't dind a better define for HOST_NAME_MAX, use 255
Tim Rice [Tue, 24 Feb 2015 05:51:33 +0000 (21:51 -0800)] 
portability fix: if we can't dind a better define for HOST_NAME_MAX, use 255

10 years agoportablity fix: s/__inline__/inline/
Tim Rice [Tue, 24 Feb 2015 05:50:34 +0000 (21:50 -0800)] 
portablity fix: s/__inline__/inline/

10 years agoWrap stdint.h includes in HAVE_STDINT_H.
Darren Tucker [Tue, 24 Feb 2015 02:49:31 +0000 (13:49 +1100)] 
Wrap stdint.h includes in HAVE_STDINT_H.

10 years agoAdd AI_NUMERICSERV to fake-rfc2553.
Darren Tucker [Tue, 24 Feb 2015 02:43:57 +0000 (13:43 +1100)] 
Add AI_NUMERICSERV to fake-rfc2553.

Our getaddrinfo implementation always returns numeric values already.

10 years agoInclude OpenSSL's objects.h before bn.h.
Darren Tucker [Tue, 24 Feb 2015 02:39:57 +0000 (13:39 +1100)] 
Include OpenSSL's objects.h before bn.h.

Prevents compile errors on some platforms (at least old GCCs and AIX's
XLC compilers).

10 years agoConvert two macros into functions.
Darren Tucker [Tue, 24 Feb 2015 01:30:59 +0000 (12:30 +1100)] 
Convert two macros into functions.

Convert packet_send_debug and packet_disconnect from macros to
functions.  Some older GCCs (2.7.x, 2.95.x) see to have problems with
variadic macros with only one argument so we convert these two into
functions.  ok djm@

10 years agoupstream commit
djm@openbsd.org [Mon, 23 Feb 2015 22:21:21 +0000 (22:21 +0000)] 
upstream commit

further silence spurious error message even when -v is
 specified (e.g. to get visual host keys); reported by naddy@

10 years agodon't include stdint.h unless HAVE_STDINT_H set
Damien Miller [Mon, 23 Feb 2015 22:04:32 +0000 (09:04 +1100)] 
don't include stdint.h unless HAVE_STDINT_H set

10 years agonother sys/queue.h -> sys-queue.h fix
Damien Miller [Mon, 23 Feb 2015 22:02:54 +0000 (09:02 +1100)] 
nother sys/queue.h -> sys-queue.h fix

spotted by Tom Christensen

10 years agoupstream commit
djm@openbsd.org [Mon, 23 Feb 2015 20:32:15 +0000 (20:32 +0000)] 
upstream commit

fix a race condition by using a mux socket rather than an
 ineffectual wait statement

10 years agovarious include fixes for portable
Damien Miller [Mon, 23 Feb 2015 19:30:29 +0000 (06:30 +1100)] 
various include fixes for portable

10 years agoupstream commit
djm@openbsd.org [Mon, 23 Feb 2015 16:55:51 +0000 (16:55 +0000)] 
upstream commit

add an XXX to remind me to improve sshkey_load_public

10 years agoupstream commit
djm@openbsd.org [Mon, 23 Feb 2015 16:55:31 +0000 (16:55 +0000)] 
upstream commit

silence a spurious error message when listing
 fingerprints for known_hosts; bz#2342

10 years agoupstream commit
djm@openbsd.org [Mon, 23 Feb 2015 16:33:25 +0000 (16:33 +0000)] 
upstream commit

fix setting/clearing of TTY raw mode around
 UpdateHostKeys=ask confirmation question; reported by Herb Goldman

10 years agoRepair for non-ECC OpenSSL.
Darren Tucker [Sun, 22 Feb 2015 18:04:21 +0000 (05:04 +1100)] 
Repair for non-ECC OpenSSL.

Ifdef out the ECC parts when building with an OpenSSL that doesn't have
it.

10 years agoWrap stdint.h includes in ifdefs.
Darren Tucker [Sun, 22 Feb 2015 16:07:24 +0000 (03:07 +1100)] 
Wrap stdint.h includes in ifdefs.

10 years agoout of tree build fix
Tim Rice [Sun, 22 Feb 2015 02:12:10 +0000 (18:12 -0800)] 
out of tree build fix