Commit Graph

7937 Commits

Author SHA1 Message Date
Damien Miller
d1bc844322 Revert "define __unused to nothing if not already defined"
This reverts commit 1598419e38afbaa8aa5df8dd6b0af98301e2c908.

Some system headers have objects named __unused
2015-03-04 06:31:45 +11:00
Damien Miller
00797e86b2 check for crypt and DES_crypt in openssl block
fixes builds on systems that use DES_crypt; based on patch
from Roumen Petrov
2015-03-04 05:02:45 +11:00
Damien Miller
1598419e38 define __unused to nothing if not already defined
fixes builds on BSD/OS
2015-03-04 04:59:13 +11:00
djm@openbsd.org
d608a51daa upstream commit
reorder logic for better portability; patch from Roumen
 Petrov
2015-03-04 04:54:27 +11:00
djm@openbsd.org
68d2dfc464 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@
2015-03-04 04:54:11 +11:00
millert@openbsd.org
39e2f12295 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@
2015-03-03 04:45:01 +11:00
Damien Miller
e47536ba96 portability fixes for regress/netcat.c
Mostly avoiding "err(1, NULL)"
2015-02-28 08:20:11 -08:00
Damien Miller
02973ad5f6 twiddle another test for portability
from Tom G. Christensen
2015-02-28 08:06:18 -08:00
Damien Miller
f7f3116abf twiddle test for portability 2015-02-27 15:52:49 -08:00
Damien Miller
1ad3a77cc9 make regress/netcat.c fd passing (more) portable 2015-02-26 20:34:06 -08:00
Damien Miller
9e1cfca7e1 create OBJ/valgrind-out before running unittests 2015-02-26 20:34:06 -08:00
Damien Miller
bd58853102 valgrind support 2015-02-26 14:55:55 -08:00
djm@openbsd.org
f43d172691 upstream commit
don't printf NULL key comments; reported by Tom Christensen
2015-02-27 07:46:23 +11:00
djm@openbsd.org
6e6458b476 upstream commit
zero cmsgbuf before use; we initialise the bits we use
 but valgrind still spams warning on it
2015-02-26 10:09:59 +11:00
djm@openbsd.org
a63cfa2686 upstream commit
fix small memory leak when UpdateHostkeys=no
2015-02-26 10:09:58 +11:00
Tim Rice
e6b950341d Revert "Work around finicky USL linker so netcat will build."
This reverts commit d1db656021d0cd8c001a6692f772f1de29b67c8b.

No longer needed with commit 678e473e2af2e4802f24dd913985864d9ead7fb3
2015-02-25 09:56:48 -08:00
djm@openbsd.org
6f621603f9 upstream commit
don't leak validity of user in "too many authentication
 failures" disconnect message; reported by Sebastian Reitenbach
