Commit Graph

8155 Commits

Author SHA1 Message Date
djm@openbsd.org cac3b6665f upstream commit
better description for MaxSessions; bz#2531

Upstream-ID: e2c0d74ee185cd1a3e9d4ca1f1b939b745b354da
2016-02-08 21:58:28 +11:00
Damien Miller 5ef4b0fdcc avoid FreeBSD RCS Id in comment
Change old $FreeBSD version string in comment so it doesn't
become an RCS ident downstream; requested by des AT des.no
2016-02-05 10:45:23 +11:00
djm@openbsd.org 696d12683c upstream commit
printf argument casts to avoid warnings on strict
 compilers

Upstream-ID: 7b9f6712cef01865ad29070262d366cf13587c9c
2016-02-05 10:44:43 +11:00
millert@openbsd.org 5658ef2501 upstream commit
Avoid ugly "DISPLAY "(null)" invalid; disabling X11
 forwarding" message when DISPLAY is not set.  This could also result in a
 crash on systems with a printf that doesn't handle NULL.  OK djm@

Upstream-ID: 20ee0cfbda678a247264c20ed75362042b90b412
2016-02-05 10:44:42 +11:00
dtucker@openbsd.org 537f88ec7b upstream commit
Add regression test for RekeyLimit parsing of >32bit values
 (4G and 8G).

Upstream-Regress-ID: 548390350c62747b6234f522a99c319eee401328
2016-02-04 16:13:37 +11:00
dtucker@openbsd.org 4c6cb83304 upstream commit
Remove leftover roaming dead code.  ok djm markus.

Upstream-ID: 13d1f9c8b65a5109756bcfd3b74df949d53615be
2016-01-30 11:19:16 +11:00
djm@openbsd.org 2813647180 upstream commit
include packet type of non-data packets in debug3 output;
 ok markus dtucker

Upstream-ID: 034eaf639acc96459b9c5ce782db9fcd8bd02d41
2016-01-30 11:19:15 +11:00
dtucker@openbsd.org 6fd6e28dac upstream commit
Revert "account for packets buffered but not yet
 processed" change as it breaks for very small RekeyLimit values due to
 continuous rekeying.  ok djm@

Upstream-ID: 7e03f636cb45ab60db18850236ccf19079182a19
2016-01-30 11:19:14 +11:00
dtucker@openbsd.org 921ff00b0a upstream commit
Allow RekeyLimits in excess of 4G up to 2**63 bits
 (limited by the return type of scan_scaled).  Part of bz#2521, ok djm.

Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979
2016-01-30 11:19:13 +11:00
dtucker@openbsd.org c0060a6529 upstream commit
Account for packets buffered but not yet processed when
 computing whether or not it is time to perform rekeying.  bz#2521, based
 loosely on a patch from olo at fb.com, ok djm@

Upstream-ID: 67e268b547f990ed220f3cb70a5624d9bda12b8c
2016-01-30 11:19:13 +11:00
djm@openbsd.org 44cf930e67 upstream commit
change old $FreeBSD version string in comment so it doesn't
 become an RCS ident downstream; requested by des AT des.no

Upstream-ID: 8ca558c01f184e596b45e4fc8885534b2c864722
2016-01-27 17:45:44 +11:00
djm@openbsd.org ebacd37776 upstream commit
make the debug messages a bit more useful here

Upstream-ID: 478ccd4e897e0af8486b294aa63aa3f90ab78d64
2016-01-27 16:54:26 +11:00
jsg@openbsd.org 458abc2934 upstream commit
Zero a stack buffer with explicit_bzero() instead of
 memset() when returning from client_loop() for consistency with
 buffer_free()/sshbuf_free().

ok dtucker@ deraadt@ djm@

Upstream-ID: bc9975b2095339811c3b954694d7d15ea5c58f66
2016-01-27 16:54:26 +11:00
dtucker@openbsd.org 65a3c0dacb upstream commit
Include sys/time.h for gettimeofday.  From sortie at
 maxsi.org.

Upstream-ID: 6ed0c33b836d9de0a664cd091e86523ecaa2fb3b
2016-01-27 16:54:25 +11:00
markus@openbsd.org fc77ccdc2c upstream commit
fd leaks; report Qualys Security Advisory team; ok
 deraadt@

Upstream-ID: 4ec0f12b9d8fa202293c9effa115464185aa071d
2016-01-27 16:54:10 +11:00
markus@openbsd.org a306863831 upstream commit
remove roaming support; ok djm@

Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
2016-01-27 16:54:10 +11:00
deraadt@openbsd.org 6ef49e83e3 upstream commit
Disable experimental client-side roaming support.  Server
 side was disabled/gutted for years already, but this aspect was surprisingly
 forgotten. Thanks for report from Qualys

