Commit Graph

7706 Commits

Author SHA1 Message Date
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
millert@openbsd.org 1910a286d7 upstream commit
Include stdint.h, not limits.h to get SIZE_MAX.  OK guenther@
2015-02-07 07:48:00 +11:00
deraadt@openbsd.org ce4f59b240 upstream commit
missing ; djm and mlarkin really having great
 interactions recently
2015-02-05 07:43:00 +11:00
halex@openbsd.org 5d34aa9493 upstream commit
slightly extend the passphrase prompt if running with -c
 in order to give the user a chance to notice if unintentionally running
 without it

wording tweak and ok djm@
2015-02-05 07:42:59 +11:00
djm@openbsd.org cb3bde373e upstream commit
handle PKCS#11 C_Login returning
 CKR_USER_ALREADY_LOGGED_IN; based on patch from Yuri Samoilenko; ok markus@
2015-02-03 11:06:16 +11:00
djm@openbsd.org 15ad750e5e upstream commit
turn UpdateHostkeys off by default until I figure out
 mlarkin@'s warning message; requested by deraadt@
2015-02-03 11:06:16 +11:00
deraadt@openbsd.org 3cd5103c1e upstream commit
increasing encounters with difficult DNS setups in
 darknets has convinced me UseDNS off by default is better ok djm
2015-02-03 11:06:15 +11:00
djm@openbsd.org 6049a548a8 upstream commit
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@
2015-02-01 09:13:09 +11:00
djm@openbsd.org 46347ed596 upstream commit
Add a ssh_config HostbasedKeyType option to control which
 host public key types are tried during hostbased authentication.

This may be used to prevent too many keys being sent to the server,
and blowing past its MaxAuthTries limit.

bz#2211 based on patch by Iain Morgan; ok markus@
2015-01-30 22:47:01 +11:00
djm@openbsd.org 802660cb70 upstream commit
set a timeout to prevent hangs when talking to busted
 servers; ok markus@
2015-01-30 22:47:00 +11:00
djm@openbsd.org 86936ec245 upstream commit
regression test for 'wildcard CA' serial/key ID revocations
2015-01-30 12:19:29 +11:00
djm@openbsd.org 4509b5d4a4 upstream commit
avoid more fatal/exit in the packet.c paths that
 ssh-keyscan uses; feedback and "looks good" markus@
2015-01-30 12:18:59 +11:00
djm@openbsd.org 669aee9943 upstream commit
permit KRLs that revoke certificates by serial number or
 key ID without scoping to a particular CA; ok markus@
2015-01-30 12:17:07 +11:00