summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* upstream commitV_7_6djm@openbsd.org2017-10-051-4/+4
| | | | | | | | fix (another) problem in PermitOpen introduced during the channels.c refactor: the third and subsequent arguments to PermitOpen were being silently ignored; ok markus@ Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
* upstream commitV_7_6_P1djm@openbsd.org2017-10-034-5/+21
| | | | | | Fix PermitOpen crash; spotted by benno@, ok dtucker@ deraadt@ Upstream-ID: c2cc84ffac070d2e1ff76182c70ca230a387983c
* update URL againDamien Miller2017-10-011-1/+1
| | | | I spotted a typo in the draft so uploaded a new version...
* sync release notes URLDamien Miller2017-10-011-1/+1
|
* sync contrib/ssh-copy-id with upstreamDamien Miller2017-10-011-4/+11
|
* update version in RPM spec filesDamien Miller2017-10-012-2/+2
|
* update agent draft URLDamien Miller2017-10-011-2/+4
|
* upstream commitdjm@openbsd.org2017-10-011-2/+2
| | | | | | openssh-7.6; ok deraadt@ Upstream-ID: a39c3a5b63a1baae109ae1ae4c7c34c2a59acde0
* upstream commitjmc@openbsd.org2017-10-011-3/+5
| | | | | | | | tweak EposeAuthinfo; diff from lars nooden tweaked by sthen; ok djm dtucker Upstream-ID: 8f2ea5d2065184363e8be7a0ba24d98a3b259748
* don't fatal ./configure for LibreSSLDamien Miller2017-09-281-0/+1
|
* abort in configure when only openssl-1.1.x foundDamien Miller2017-09-281-1/+4
| | | | | | | | | | We don't support openssl-1.1.x yet (see multiple threads on the openssh-unix-dev@ mailing list for the reason), but previously ./configure would accept it and the compilation would subsequently fail. This makes ./configure display an explicit error message and abort. ok dtucker@
* Check for and handle calloc(p, 0) = NULL.Darren Tucker2017-09-273-1/+66
| | | | | | | | On some platforms (AIX, maybe others) allocating zero bytes of memory via the various *alloc functions returns NULL, which is permitted by the standards. Autoconf has some macros for detecting this (with the exception of calloc for some reason) so use these and if necessary activate shims for them. ok djm@
* upstream commitmarkus@openbsd.org2017-09-261-35/+38
| | | | | | test reverse dynamic forwarding with SOCKS Upstream-Regress-ID: 95cf290470f7e5e2f691e4bc6ba19b91eced2f79
* sync missing changes in dynamic-forward.shDamien Miller2017-09-261-36/+35
|
* Add minimal strsignal for platforms without it.Darren Tucker2017-09-253-0/+15
|
* upstream commitdjm@openbsd.org2017-09-241-2/+2
| | | | | | | | fix inverted test on channel open failure path that "upgraded" a transient failure into a fatal error; reported by sthen and also seen by benno@; ok sthen@ Upstream-ID: b58b3fbb79ba224599c6cd6b60c934fc46c68472
* upstream commitdjm@openbsd.org2017-09-241-2/+2
| | | | | | | | write the correct buffer when tunnel forwarding; doesn't matter on OpenBSD (they are the same) but does matter on portable where we use an output filter to translate os-specific tun/tap headers Upstream-ID: f1ca94eff48404827b12e1d12f6139ee99a72284
* upstream commitdjm@openbsd.org2017-09-241-7/+8
| | | | | | | fix tunnel forwarding problem introduced in refactor; reported by stsp@ ok markus@ Upstream-ID: 81a731cdae1122c8522134095d1a8b60fa9dcd04
* upstream commitmarkus@openbsd.org2017-09-226-118/+346
| | | | | | | | | | | | | | | | | Add 'reverse' dynamic forwarding which combines dynamic forwarding (-D) with remote forwarding (-R) where the remote-forwarded port expects SOCKS-requests. The SSH server code is unchanged and the parsing happens at the SSH clients side. Thus the full SOCKS-request is sent over the forwarded channel and the client parses c->output. Parsing happens in channel_before_prepare_select(), _before_ the select bitmask is computed in the pre[] handlers, but after network input processing in the post[] handlers. help and ok djm@ Upstream-ID: aa25a6a3851064f34fe719e0bf15656ad5a64b89
* upstream commitdtucker@openbsd.org2017-09-221-2/+2
| | | | | | | | Use strsignal in debug message instead of casting for the benefit of portable where sig_atomic_t might not be int. "much nicer" deraadt@ Upstream-ID: 2dac6c1e40511c700bd90664cd263ed2299dcf79
* upstream commitmillert@openbsd.org2017-09-221-2/+2
| | | | | | | Use explicit_bzero() instead of bzero() before free() to prevent the compiler from optimizing away the bzero() call. OK djm@ Upstream-ID: cdc6197e64c9684c7250e23d60863ee1b53cef1d
* upstream commitdjm@openbsd.org2017-09-191-13/+4
| | | | | | | fix use-after-free in ~^Z escape handler path, introduced in channels.c refactor; spotted by millert@ "makes sense" deraadt@ Upstream-ID: 8fa2cdc65c23ad6420c1e59444b0c955b0589b22
* upstream commitdtucker@openbsd.org2017-09-191-2/+2
| | | | | | | Prevent type mismatch warning in debug on platforms where sig_atomic_t != int. ok djm@ Upstream-ID: 306e2375eb0364a4c68e48f091739bea4f4892ed
* upstream commitdtucker@openbsd.org2017-09-191-2/+3
| | | | | | Add braces missing after channels refactor. ok markus@ Upstream-ID: 72ab325c84e010680dbc88f226e2aa96b11a3980
* add freezero(3) replacementDamien Miller2017-09-194-1/+35
| | | | ok dtucker@
* move FORTIFY_SOURCE into hardening options groupDamien Miller2017-09-191-1/+1
| | | | | | It's still on by default, but now it's possible to turn it off using --without-hardening. This is useful since it's known to cause problems with some -fsanitize options. ok dtucker@
* upstream commitbluhm@openbsd.org2017-09-181-1/+1
| | | | | | | | | Print SKIPPED if sudo and doas configuration is missing. Prevents that running the regression test with wrong environment is reported as failure. Keep the fatal there to avoid interfering with other setups for portable ssh. OK dtucker@ Upstream-Regress-ID: f0dc60023caef496ded341ac5aade2a606fa234e
* upstream commitdtucker@openbsd.org2017-09-181-14/+1
| | | | | | Remove obsolete privsep=no fallback test. Upstream-Regress-ID: 7d6e1baa1678ac6be50c2a1555662eb1047638df
* upstream commitdtucker@openbsd.org2017-09-181-17/+3
| | | | | | | Remove non-privsep test since disabling privsep is now deprecated. Upstream-Regress-ID: 77ad3f3d8d52e87f514a80f285c6c1229b108ce8
* upstream commitdtucker@openbsd.org2017-09-181-3/+10
| | | | | | | | | Don't call fatal from stop_sshd since it calls cleanup which calls stop_sshd which will probably fail in the same way. Instead, just bail. Differentiate between sshd dying without cleanup and not shutting down. Upstream-Regress-ID: f97315f538618b349e2b0bea02d6b0c9196c6bc4
* upstream commitdjm@openbsd.org2017-09-143-53/+13
| | | | | | | | | | | | | | | | | Revert commitid: gJtIN6rRTS3CHy9b. ------------- identify the case where SSHFP records are missing but other DNS RR types are present and display a more useful error message for this case; patch by Thordur Bjornsson; bz#2501; ok dtucker@ ------------- This caused unexpected failures when VerifyHostKeyDNS=yes, SSHFP results are missing but the user already has the key in known_hosts Spotted by dtucker@ Upstream-ID: 97e31742fddaf72046f6ffef091ec0d823299920
* adapt portable to channels API changesDamien Miller2017-09-124-11/+10
|
* upstream commitdjm@openbsd.org2017-09-121-3/+3
| | | | | | unused variable Upstream-ID: 2f9ba09f2708993d35eac5aa71df910dcc52bac1
* upstream commitdjm@openbsd.org2017-09-121-1/+2
| | | | | | fix tun/tap forwarding case in previous Upstream-ID: 43ebe37a930320e24bca6900dccc39857840bc53
* upstream commitdjm@openbsd.org2017-09-126-24/+65
| | | | | | | | | | | | | | | Make remote channel ID a u_int Previously we tracked the remote channel IDs in an int, but this is strictly incorrect: the wire protocol uses uint32 and there is nothing in-principle stopping a SSH implementation from sending, say, 0xffff0000. In practice everyone numbers their channels sequentially, so this has never been a problem. ok markus@ Upstream-ID: b9f4cd3dc53155b4a5c995c0adba7da760d03e73
* upstream commitdjm@openbsd.org2017-09-1225-1992/+2441
| | | | | | | | | | | | | | | | | | | | | | refactor channels.c Move static state to a "struct ssh_channels" that is allocated at runtime and tracked as a member of struct ssh. Explicitly pass "struct ssh" to all channels functions. Replace use of the legacy packet APIs in channels.c. Rework sshd_config PermitOpen handling: previously the configuration parser would call directly into the channels layer. After the refactor this is not possible, as the channels structures are allocated at connection time and aren't available when the configuration is parsed. The server config parser now tracks PermitOpen itself and explicitly configures the channels code later. ok markus@ Upstream-ID: 11828f161656b965cc306576422613614bea2d8f
* upstream commitdjm@openbsd.org2017-09-121-2/+2
| | | | | | typo in comment Upstream-ID: a93b1e6f30f1f9b854b5b964b9fd092d0c422c47
* upstream commitjmc@openbsd.org2017-09-121-6/+7
| | | | | | tweak previous; Upstream-ID: bb8cc40b61b15f6a13d81da465ac5bfc65cbfc4b
* Fuzzer harnesses for sig verify and pubkey parsingDamien Miller2017-09-085-0/+92
| | | | | | These are some basic clang libfuzzer harnesses for signature verification and public key parsing. Some assembly (metaphorical) required.
* Give configure ability to set CFLAGS/LDFLAGS laterDamien Miller2017-09-081-0/+22
| | | | | | | | | | | | | | | | | Some CFLAGS/LDFLAGS may disrupt the configure script's operation, in particular santization and fuzzer options that break assumptions about memory and file descriptor dispositions. This adds two flags to configure --with-cflags-after and --with-ldflags-after that allow specifying additional compiler and linker options that are added to the resultant Makefiles but not used in the configure run itself. E.g. env CC=clang-3.9 ./configure \ --with-cflags-after=-fsantize=address \ --with-ldflags-after="-g -fsanitize=address"
* upstream commitdjm@openbsd.org2017-09-044-22/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand ssh_config's StrictModes option with two new settings: StrictModes=accept-new will automatically accept hitherto-unseen keys but will refuse connections for changed or invalid hostkeys. StrictModes=off is the same as StrictModes=no Motivation: StrictModes=no combines two behaviours for host key processing: automatically learning new hostkeys and continuing to connect to hosts with invalid/changed hostkeys. The latter behaviour is quite dangerous since it removes most of the protections the SSH protocol is supposed to provide. Quite a few users want to automatically learn hostkeys however, so this makes that feature available with less danger. At some point in the future, StrictModes=no will change to be a synonym for accept-new, with its current behaviour remaining available via StrictModes=off. bz#2400, suggested by Michael Samuel; ok markus Upstream-ID: 0f55502bf75fc93a74fb9853264a8276b9680b64
* upstream commitjmc@openbsd.org2017-09-041-2/+1
| | | | | | remove blank line; Upstream-ID: 2f46b51a0ddb3730020791719e94d3e418e9f423
* upstream commitdjm@openbsd.org2017-09-043-13/+53
| | | | | | | | identify the case where SSHFP records are missing but other DNS RR types are present and display a more useful error message for this case; patch by Thordur Bjornsson; bz#2501; ok dtucker@ Upstream-ID: 8f7a5a8344f684823d8317a9708b63e75be2c244
* upstream commitdjm@openbsd.org2017-09-041-2/+15
| | | | | | | document available AuthenticationMethods; bz#2453 ok dtucker@ Upstream-ID: 2c70576f237bb699aff59889dbf2acba4276d3d0
* upstream commitdjm@openbsd.org2017-09-044-21/+21
| | | | | | | pass packet state down to some of the channels function (more to come...); ok markus@ Upstream-ID: d8ce7a94f4059d7ac1e01fb0eb01de0c4b36c81b
* upstream commitjmc@openbsd.org2017-09-041-3/+3
| | | | | | sort options; Upstream-ID: cf21d68cf54e81968bca629aaeddc87f0c684f3c
* upstream commitdlg@openbsd.org2017-09-042-16/+28
| | | | | | | | | | | | add a -q option to ssh-add to make it quiet on success. if you want to silence ssh-add without this you generally redirect the output to /dev/null, but that can hide error output which you should see. ok djm@ Upstream-ID: 2f31b9b13f99dcf587e9a8ba443458e6c0d8997c
* upstream commitdtucker@openbsd.org2017-09-041-3/+3
| | | | | | | | Increase the buffer sizes for user prompts to ensure that they won't be truncated by snprintf. Based on patch from cjwatson at debian.org via bz#2768, ok djm@ Upstream-ID: 6ffacf1abec8f40b469de5b94bfb29997d96af3e
* Switch Capsicum header to sys/capsicum.h.Darren Tucker2017-08-282-5/+11
| | | | | | FreeBSD's <sys/capability.h> was renamed to <sys/capsicum.h> in 2014 to avoid future conflicts with POSIX capabilities (the last release that didn't have it was 9.3) so switch to that. Patch from des at des.no.
* Add missing includes for bsd-err.c.Darren Tucker2017-08-271-0/+6
| | | | Patch from cjwatson at debian.org via bz#2767.
View Lorry Controller Status