Upstream-ID: 2328004b58f431a554d4c1bf67f5407eae3389df
2016-01-27 16:41:49 +11:00
Damien Miller 8d7b523b96 bump version numbers 2016-01-27 16:39:01 +11:00
Damien Miller 8c3d512a1f openssh-7.1p2 2016-01-27 16:38:56 +11:00
Damien Miller e6c85f8889 forcibly disable roaming support in the client 2016-01-15 01:30:36 +11:00
djm@openbsd.org ed4ce82dbf upstream commit
eliminate fallback from untrusted X11 forwarding to trusted
 forwarding when the X server disables the SECURITY extension; Reported by
 Thomas Hoger; ok deraadt@

Upstream-ID: f76195bd2064615a63ef9674a0e4096b0713f938
2016-01-14 10:06:01 +11:00
djm@openbsd.org 9a728cc918 upstream commit
use explicit_bzero() more liberally in the buffer code; ok
 deraadt

Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf
2016-01-13 10:48:11 +11:00
Damien Miller 4626cbaf78 Support Illumos/Solaris fine-grained privileges
Includes a pre-auth privsep sandbox and several pledge()
emulations. bz#2511, patch by Alex Wilson.

ok dtucker@
2016-01-08 14:29:12 +11:00
djm@openbsd.org 422d1b3ee9 upstream commit
fix three bugs in KRL code related to (unused) signature
 support: verification length was being incorrectly calculated, multiple
 signatures were being incorrectly processed and a NULL dereference that
 occurred when signatures were verified. Reported by Carl Jackson

Upstream-ID: e705e97ad3ccce84291eaa651708dd1b9692576b
2016-01-07 20:13:33 +11:00
djm@openbsd.org 6074c84bf9 upstream commit
unused prototype

Upstream-ID: f3eef4389d53ed6c0d5c77dcdcca3060c745da97
2016-01-07 20:13:32 +11:00
guenther@openbsd.org 6213f0e180 upstream commit
Use pread/pwrite instead separate lseek+read/write for
 lastlog. Cast to off_t before multiplication to avoid truncation on ILP32

ok kettenis@ mmcc@

Upstream-ID: fc40092568cd195719ddf1a00aa0742340d616cf
2016-01-07 20:13:31 +11:00
semarie@openbsd.org d7d2bc9504 upstream commit
adjust pledge promises for ControlMaster: when using
 "ask" or "autoask", the process will use ssh-askpass for asking confirmation.

problem found by halex@

ok halex@

Upstream-ID: 38a58b30ae3eef85051c74d3c247216ec0735f80
2016-01-07 20:13:31 +11:00
djm@openbsd.org 271df8185d upstream commit
unbreak connections with peers that set
 first_kex_follows; fix from Matt Johnston va bz#2515

Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b
2015-12-18 14:50:49 +11:00
doug@openbsd.org 43849a47c5 upstream commit
Add "id" to ssh-agent pledge for subprocess support.

Found the hard way by Jan Johansson when using ssh-agent with X.  Also,
rearranged proc/exec and retval to match other pledge calls in the tree.

ok djm@

Upstream-ID: 914255f6850e5e7fa830a2de6c38605333b584db
2015-12-18 14:50:49 +11:00
mmcc@openbsd.org 52d7078421 upstream commit
Remove NULL-checks before sshbuf_free().

ok djm@

Upstream-ID: 5ebed00ed5f9f03b119a345085e8774565466917
2015-12-18 14:50:48 +11:00
djm@openbsd.org a4b9e0f4e4 upstream commit
include remote port number in a few more messages; makes
 tying log messages together into a session a bit easier; bz#2503 ok dtucker@

Upstream-ID: 9300dc354015f7a7368d94a8ff4a4266a69d237e
2015-12-18 14:50:10 +11:00
djm@openbsd.org 6091c362e8 upstream commit
don't try to load SSHv1 private key when compiled without
 SSHv1 support. From Iain Morgan bz#2505

Upstream-ID: 8b8e7b02a448cf5e5635979df2d83028f58868a7
2015-12-18 14:50:09 +11:00
djm@openbsd.org cce6a36bb9 upstream commit
use SSH_MAX_PUBKEY_BYTES consistently as buffer size when
 reading key files. Increase it to match the size of the buffers already being
 used.

