Commit Graph

7529 Commits

Author SHA1 Message Date
Damien Miller 0715bcdddb add missing regress output file 2014-12-22 13:47:07 +11:00
djm@openbsd.org 1e30483c8a upstream commit
adjust for new SHA256 key fingerprints and
 slightly-different MD5 hex fingerprint format
2014-12-22 13:21:07 +11:00
djm@openbsd.org 6b40567ed7 upstream commit
poll changes to netcat (usr.bin/netcat.c r1.125) broke
 this test; fix it by ensuring more stdio fds are sent to devnull
2014-12-22 13:18:41 +11:00
jmc@openbsd.org a5375ccb97 upstream commit
tweak previous;
2014-12-22 13:16:58 +11:00
djm@openbsd.org b79efde5c3 upstream commit
document FingerprintHash here too
2014-12-22 13:16:57 +11:00
Damien Miller d16bdd8027 missing include for base64 encoding 2014-12-22 10:18:09 +11:00
djm@openbsd.org 56d1c83cdd upstream commit
Add FingerprintHash option to control algorithm used for
 key fingerprints. Default changes from MD5 to SHA256 and format from hex to
 base64.

Feedback and ok naddy@ markus@
2014-12-22 09:32:29 +11:00
djm@openbsd.org 058f839fe1 upstream commit
don't count partial authentication success as a failure
 against MaxAuthTries; ok deraadt@
2014-12-22 09:31:19 +11:00
djm@openbsd.org c7219f4f54 upstream commit
revert chunk I didn't mean to commit yet; via jmc@
2014-12-18 11:46:15 +11:00
Damien Miller 7de5991aa3 upstream libc change
revision 1.2
date: 2014/12/08 03:45:00;  author: bcook;  state: Exp;  lines: +2 -2;  commitid: 7zWEBgJJOCZ2hvTV;
avoid left shift overflow in reallocarray.

Some 64-bit platforms (e.g. Windows 64) have a 32-bit long. So, shifting
1UL 32-bits to the left causes an overflow. This replaces the constant 1UL with
(size_t)1 so that we get the correct constant size for the platform.

discussed with tedu@ & deraadt@
2014-12-18 11:44:06 +11:00
Damien Miller 2048f85a5e include CFLAGS in gnome askpass targets
from Fedora
2014-12-18 10:15:49 +11:00
djm@openbsd.org 48b68ce19c upstream commit
explicitly include sys/param.h in files that use the
 howmany() macro; from portable
2014-12-11 19:20:29 +11:00
djm@openbsd.org d663bea30a upstream commit
mention AuthorizedKeysCommandUser must be set for
 AuthorizedKeysCommand to be run; bz#2287
2014-12-11 19:17:25 +11:00
djm@openbsd.org 17bf3d81e0 upstream commit
show in debug output which hostkeys are being tried when
 attempting hostbased auth; patch from Iain Morgan
2014-12-11 19:17:25 +11:00
djm@openbsd.org da0277e371 upstream commit
Make manual reflect reality: sftp-server's -d option
 accepts a "%d" option, not a "%h" one.

bz#2316; reported by Kirk Wolf
2014-12-11 19:17:24 +11:00
djm@openbsd.org 4cf87f4b81 upstream commit
better error value for invalid signature length
2014-12-10 12:21:40 +11:00
Darren Tucker 4bfad14ca5 Resync more with OpenBSD's rijndael.c, in particular "#if 0"-ing out some
unused code.  Should fix compile error reported by plautrba at redhat.
2014-12-10 02:12:51 +11:00
Darren Tucker 642652d280 Add reallocarray to compat library 2014-12-10 01:32:23 +11:00
djm@openbsd.org 3dfd8d93df upstream commit
add tests for new client RevokedHostKeys option; refactor
 to make it a bit more readable
2014-12-05 09:31:08 +11:00
krw@openbsd.org a31046cad1 upstream commit
Nuke yet more obvious #include duplications.

ok deraadt@
2014-12-05 09:31:07 +11:00
djm@openbsd.org a7c762e5b2 upstream commit
key_in_file() wrapper is no longer used
2014-12-05 09:29:48 +11:00
djm@openbsd.org 5e39a49930 upstream commit
add RevokedHostKeys option for the client

Allow textfile or KRL-based revocation of hostkeys.
2014-12-05 09:29:47 +11:00
djm@openbsd.org 74de254bb9 upstream commit
convert KRL code to new buffer API

ok markus@
2014-12-05 09:29:46 +11:00
millert@openbsd.org db995f2eed upstream commit
Prefer setvbuf() to setlinebuf() for portability; ok
 deraadt@
2014-12-05 09:28:50 +11:00
jsg@openbsd.org 72bba3d179 upstream commit
Fix crashes in the handling of the sshd config file found
 with the afl fuzzer.

ok deraadt@ djm@
2014-11-26 13:37:41 +11:00
Damien Miller 867f49c666 Avoid Cygwin ssh-host-config reading /etc/group
Patch from Corinna Vinschen
2014-11-26 13:22:41 +11:00
Damien Miller 8b66f36291 allow custom service name for sshd on Cygwin
Permits the use of multiple sshd running with different service names.

Patch by Florian Friesdorf via Corinna Vinschen
2014-11-26 13:20:35 +11:00
jmc@openbsd.org 08c0eebf55 upstream commit
restore word zapped in previous, and remove some useless
 "No" macros;