2015-02-26 04:32:08 +11:00
naddy@openbsd.org
6288e3a935 upstream commit
add -v (show ASCII art) to -l's synopsis; ok djm@
2015-02-26 04:32:08 +11:00
Darren Tucker
678e473e2a Remove dependency on xmalloc.
Remove ssh_get_progname's dependency on xmalloc, which should reduce
link order problems.  ok djm@
2015-02-26 04:12:58 +11:00
Darren Tucker
5d5ec165c5 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.
2015-02-25 15:32:49 +11:00
Darren Tucker
1734e276d9 Move definition of _NSIG.
_NSIG is only unsed in one file, so move it there prevent redefinition
warnings reported by Kevin Brott.
2015-02-25 13:40:45 +11:00
Darren Tucker
a47ead7c95 Add includes.h for compatibility stuff. 2015-02-25 13:17:40 +11:00
Damien Miller
38806bda6d include netdb.h to look for MAXHOSTNAMELEN; ok tim 2015-02-24 16:50:36 -08:00
Tim Rice
d1db656021 Work around finicky USL linker so netcat will build. 2015-02-24 10:42:08 -08:00
Damien Miller
cb030ce25f include includes.h to avoid build failure on AIX 2015-02-24 09:23:30 -08:00
Tim Rice
13af342458 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@
2015-02-24 07:56:47 -08:00
Tim Rice
910209203d cleaner way fix dispatch.h portion of commit
a88dd1da11
(some systems have sig_atomic_t in signal.h, some in sys/signal.h)
Sounds good to me djm@
2015-02-23 22:06:56 -08:00
Tim Rice
676c38d7cb portability fix: if we can't dind a better define for HOST_NAME_MAX, use 255 2015-02-23 21:51:33 -08:00
Tim Rice
1221b22023 portablity fix: s/__inline__/inline/ 2015-02-23 21:50:34 -08:00
Darren Tucker
4c356308a8 Wrap stdint.h includes in HAVE_STDINT_H. 2015-02-24 13:49:31 +11:00
Darren Tucker
c9c88355c6 Add AI_NUMERICSERV to fake-rfc2553.
Our getaddrinfo implementation always returns numeric values already.
2015-02-24 13:43:57 +11:00
Darren Tucker
ef342ab1ce Include OpenSSL's objects.h before bn.h.
Prevents compile errors on some platforms (at least old GCCs and AIX's
XLC compilers).
2015-02-24 13:39:57 +11:00
Darren Tucker
dcc8997d11 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@
2015-02-24 12:30:59 +11:00
djm@openbsd.org
2285c30d51 upstream commit
further silence spurious error message even when -v is
 specified (e.g. to get visual host keys); reported by naddy@
2015-02-24 09:21:48 +11:00
Damien Miller
9af21979c0 don't include stdint.h unless HAVE_STDINT_H set 2015-02-24 09:04:32 +11:00
Damien Miller
62f678dd51 nother sys/queue.h -> sys-queue.h fix
spotted by Tom Christensen
2015-02-24 09:02:54 +11:00
djm@openbsd.org
b3c19151cb upstream commit
fix a race condition by using a mux socket rather than an
 ineffectual wait statement
2015-02-24 07:32:35 +11:00
Damien Miller
a88dd1da11 various include fixes for portable 2015-02-24 06:30:29 +11:00
djm@openbsd.org
5248429b5e upstream commit
add an XXX to remind me to improve sshkey_load_public
2015-02-24 03:59:09 +11:00
djm@openbsd.org
e94e4b07ef upstream commit
silence a spurious error message when listing
 fingerprints for known_hosts; bz#2342
2015-02-24 03:59:09 +11:00
djm@openbsd.org
f2293a6539 upstream commit
fix setting/clearing of TTY raw mode around
 UpdateHostKeys=ask confirmation question; reported by Herb Goldman
2015-02-24 03:47:44 +11:00
Darren Tucker
f2004cd1ad Repair for non-ECC OpenSSL.
Ifdef out the ECC parts when building with an OpenSSL that doesn't have
it.
2015-02-23 05:04:21 +11:00
Darren Tucker
37f9220db8 Wrap stdint.h includes in ifdefs. 2015-02-23 03:07:24 +11:00
Tim Rice
f81f1bbc5b out of tree build fix 2015-02-21 18:12:10 -08:00
Tim Rice
2e13a1e4d2 mkdir kex unit test directory so testing out of tree builds works 2015-02-21 18:08:51 -08:00
halex@openbsd.org
1797f49b1b upstream commit
make "ssh-add -d" properly remove a corresponding
 certificate, and also not whine and fail if there is none

ok djm@
2015-02-22 09:04:58 +11:00
Damien Miller
7faaa32da8 mkdir hostkey and bitmap unit test directories 2015-02-22 07:58:25 +11:00
djm@openbsd.org
bd49da2ef1 upstream commit
sort options useable under Match case-insensitively; prodded
 jmc@
2015-02-22 07:58:24 +11:00
djm@openbsd.org
1a779a0dd6 upstream commit
correct paths to configuration files being written/updated;
 they live in $OBJ not cwd; some by Roumen Petrov
2015-02-22 07:58:24 +11:00
Darren Tucker
28ba006c1a More correct checking of HAVE_DECL_AI_NUMERICSERV. 2015-02-21 15:41:07 +11:00