Upstream-ID: 1b60586b484b55a947d99a0b32bd25e0ced56fae
2015-12-18 14:49:32 +11:00
mmcc@openbsd.org 89540b6de0 upstream commit
Remove NULL-checks before sshkey_free().

ok djm@

Upstream-ID: 3e35afe8a25e021216696b5d6cde7f5d2e5e3f52
2015-12-18 14:49:32 +11:00
dtucker@openbsd.org 79394ed6d7 upstream commit
fflush stdout so that output is seen even when running in
 debug mode when output may otherwise not be flushed.  Patch from dustin at
 null-ptr.net.

Upstream-ID: b0c6b4cd2cdb01d7e9eefbffdc522e35b5bc4acc
2015-12-18 14:49:32 +11:00
Darren Tucker ee607cccb6 Increase robustness of redhat/openssh.spec
- remove configure --with-rsh, because this option isn't supported anymore
 - replace last occurrence of BuildPreReq by BuildRequires
 - update grep statement to query the krb5 include directory

Patch from CarstenGrohmann via github, ok djm.
2015-12-15 15:23:49 +11:00
Darren Tucker b5fa0cd735 Allow --without-ssl-engine with --without-openssl
Patch from Mike Frysinger via github.
2015-12-15 15:10:32 +11:00
Darren Tucker c1d7e546f6 Include openssl crypto.h for SSLeay.
Patch from doughdemon via github.
2015-12-15 14:27:09 +11:00
Darren Tucker c6f5f01651 Add sys/time.h for gettimeofday.
Should allow it it compile with MUSL libc.  Based on patch from
doughdemon via github.
2015-12-15 13:59:12 +11:00
djm@openbsd.org 39736be06c upstream commit
correct error messages; from Tomas Kuthan bz#2507

Upstream-ID: 7454a0affeab772398052954c79300aa82077093
2015-12-11 13:23:14 +11:00
mmcc@openbsd.org 94141b7ade upstream commit
Pass (char *)NULL rather than (char *)0 to execl and
 execlp.

ok dtucker@

Upstream-ID: 56c955106cbddba86c3dd9bbf786ac0d1b361492
2015-12-11 13:23:14 +11:00
mmcc@openbsd.org d59ce08811 upstream commit
Remove NULL-checks before free().

ok dtucker@

Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8
2015-12-11 13:23:14 +11:00
mmcc@openbsd.org 8e56dd46cb upstream commit
Fix a couple "the the" typos. ok dtucker@

Upstream-ID: ec364c5af32031f013001fd28d1bd3dfacfe9a72
2015-12-11 13:23:13 +11:00
markus@openbsd.org 6262a0522d upstream commit
stricter encoding type checks for ssh-rsa; ok djm@

Upstream-ID: 8cca7c787599a5e8391e184d0b4f36fdc3665650
2015-12-11 13:23:13 +11:00
Damien Miller d86a3ba7af Don't set IPV6_V6ONLY on OpenBSD
It isn't necessary and runs afoul of pledge(2) restrictions.
2015-12-09 09:18:45 +11:00
djm@openbsd.org da98c11d03 upstream commit
basic unit tests for rsa-sha2-* signature types

Upstream-Regress-ID: 7dc4b9db809d578ff104d591b4d86560c3598d3c
2015-12-07 13:21:30 +11:00
markus@openbsd.org 3da893fdec upstream commit
prefer rsa-sha2-512 over -256 for hostkeys, too; noticed
 by naddy@

Upstream-ID: 685f55f7ec566a8caca587750672723a0faf3ffe
2015-12-07 12:39:20 +11:00
tobias@openbsd.org 8b56e59714 upstream commit
Properly handle invalid %-format by calling fatal.

ok deraadt, djm

Upstream-ID: 5692bce7d9f6eaa9c488cb93d3b55e758bef1eac
2015-12-07 12:38:59 +11:00
markus@openbsd.org 76c9fbbe35 upstream commit
implement SHA2-{256,512} for RSASSA-PKCS1-v1_5 signatures
 (user and host auth) based on draft-rsa-dsa-sha2-256-03.txt and
 draft-ssh-ext-info-04.txt; with & ok djm@

Upstream-ID: cf82ce532b2733e5c4b34bb7b7c94835632db309
2015-12-07 12:38:58 +11:00
djm@openbsd.org 6064a8b829 upstream commit
clean up agent_fd handling; properly initialise it to -1
 and make tests consistent

ok markus@

Upstream-ID: ac9554323d5065745caf17b5e37cb0f0d4825707
2015-12-04 15:15:00 +11:00