2014-11-24 10:15:48 +11:00
deraadt@openbsd.org a1418a0033 upstream commit
/dev/random has created the same effect as /dev/arandom
 (and /dev/urandom) for quite some time.  Mop up the last few, by using
 /dev/random where we actually want it, or not even mentioning arandom where
 it is irrelevant.
2014-11-24 10:15:47 +11:00
djm@openbsd.org b6de5ac9ed upstream commit
fix NULL pointer dereference crash on invalid timestamp

found using Michal Zalewski's afl fuzzer
2014-11-24 10:15:47 +11:00
mikeb@openbsd.org a1f8110cd5 upstream commit
Sync AES code to the one shipped in OpenSSL/LibreSSL.

This includes a commit made by Andy Polyakov <appro at openssl ! org>
to the OpenSSL source tree on Wed, 28 Jun 2006 with the following
message: "Mitigate cache-collision timing attack on last round."

OK naddy, miod, djm
2014-11-24 10:15:04 +11:00
krw@openbsd.org 335c83d5f3 upstream commit
Nuke more obvious #include duplications.

ok deraadt@ millert@ tedu@
2014-11-24 10:15:04 +11:00
djm@openbsd.org 51b64e4412 upstream commit
fix KRL generation when multiple CAs are in use

We would generate an invalid KRL when revoking certs by serial
number for multiple CA keys due to a section being written out
twice.

Also extend the regress test to catch this case by having it
produce a multi-CA KRL.

Reported by peter AT pean.org
2014-11-19 09:20:14 +11:00
djm@openbsd.org d2d51003a6 upstream commit
fix NULL pointer dereference crash in key loading

found by Michal Zalewski's AFL fuzzer
2014-11-18 12:00:51 +11:00
djm@openbsd.org 9f9fad0191 upstream commit
fix KRL generation when multiple CAs are in use

We would generate an invalid KRL when revoking certs by serial
number for multiple CA keys due to a section being written out
twice.

Also extend the regress test to catch this case by having it
produce a multi-CA KRL.

Reported by peter AT pean.org
2014-11-17 11:20:39 +11:00
bentley@openbsd.org da8af83d3f upstream commit
Reduce instances of `` '' in manuals.

troff displays these as typographic quotes, but nroff implementations
almost always print them literally, which rarely has the intended effect
with modern fonts, even in stock xterm.

These uses of `` '' can be replaced either with more semantic alternatives
or with Dq, which prints typographic quotes in a UTF-8 locale (but will
automatically fall back to `` '' in an ASCII locale).

improvements and ok schwarze@
2014-11-17 11:19:33 +11:00
djm@openbsd.org fc30256136 upstream commit
mux-related manual tweaks

mention ControlPersist=0 is the same as ControlPersist=yes

recommend that ControlPath sockets be placed in a og-w directory
2014-11-11 09:27:17 +11:00
Damien Miller 0e4cff5f35 Prepare scripts for next Cygwin release
Makes the Cygwin-specific ssh-user-config script independent of the
existence of /etc/passwd.  The next Cygwin release will allow to
generate passwd and group entries from the Windows account DBs, so the
scripts have to adapt.

from Corinna Vinschen
2014-11-05 11:01:31 +11:00
Damien Miller 7d0ba53366 include version number in OpenSSL-too-old error 2014-10-30 10:45:41 +11:00
lteo@openbsd.org 3bcb92e04d upstream commit
Remove unnecessary include: netinet/in_systm.h is not needed
 by these programs.

NB. skipped for portable

ok deraadt@ millert@
2014-10-27 16:34:52 +11:00
djm@openbsd.org 6fdcaeb995 upstream commit
whitespace
2014-10-20 14:41:44 +11:00
daniel@openbsd.org 165bc87862 upstream commit
plug a memory leak; from Maxime Villard.

ok djm@
2014-10-20 14:40:06 +11:00
jmc@openbsd.org b1ba15f388 upstream commit
tweak previous;
2014-10-20 14:40:05 +11:00
djm@openbsd.org 259a02ebdf upstream commit
whitespace
2014-10-13 14:36:06 +11:00
djm@openbsd.org 957fbceb0f upstream commit
Tweak config reparsing with host canonicalisation

Make the second pass through the config files always run when
hostname canonicalisation is enabled.

Add a "Match canonical" criteria that allows ssh_config Match
blocks to trigger only in the second config pass.

Add a -G option to ssh that causes it to parse its configuration
and dump the result to stdout, similar to "sshd -T"

Allow ssh_config Port options set in the second config parse
phase to be applied (they were being ignored).

bz#2267 bz#2286; ok markus
2014-10-13 11:41:48 +11:00
djm@openbsd.org 5c0dafd38b upstream commit
another -Wpointer-sign from clang
2014-10-13 11:39:23 +11:00
djm@openbsd.org bb005dc815 upstream commit
fix a few -Wpointer-sign warnings from clang
2014-10-13 11:39:18 +11:00
djm@openbsd.org 3cc1fbb4fb upstream commit
parse cert sections using nested buffers to reduce
 copies; ok markus
2014-10-13 11:39:11 +11:00
djm@openbsd.org 4a45922aeb upstream commit
correct options in usage(); from mancha1 AT zoho.com
2014-10-13 11:39:02 +11:00
djm@openbsd.org 48dffd5beb upstream commit
mention permissions on tun(4) devices in PermitTunnel
 documentation; bz#2273
2014-10-13 11:38:46 +11:00