Commit Graph

7509 Commits

Author SHA1 Message Date
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
djm@openbsd.org a5883d4ecc upstream commit
tighten permissions on pty when the "tty" group does
 not exist; pointed out by Corinna Vinschen; ok markus
2014-10-13 11:38:36 +11:00
sobrado@openbsd.org 180bcb406b upstream commit
typo.
2014-10-13 11:37:56 +11:00
sobrado@openbsd.org f70b22bcdd upstream commit
improve capitalization for the Ed25519 public-key
 signature system.

ok djm@
2014-10-13 11:37:32 +11:00
doug@openbsd.org 7df8818409 upstream commit
Free resources on error in mkstemp and fdopen

ok djm@
2014-10-13 11:37:21 +11:00
deraadt@openbsd.org 40ba4c9733 upstream commit
djm how did you make a typo like that...
2014-10-13 11:37:14 +11:00
djm@openbsd.org 57d378ec92 upstream commit
When dumping the server configuration (sshd -T), print
 correct KEX, MAC and cipher defaults. Spotted by Iain Morgan
2014-10-13 11:36:04 +11:00
djm@openbsd.org 7ff880ede5 upstream commit
~-expand lcd paths
2014-10-13 11:35:49 +11:00
Damien Miller 4460a7ad0c remove duplicated KEX_DH1 entry 2014-10-12 12:35:48 +11:00
Damien Miller c9b8426a61 remove ChangeLog file
Commit logs will be generated from git at release time.
2014-10-09 10:34:06 +11:00
Damien Miller 81d18ff7c9 delete contrib/caldera directory 2014-10-07 21:24:25 +11:00
Damien Miller 0ec9e87d36 test commit 2014-10-07 19:57:27 +11:00
Damien Miller 8fb65a4456 - (djm) Release OpenSSH-6.7 2014-10-07 09:21:49 +11:00
Damien Miller e8c9f2602c - (djm) [sshd_config.5] typo; from Iain Morgan 2014-10-03 09:24:56 +10:00
Damien Miller 703b98a267 - (djm) [openbsd-compat/Makefile.in openbsd-compat/kludge-fd_set.c]
[openbsd-compat/openbsd-compat.h] Kludge around bad glibc
   _FORTIFY_SOURCE check that doesn't grok heap-allocated fd_sets;
   ok dtucker@
2014-10-01 09:43:07 +10:00
Damien Miller 0fa0ed061b - (djm) [sandbox-seccomp-filter.c] Allow mremap and exit for DietLibc;
patch from Felix von Leitner; ok dtucker
2014-09-10 08:15:34 +10:00
Darren Tucker ad7d23d461 20140908
- (dtucker) [INSTALL] Update info about egd.  ok djm@
2014-09-09 12:23:10 +10:00
Damien Miller 2a8699f37c - (djm) [openbsd-compat/arc4random.c] Zero seed after keying PRNG 2014-09-04 03:46:05 +10:00
Damien Miller 44988defb1 - (djm) [contrib/cygwin/ssh-host-config] Fix old code leading to
permissions/ACLs; from Corinna Vinschen
2014-09-03 05:35:32 +10:00
Damien Miller 23f269562b - (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h and
conditionalise to avoid duplicate definition.
2014-09-03 05:33:25 +10:00
Damien Miller 41c8de2c00 - (djm) [Makefile.in] Make TEST_SHELL a variable; "good idea" tim@ 2014-08-30 16:23:06 +10:00