Commit Graph

7764 Commits

Author SHA1 Message Date
markus@openbsd.org
7d4f96f9de upstream commit
consistent check for NULL as noted by Nicholas
 Lemonias; ok djm@
2015-03-27 12:00:52 +11:00
markus@openbsd.org
df100be513 upstream commit
correct fmt-string for size_t as noted by Nicholas
 Lemonias; ok djm@
2015-03-27 12:00:47 +11:00
djm@openbsd.org
a22b9ef212 upstream commit
promote chacha20-poly1305@openssh.com to be the default
 cipher; ok markus
2015-03-27 12:00:43 +11:00
djm@openbsd.org
2aa9da1a3b 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.
2015-03-27 12:00:37 +11:00
djm@openbsd.org
53097b2022 upstream commit
fix double-negative error message "ssh1 is not
 unsupported"
2015-03-27 12:00:33 +11:00
djm@openbsd.org
5c27e3b6ec 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
2015-03-23 17:10:14 +11:00
djm@openbsd.org
725fd22a8c upstream commit
KRL support doesn't need OpenSSL anymore, remove #ifdefs
 from around call
2015-03-23 17:08:39 +11:00
djm@openbsd.org
b07011c18e upstream commit
#if 0 some more arrays used only for decrypting (we don't
 use since we only need encrypt for AES-CTR)
2015-03-23 17:08:12 +11:00
jsg@openbsd.org
1cb3016635 upstream commit
add back the changes from rev 1.206, djm reverted this by
 mistake in rev 1.207
2015-03-23 17:07:36 +11:00
Damien Miller
4d24b3b6a4 remove error() accidentally inserted for debugging
pointed out by Christian Hesse
2015-03-20 09:32:27 +11:00
Tim Rice
9f82e5a904 portability fix: Solaris systems may not have a grep that understands -q 2015-03-16 22:49:20 -07:00
Damien Miller
8ef691f7d9 fix compile with clang 2015-03-11 10:35:26 +11:00
Damien Miller
4df590cf8d make unit tests work for !OPENSSH_HAS_ECC 2015-03-11 10:02:39 +11:00
djm@openbsd.org
307bb40277 upstream commit
unbreak for w/SSH1 (default) case; ok markus@ deraadt@
2015-03-09 15:20:55 +11:00
Damien Miller
b44ee0c998 unbreak hostkeys test for w/ SSH1 case 2015-03-05 18:39:20 -08:00
djm@openbsd.org
55e5bdeb51 upstream commit
fix sshkey_certify() return value for unsupported key types;
 ok markus@ deraadt@
2015-03-06 13:22:44 +11:00
Damien Miller
be8f658e55 update version numbers to match version.h 2015-03-04 15:39:22 -08:00
djm@openbsd.org
ac5e8acefa upstream commit
make these work with !SSH1; ok markus@ deraadt@
2015-03-05 10:27:22 +11:00
djm@openbsd.org
2f04af92f0 upstream commit
make ssh-add -D work with !SSH1 agent
2015-03-05 10:27:22 +11:00
Damien Miller
a05adf95d2 netcat needs poll.h portability goop 2015-03-04 11:00:35 -08:00
markus@openbsd.org
dad2b1892b upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
2015-03-05 05:59:47 +11:00
djm@openbsd.org
d48a22601b upstream commit
crank; ok markus, deraadt
2015-03-05 05:59:46 +11:00
Damien Miller
bbffb23daa more --without-ssh1 fixes 2015-03-03 13:50:27 -08:00
Damien Miller
6c2039286f fix merge both that broke --without-ssh1 compile 2015-03-03 13:48:48 -08:00
djm@openbsd.org
111dfb2254 upstream commit
add SSH1 Makefile knob to make it easier to build without
 SSH1 support; ok markus@
2015-03-04 08:24:11 +11:00
djm@openbsd.org
3f7f5e6c5d upstream commit
expand __unused to full __attribute__ for better portability
2015-03-04 07:59:13 +11:00
Damien Miller
2fab9b0f87 avoid warning 2015-03-04 07:41:27 +11:00
Damien Miller
d1bc844322 Revert "define __unused to nothing if not already defined"
This reverts commit 1598419e38.

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 d1db656021.

No longer needed with commit 678e473e2a
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