Commit Graph

7718 Commits

Author SHA1 Message Date
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
Darren Tucker
e50e8c97a9 Add null declaration of AI_NUMERICINFO.
Some platforms (older FreeBSD and DragonFly versions) do have
getaddrinfo() but do not have AI_NUMERICINFO. so define it to zero
in those cases.
2015-02-21 15:10:33 +11:00
djm@openbsd.org
18a208d6a4 upstream commit
more options that are available under Match; bz#2353 reported
 by calestyo AT scientia.net
2015-02-21 09:50:46 +11:00
djm@openbsd.org
44732de068 upstream commit
UpdateHostKeys fixes:

I accidentally changed the format of the hostkeys@openssh.com messages
last week without changing the extension name, and this has been causing
connection failures for people who are running -current. First reported
by sthen@

s/hostkeys@openssh.com/hostkeys-00@openssh.com/
Change the name of the proof message too, and reorder it a little.

Also, UpdateHostKeys=ask is incompatible with ControlPersist (no TTY
available to read the response) so disable UpdateHostKeys if it is in
ask mode and ControlPersist is active (and document this)
2015-02-21 09:20:28 +11:00
djm@openbsd.org
13a39414d2 upstream commit
Regression: I broke logging of public key fingerprints in
 1.46. Pointed out by Pontus Lundkvist
2015-02-21 09:20:27 +11:00
Damien Miller
773dda25e8 repair --without-openssl; broken in refactor 2015-02-18 22:29:32 +11:00
Damien Miller
e89c780886 hook up hostkeys unittest to portable Makefiles 2015-02-17 10:04:55 +11:00
djm@openbsd.org
0abf41f99a upstream commit
enable hostkeys unit tests
2015-02-17 09:35:35 +11:00
djm@openbsd.org
68a5d647cc upstream commit
check string/memory compare arguments aren't NULL
2015-02-17 09:34:48 +11:00
djm@openbsd.org
ef575ef20d upstream commit
unit tests for hostfile.c code, just hostkeys_foreach so
 far
2015-02-17 09:34:48 +11:00
markus@openbsd.org
8ea3365e6a upstream commit
test server rekey limit
2015-02-17 09:33:19 +11:00
djm@openbsd.org
ce63c4b063 upstream commit
partial backout of:

revision 1.441
date: 2015/01/31 20:30:05;  author: djm;  state: Exp;  lines: +17 -10;  commitid
: x8klYPZMJSrVlt3O;
Let sshd load public host keys even when private keys are missing.
Allows sshd to advertise additional keys for future key rotation.
Also log fingerprint of hostkeys loaded; ok markus@

hostkey updates now require access to the private key, so we can't
load public keys only. The improved log messages (fingerprints of keys
loaded) are kept.
2015-02-17 09:32:32 +11:00
djm@openbsd.org
523463a3a2 upstream commit
Revise hostkeys@openssh.com hostkey learning extension.

The client will not ask the server to prove ownership of the private
halves of any hitherto-unseen hostkeys it offers to the client.

Allow UpdateHostKeys option to take an 'ask' argument to let the
user manually review keys offered.

ok markus@
2015-02-17 09:32:32 +11:00
djm@openbsd.org
6c5c949782 upstream commit
Refactor hostkeys_foreach() and dependent code Deal with
 IP addresses (i.e. CheckHostIP) Don't clobber known_hosts when nothing
 changed ok markus@ as part of larger commit
2015-02-17 09:32:31 +11:00
miod@openbsd.org
51b082ccbe upstream commit
Declare ge25519_base as extern, to prevent it from
 becoming a common. Gets us rid of ``lignment 4 of symbol
 `crypto_sign_ed25519_ref_ge25519_base' in mod_ge25519.o is smaller than 16 in
 mod_ed25519.o'' warnings at link time.
2015-02-17 09:32:31 +11:00
markus@openbsd.org
02db468bf7 upstream commit
make rekey_limit for sshd w/privsep work; ok djm@
 dtucker@
2015-02-17 09:32:30 +11:00
dtucker@openbsd.org
8ec67d505b upstream commit
Prevent sshd spamming syslog with
 "ssh_dispatch_run_fatal: disconnected". ok markus@
2015-02-17 09:32:30 +11:00
djm@openbsd.org
d4c0295d1a upstream commit
Some packet error messages show the address of the peer,
 but might be generated after the socket to the peer has suffered a TCP reset.
 In these cases, getpeername() won't work so cache the address earlier.

spotted in the wild via deraadt@ and tedu@
2015-02-11 12:26:31 +11:00
jsg@openbsd.org
4af1709cf7 upstream commit
fix some leaks in error paths ok markus@
2015-02-11 12:26:30 +11:00
millert@openbsd.org
fd36834871 upstream commit
SIZE_MAX is standard, we should be using it in preference to
 the obsolete SIZE_T_MAX.  OK miod@ beck@
2015-02-09 09:28:17 +11:00