]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
4 years agoupdate version numbers V_8_4 anongit/V_8_4 github-selfhosted/V_8_4 github/V_8_4 V_8_4_P1
Damien Miller [Sun, 27 Sep 2020 07:25:01 +0000 (17:25 +1000)] 
update version numbers

4 years agoupstream: openssh 8.4
djm@openbsd.org [Sun, 27 Sep 2020 07:22:05 +0000 (07:22 +0000)] 
upstream: openssh 8.4

OpenBSD-Commit-ID: a29e5b372d2c00e297da8a35a3b87c9beb3b4a58

4 years agosync with upstream ssh-copy-id rev f0da1a1b7
Damien Miller [Tue, 22 Sep 2020 00:07:43 +0000 (10:07 +1000)] 
sync with upstream ssh-copy-id rev f0da1a1b7

4 years agoupstream: close stdin when forking after authentication too; ok markus
djm@openbsd.org [Mon, 21 Sep 2020 07:29:09 +0000 (07:29 +0000)] 
upstream: close stdin when forking after authentication too; ok markus

OpenBSD-Commit-ID: 43db17e4abc3e6b4a7b033aa8cdab326a7cb6c24

4 years agoupstream: close stdout/stderr after "ssh -f ..." forking
djm@openbsd.org [Sun, 20 Sep 2020 23:31:46 +0000 (23:31 +0000)] 
upstream: close stdout/stderr after "ssh -f ..." forking

bz#3137, ok markus

OpenBSD-Commit-ID: e2d83cc4dea1665651a7aa924ad1ed6bcaaab3e2

4 years ago.depend
Damien Miller [Sun, 20 Sep 2020 05:57:09 +0000 (15:57 +1000)] 
.depend

4 years agoupstream: cap channel input buffer size at 16MB; avoids high memory use
djm@openbsd.org [Sun, 20 Sep 2020 05:47:25 +0000 (05:47 +0000)] 
upstream: cap channel input buffer size at 16MB; avoids high memory use

when peer advertises a large window but is slow to consume the data we send
(e.g. because of a slow network)

reported by Pierre-Yves David

fix with & ok markus@

OpenBSD-Commit-ID: 1452771f5e5e768876d3bfe2544e3866d6ade216

4 years agolibfido2 1.5.0 is recommended
Damien Miller [Fri, 18 Sep 2020 12:02:53 +0000 (22:02 +1000)] 
libfido2 1.5.0 is recommended

4 years agoupstream: handle multiple messages in a single read()
djm@openbsd.org [Fri, 18 Sep 2020 08:16:38 +0000 (08:16 +0000)] 
upstream: handle multiple messages in a single read()

PR#183 by Dennis Kaarsemaker; feedback and ok markus@

OpenBSD-Commit-ID: 8570bb4d02d00cf70b98590716ea6a7d1cce68d1

4 years agoconfigure.ac: add missing includes 203/head
pedro martelletto [Fri, 18 Sep 2020 06:57:29 +0000 (08:57 +0200)] 
configure.ac: add missing includes

when testing, make sure to include the relevant header files that
declare the types of the functions used by the test:

- stdio.h for printf();
- stdlib.h for exit();
- string.h for strcmp();
- unistd.h for unlink(), _exit(), fork(), getppid(), sleep().

4 years agoupstream: tweak the client hostkey preference ordering algorithm to
djm@openbsd.org [Fri, 18 Sep 2020 05:23:03 +0000 (05:23 +0000)] 
upstream: tweak the client hostkey preference ordering algorithm to

prefer the default ordering if the user has a key that matches the
best-preference default algorithm.

feedback and ok markus@

OpenBSD-Commit-ID: a92dd7d7520ddd95c0a16786a7519e6d0167d35f

4 years agocontrol over the colours in gnome-ssh-askpass[23]
Damien Miller [Fri, 18 Sep 2020 04:55:48 +0000 (14:55 +1000)] 
control over the colours in gnome-ssh-askpass[23]

Optionally set the textarea colours via $GNOME_SSH_ASKPASS_FG_COLOR and
$GNOME_SSH_ASKPASS_BG_COLOR. These accept the usual three or six digit
hex colours.

4 years agofocus improvement for gnome-ssh-askpass[23]
Damien Miller [Fri, 18 Sep 2020 04:50:38 +0000 (14:50 +1000)] 
focus improvement for gnome-ssh-askpass[23]

When serving a SSH_ASKPASS_PROMPT=none information dialog, ensure
then <enter> doesn't immediately close the dialog. Instead, require an
explicit <tab> to reach the close button, or <esc>.

4 years agoupstream: Remove unused buf, last user was removed when switching
dtucker@openbsd.org [Wed, 16 Sep 2020 03:07:31 +0000 (03:07 +0000)] 
upstream: Remove unused buf, last user was removed when switching

to the sshbuf API. Patch from Sebastian Andrzej Siewior.

OpenBSD-Commit-ID: 250fa17f0cec01039cc4abd95917d9746e24c889

4 years agoupstream: For the hostkey confirmation message:
djm@openbsd.org [Wed, 9 Sep 2020 21:57:27 +0000 (21:57 +0000)] 
upstream: For the hostkey confirmation message:

> Are you sure you want to continue connecting (yes/no/[fingerprint])?

compare the fingerprint case sensitively; spotted Patrik Lundin
ok dtucker

OpenBSD-Commit-ID: 73097afee1b3a5929324e345ba4a4a42347409f2

4 years agoNew config-build-time dependency on automake.
Darren Tucker [Fri, 11 Sep 2020 04:45:23 +0000 (14:45 +1000)] 
New config-build-time dependency on automake.

4 years agoAdd aclocal.m4 and config.h.in~ to .gitignore.
Darren Tucker [Sun, 6 Sep 2020 11:56:36 +0000 (21:56 +1000)] 
Add aclocal.m4 and config.h.in~ to .gitignore.

aclocal.m4 is now generated by autoreconf.

4 years agoQuote the definition of OSSH_CHECK_HEADER_FOR_FIELD
Sebastian Andrzej Siewior [Sat, 5 Sep 2020 15:50:03 +0000 (17:50 +0200)] 
Quote the definition of OSSH_CHECK_HEADER_FOR_FIELD

autoreconf complains about underquoted definition of
OSSH_CHECK_HEADER_FOR_FIELD after aclocal.m4 has been and now is beeing
recreated.

Quote OSSH_CHECK_HEADER_FOR_FIELD as suggested.

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
4 years agoMove the local m4 macros
Sebastian Andrzej Siewior [Sat, 5 Sep 2020 15:50:02 +0000 (17:50 +0200)] 
Move the local m4 macros

The `aclocal' step is skipped during `autoreconf' because aclocal.m4 is
present.
Move the current aclocal.m4 which contains local macros into the m4/
folder. With this change the aclocal.m4 will be re-created during
changes to the m4/ macro.
This is needed so the `aclocal' can fetch m4 macros from the system if
they are references in the configure script. This is a prerequisite to
use PKG_CHECK_MODULES.

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
4 years agoRemove HAVE_MMAP and BROKEN_MMAP
Sebastian Andrzej Siewior [Sat, 5 Sep 2020 15:50:01 +0000 (17:50 +0200)] 
Remove HAVE_MMAP and BROKEN_MMAP

BROKEN_MMAP is no longer defined since commit
   1cfd5c06efb12 ("Remove portability support for mmap")

this commit also removed other HAVE_MMAP user. I didn't find anything
that defines HAVE_MMAP. The check does not trigger because compression
on server side is by default COMP_DELAYED (2) so it never triggers.

Remove remaining HAVE_MMAP and BROKEN_MMAP bits.

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
4 years agoupstream: adapt to SSH_SK_VERSION_MAJOR crank
djm@openbsd.org [Wed, 9 Sep 2020 03:10:21 +0000 (03:10 +0000)] 
upstream: adapt to SSH_SK_VERSION_MAJOR crank

OpenBSD-Regress-ID: 0f3e76bdc8f9dbd9d22707c7bdd86051d5112ab8

4 years agoupstream: Ensure that address/mask mismatches are flagged at
dtucker@openbsd.org [Fri, 28 Aug 2020 03:17:13 +0000 (03:17 +0000)] 
upstream: Ensure that address/mask mismatches are flagged at

config-check time. ok djm@

OpenBSD-Regress-ID: 8f5f4c2c0bf00e6ceae7a1755a444666de0ea5c2

4 years agoupstream: when writing an attestation blob for a FIDO key, record all
djm@openbsd.org [Wed, 9 Sep 2020 03:08:01 +0000 (03:08 +0000)] 
upstream: when writing an attestation blob for a FIDO key, record all

the data needed to verify the attestation. Previously we were missing the
"authenticator data" that is included in the signature.

spotted by Ian Haken
feedback Pedro Martelletto and Ian Haken; ok markus@

OpenBSD-Commit-ID: 8439896e63792b2db99c6065dd9a45eabbdb7e0a

4 years agoconfigure.ac: fix libfido2 back-compat
pedro martelletto [Tue, 1 Sep 2020 15:01:55 +0000 (17:01 +0200)] 
configure.ac: fix libfido2 back-compat

- HAVE_FIDO_CRED_PROD -> HAVE_FIDO_CRED_PROT;
- check for fido_dev_get_touch_begin(), so that
  HAVE_FIDO_DEV_GET_TOUCH_BEGIN gets defined.

4 years agoupstream: refuse to add verify-required (PINful) FIDO keys to
djm@openbsd.org [Mon, 31 Aug 2020 04:33:17 +0000 (04:33 +0000)] 
upstream: refuse to add verify-required (PINful) FIDO keys to

ssh-agent until the agent supports them properly

OpenBSD-Commit-ID: 125bd55a8df32c87c3ec33c6ebe437673a3d037e

4 years agoupstream: Add RCS IDs to the few files that are missing them; from
djm@openbsd.org [Mon, 31 Aug 2020 00:17:41 +0000 (00:17 +0000)] 
upstream: Add RCS IDs to the few files that are missing them; from

Pedro Martelletto

OpenBSD-Commit-ID: 39aa37a43d0c75ec87f1659f573d3b5867e4a3b3

4 years agoupstream: Check that the addresses supplied to Match Address and
dtucker@openbsd.org [Fri, 28 Aug 2020 03:15:52 +0000 (03:15 +0000)] 
upstream: Check that the addresses supplied to Match Address and

Match LocalAddress are valid when parsing in config-test mode.  This will
catch address/mask mismatches before they cause problems at runtime. Found by
Daniel Stocker, ok djm@

OpenBSD-Commit-ID: 2d0b10c69fad5d8fda4c703e7c6804935289378b

4 years agoupstream: sentence fix; from pedro martelletto
jmc@openbsd.org [Thu, 27 Aug 2020 12:34:00 +0000 (12:34 +0000)] 
upstream: sentence fix; from pedro martelletto

OpenBSD-Commit-ID: f95b84a1e94e9913173229f3787448eea2f8a575

4 years agotweak back-compat for older libfido2
Damien Miller [Thu, 27 Aug 2020 10:01:52 +0000 (20:01 +1000)] 
tweak back-compat for older libfido2

4 years agoupstream: debug()-print a little info about FIDO-specific key
djm@openbsd.org [Thu, 27 Aug 2020 09:46:04 +0000 (09:46 +0000)] 
upstream: debug()-print a little info about FIDO-specific key

fields via "ssh-keygen -vyf /path/key"

OpenBSD-Commit-ID: cf315c4fe77db43947d111b00155165cb6b577cf

4 years agoupstream: skip a bit more FIDO token selection logic when only a
djm@openbsd.org [Thu, 27 Aug 2020 09:43:28 +0000 (09:43 +0000)] 
upstream: skip a bit more FIDO token selection logic when only a

single token is attached.

with Pedro Martelletto

OpenBSD-Commit-ID: e4a324bd9814227ec1faa8cb619580e661cca9ac

4 years agoupstream: tweak previous;
jmc@openbsd.org [Thu, 27 Aug 2020 06:15:22 +0000 (06:15 +0000)] 
upstream: tweak previous;

OpenBSD-Commit-ID: 92714b6531e244e4da401b2defaa376374e24be7

4 years agoupstream: adapt to API changes
djm@openbsd.org [Thu, 27 Aug 2020 03:55:22 +0000 (03:55 +0000)] 
upstream: adapt to API changes

OpenBSD-Regress-ID: 5f147990cb67094fe554333782ab268a572bb2dd

4 years agodegrade semi-gracefully when libfido2 is too old
Damien Miller [Thu, 27 Aug 2020 02:37:12 +0000 (12:37 +1000)] 
degrade semi-gracefully when libfido2 is too old

4 years agoupstream: dummy firmware needs to match API version numner crank (for
djm@openbsd.org [Thu, 27 Aug 2020 01:15:36 +0000 (01:15 +0000)] 
upstream: dummy firmware needs to match API version numner crank (for

verify-required resident keys) even though it doesn't implement this feature

OpenBSD-Regress-ID: 86579ea2891e18e822e204413d011b2ae0e59657

4 years agoupstream: remove unreachable code I forgot to delete in r1.334
djm@openbsd.org [Thu, 27 Aug 2020 02:11:09 +0000 (02:11 +0000)] 
upstream: remove unreachable code I forgot to delete in r1.334

OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18

4 years agoupstream: Request PIN ahead of time for certain FIDO actions
djm@openbsd.org [Thu, 27 Aug 2020 01:08:45 +0000 (01:08 +0000)] 
upstream: Request PIN ahead of time for certain FIDO actions

When we know that a particular action will require a PIN, such as
downloading resident keys or generating a verify-required key, request
the PIN before attempting it.

joint work with Pedro Martelletto; ok markus@

OpenBSD-Commit-ID: 863182d38ef075bad1f7d20ca485752a05edb727

4 years agoupstream: preserve verify-required for resident FIDO keys
djm@openbsd.org [Thu, 27 Aug 2020 01:08:19 +0000 (01:08 +0000)] 
upstream: preserve verify-required for resident FIDO keys

When downloading a resident, verify-required key from a FIDO token,
preserve the verify-required in the private key that is written to
disk. Previously we weren't doing that because of lack of support
in the middleware API.

from Pedro Martelletto; ok markus@ and myself

OpenBSD-Commit-ID: 201c46ccdd227cddba3d64e1bdbd082afa956517

4 years agoupstream: major rework of FIDO token selection logic
djm@openbsd.org [Thu, 27 Aug 2020 01:07:51 +0000 (01:07 +0000)] 
upstream: major rework of FIDO token selection logic

When PINs are in use and multiple FIDO tokens are attached to a host, we
cannot just blast requests at all attached tokens with the PIN specified
as this will cause the per-token PIN failure counter to increment. If
this retry counter hits the token's limit (usually 3 attempts), then the
token will lock itself and render all (web and SSH) of its keys invalid.
We don't want this.

So this reworks the key selection logic for the specific case of
multiple keys being attached. When multiple keys are attached and the
operation requires a PIN, then the user must touch the key that they
wish to use first in order to identify it.

This may require multiple touches, but only if there are multiple keys
attached AND (usually) the operation requires a PIN. The usual case of a
single key attached should be unaffected.

Work by Pedro Martelletto; ok myself and markus@

OpenBSD-Commit-ID: 637d3049ced61b7a9ee796914bbc4843d999a864

4 years agoupstream: support for requiring user verified FIDO keys in sshd
djm@openbsd.org [Thu, 27 Aug 2020 01:07:09 +0000 (01:07 +0000)] 
upstream: support for requiring user verified FIDO keys in sshd

This adds a "verify-required" authorized_keys flag and a corresponding
sshd_config option that tells sshd to require that FIDO keys verify the
user identity before completing the signing/authentication attempt.
Whether or not user verification was performed is already baked into the
signature made on the FIDO token, so this is just plumbing that flag
through and adding ways to require it.

feedback and ok markus@

OpenBSD-Commit-ID: 3a2313aae153e043d57763d766bb6d55c4e276e6

4 years agoupstream: support for user-verified FIDO keys
djm@openbsd.org [Thu, 27 Aug 2020 01:06:18 +0000 (01:06 +0000)] 
upstream: support for user-verified FIDO keys

FIDO2 supports a notion of "user verification" where the user is
required to demonstrate their identity to the token before particular
operations (e.g. signing). Typically this is done by authenticating
themselves using a PIN that has been set on the token.

This adds support for generating and using user verified keys where
the verification happens via PIN (other options might be added in the
future, but none are in common use now). Practically, this adds
another key generation option "verify-required" that yields a key that
requires a PIN before each authentication.

feedback markus@ and Pedro Martelletto; ok markus@

OpenBSD-Commit-ID: 57fd461e4366f87c47502c5614ec08573e6d6a15

4 years agoupstream: ssh-keyscan(1): simplify conloop() with timercmp(3),
cheloha@openbsd.org [Wed, 12 Aug 2020 01:23:45 +0000 (01:23 +0000)] 
upstream: ssh-keyscan(1): simplify conloop() with timercmp(3),

timersub(3); ok djm@

OpenBSD-Commit-ID: a102acb544f840d33ad73d40088adab4a687fa27

4 years agoupstream: let ssh_config(5)'s AddKeysToAgent keyword accept a time
djm@openbsd.org [Tue, 11 Aug 2020 09:49:57 +0000 (09:49 +0000)] 
upstream: let ssh_config(5)'s AddKeysToAgent keyword accept a time

limit for keys in addition to its current flag options. Time-limited keys
will automatically be removed from ssh-agent after their expiry time has
passed; ok markus@

OpenBSD-Commit-ID: 792e71cacbbc25faab5424cf80bee4a006119f94

4 years agoupstream: let the "Confirm user presence for key ..." ssh-askpass
djm@openbsd.org [Tue, 11 Aug 2020 09:45:54 +0000 (09:45 +0000)] 
upstream: let the "Confirm user presence for key ..." ssh-askpass

notification respect $SSH_ASKPASS_REQUIRE; ok markus@

OpenBSD-Commit-ID: 7c1a616b348779bda3b9ad46bf592741f8e206c1

4 years agoRemove check for 'ent' command.
Darren Tucker [Thu, 20 Aug 2020 14:04:13 +0000 (00:04 +1000)] 
Remove check for 'ent' command.

It was added in 8d1fd57a9 for measuring entropy of ssh_prng_cmds which
has long since been removed and there are no other references to it.

5 years agoWrap stdint.h include in ifdef HAVE_STDINT_H.
Darren Tucker [Mon, 17 Aug 2020 11:34:32 +0000 (21:34 +1000)] 
Wrap stdint.h include in ifdef HAVE_STDINT_H.

5 years agosync memmem.c with OpenBSD
Damien Miller [Mon, 10 Aug 2020 03:24:09 +0000 (13:24 +1000)] 
sync memmem.c with OpenBSD

5 years agoAlways send any PAM account messages.
Darren Tucker [Fri, 7 Aug 2020 07:12:16 +0000 (17:12 +1000)] 
Always send any PAM account messages.

If the PAM account stack reaturns any messages, send them to the user
not just if the check succeeds.  bz#2049, ok djm@

5 years agoOutput test debug logs on failure.
Darren Tucker [Fri, 7 Aug 2020 05:37:37 +0000 (15:37 +1000)] 
Output test debug logs on failure.

5 years agoAdd ability to specify exact test target.
Darren Tucker [Fri, 7 Aug 2020 05:11:42 +0000 (15:11 +1000)] 
Add ability to specify exact test target.

5 years agoDocument --without-openssl and --without-zlib.
Darren Tucker [Fri, 7 Aug 2020 04:21:15 +0000 (14:21 +1000)] 
Document --without-openssl and --without-zlib.

5 years agoAdd without-openssl without-zlib test target.
Darren Tucker [Fri, 7 Aug 2020 04:15:11 +0000 (14:15 +1000)] 
Add without-openssl without-zlib test target.

5 years agoAdd CI with prepare script 198/head
Stefan Schindler [Wed, 5 Aug 2020 17:00:52 +0000 (19:00 +0200)] 
Add CI with prepare script

* Only use heimdal kerberos implementation
* Fetch yubico/libfido2 (see: https://github.com/Yubico/libfido2)
* Add one target for
    * all features
    * each feature alone
    * no features

5 years agosupport NetBSD's utmpx.ut_ss address field
Damien Miller [Tue, 4 Aug 2020 22:58:57 +0000 (08:58 +1000)] 
support NetBSD's utmpx.ut_ss address field

bz#960, ok dtucker

5 years agowrap a declaration in the same ifdefs as its use
Damien Miller [Tue, 4 Aug 2020 04:59:21 +0000 (14:59 +1000)] 
wrap a declaration in the same ifdefs as its use

avoids warnings on NetBSD

5 years agoundef TAILQ_CONCAT and friends
Damien Miller [Tue, 4 Aug 2020 04:58:46 +0000 (14:58 +1000)] 
undef TAILQ_CONCAT and friends

Needed for NetBSD. etc that supply these macros

5 years agoupstream: ensure that certificate extensions are lexically sorted.
djm@openbsd.org [Mon, 3 Aug 2020 02:53:51 +0000 (02:53 +0000)] 
upstream: ensure that certificate extensions are lexically sorted.

Previously if the user specified a custom extension then the everything would
be in order except the custom ones. bz3198 ok dtucker markus

OpenBSD-Commit-ID: d97deb90587b06cb227c66ffebb2d9667bf886f0

5 years agoupstream: allow -A to explicitly enable agent forwarding in scp and
djm@openbsd.org [Mon, 3 Aug 2020 02:43:41 +0000 (02:43 +0000)] 
upstream: allow -A to explicitly enable agent forwarding in scp and

sftp. The default remains to not forward an agent, even when ssh_config
enables it. ok jmc dtucker markus

OpenBSD-Commit-ID: 36cc526aa3b0f94e4704b8d7b969dd63e8576822

5 years agoupstream: clang -Wimplicit-fallthrough does not recognise /*
deraadt@openbsd.org [Mon, 3 Aug 2020 02:42:49 +0000 (02:42 +0000)] 
upstream: clang -Wimplicit-fallthrough does not recognise /*

FALLTHROUGH */ comments, which is the style we currently use, and gives too
many boring warnings. ok djm

OpenBSD-Commit-ID: 07b5031e9f49f2b69ac5e85b8da4fc9e393992a0

5 years agoupstream: Also compare username when checking for JumpHost loops.
dtucker@openbsd.org [Fri, 31 Jul 2020 04:19:37 +0000 (04:19 +0000)] 
upstream: Also compare username when checking for JumpHost loops.

bz#3057, ok djm@

OpenBSD-Commit-ID: 9bbc1d138adb34c54f3c03a15a91f75dbf418782

5 years agoRemove AC_REVISION.
Darren Tucker [Fri, 31 Jul 2020 05:19:04 +0000 (15:19 +1000)] 
Remove AC_REVISION.

It hasn't been useful since we switched to git in 2014.  ok djm@

5 years agoUse argv in OSSH_CHECK_CFLAG_COMPILE test.
Darren Tucker [Tue, 28 Jul 2020 09:40:30 +0000 (19:40 +1000)] 
Use argv in OSSH_CHECK_CFLAG_COMPILE test.

configure.ac is not detecting -Wextra in compilers that implement the
option. The problem is that -Wextra implies -Wunused-parameter, and the
C excerpt used by aclocal.m4 does not use argv.  Patch from pedro at
ambientworks.net, ok djm@

5 years agoSkip ECDSA-SK webauthn test when built w/out ECC
Darren Tucker [Mon, 20 Jul 2020 12:12:07 +0000 (22:12 +1000)] 
Skip ECDSA-SK webauthn test when built w/out ECC

5 years agoAdd ssh-sk-helper and manpage to RPM spec file
Damien Miller [Mon, 20 Jul 2020 03:09:25 +0000 (13:09 +1000)] 
Add ssh-sk-helper and manpage to RPM spec file

Based on patch from Fabio Pedretti

5 years agoupstream: Add %k to the TOKENs for Match Exec for consistency with
dtucker@openbsd.org [Fri, 17 Jul 2020 07:09:24 +0000 (07:09 +0000)] 
upstream: Add %k to the TOKENs for Match Exec for consistency with

the other keywords that recently got %k.

OpenBSD-Commit-ID: 1857d1c40f270cbc254fca91e66110641dddcfdb

5 years agoupstream: fix macro slip in previous;
jmc@openbsd.org [Fri, 17 Jul 2020 05:59:05 +0000 (05:59 +0000)] 
upstream: fix macro slip in previous;

OpenBSD-Commit-ID: 624e47ab209450ad9ad5c69f54fa69244de5ed9a

5 years agoupstream: Add test for '%k' (HostKeyAlias) TOKEN.
dtucker@openbsd.org [Fri, 17 Jul 2020 07:10:24 +0000 (07:10 +0000)] 
upstream: Add test for '%k' (HostKeyAlias) TOKEN.

OpenBSD-Regress-ID: 8ed1ba1a811790031aad3fcea860a34ad7910456

5 years agoupstream: Add tests for expansions on UserKnownHostsFile.
dtucker@openbsd.org [Fri, 17 Jul 2020 03:26:58 +0000 (03:26 +0000)] 
upstream: Add tests for expansions on UserKnownHostsFile.

OpenBSD-Regress-ID: bccf8060306c841bbcceb1392644f906a4d6ca51

5 years agoupstream: log error message for process_write() write failures
djm@openbsd.org [Fri, 17 Jul 2020 03:51:32 +0000 (03:51 +0000)] 
upstream: log error message for process_write() write failures

OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851

5 years agoupstream: Add a '%k' TOKEN that expands to the effective HostKey of
dtucker@openbsd.org [Fri, 17 Jul 2020 03:43:42 +0000 (03:43 +0000)] 
upstream: Add a '%k' TOKEN that expands to the effective HostKey of

the destination.  This allows, eg, keeping host keys in individual files
using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@
(man page bits)

OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc

5 years agoupstream: Add %-TOKEN, environment variable and tilde expansion to
dtucker@openbsd.org [Fri, 17 Jul 2020 03:23:10 +0000 (03:23 +0000)] 
upstream: Add %-TOKEN, environment variable and tilde expansion to

UserKnownHostsFile, allowing the file to be automagically split up in the
configuration (eg bz#1654).  ok djm@, man page parts jmc@

OpenBSD-Commit-ID: 7e1b406caf147638bb51558836a72d6cc0bd1b18

5 years agoupstream: - Add [-a rounds] in ssh-keygen man page and usage() -
solene@openbsd.org [Wed, 15 Jul 2020 07:50:46 +0000 (07:50 +0000)] 
upstream: - Add [-a rounds] in ssh-keygen man page and usage() -

Reorder parameters list in the first usage() case - Sentence rewording

ok dtucker@
jmc@ noticed usage() missed -a flag too

OpenBSD-Commit-ID: f06b9afe91cc96f260b929a56e9930caecbde246

5 years agoupstream: start sentence with capital letter;
jmc@openbsd.org [Wed, 15 Jul 2020 05:40:05 +0000 (05:40 +0000)] 
upstream: start sentence with capital letter;

OpenBSD-Commit-ID: ab06581d51b2b4cc1b4aab781f7f3cfa56cad973

5 years agodetect Linux/X32 systems
Damien Miller [Fri, 17 Jul 2020 03:15:50 +0000 (13:15 +1000)] 
detect Linux/X32 systems

This is a frankenstein monster of AMD64 instructions/calling conventions
but with a 4GB address space. Allegedly deprecated but people still run
into it causing weird sandbox failures, e.g. bz#3085

5 years agoupstream: Fix previous by calling the correct function.
dtucker@openbsd.org [Wed, 15 Jul 2020 06:43:16 +0000 (06:43 +0000)] 
upstream: Fix previous by calling the correct function.

OpenBSD-Regress-ID: 821cdd1dff9c502cceff4518b6afcb81767cad5a

5 years agoupstream: Update test to match recent change in match.c
dtucker@openbsd.org [Wed, 15 Jul 2020 05:36:50 +0000 (05:36 +0000)] 
upstream: Update test to match recent change in match.c

OpenBSD-Regress-ID: 965bda1f95f09a765050707340c73ad755f41167

5 years agoAdjust portable code to match changes in 939d787d,
Darren Tucker [Wed, 15 Jul 2020 05:30:43 +0000 (15:30 +1000)] 
Adjust portable code to match changes in 939d787d,

5 years agoupstream: Add default for number of rounds (-a). ok djm@
dtucker@openbsd.org [Wed, 15 Jul 2020 04:27:34 +0000 (04:27 +0000)] 
upstream: Add default for number of rounds (-a). ok djm@

OpenBSD-Commit-ID: cb7e9aa04ace01a98e63e4bd77f34a42ab169b15

5 years agoupstream: allow some additional control over the use of ssh-askpass
djm@openbsd.org [Tue, 14 Jul 2020 23:57:01 +0000 (23:57 +0000)] 
upstream: allow some additional control over the use of ssh-askpass

via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@

OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2

5 years agoupstream: correct recently broken comments
deraadt@openbsd.org [Tue, 7 Jul 2020 02:47:21 +0000 (02:47 +0000)] 
upstream: correct recently broken comments

OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1

5 years agoupstream: some language improvements; ok markus
djm@openbsd.org [Sun, 5 Jul 2020 23:59:45 +0000 (23:59 +0000)] 
upstream: some language improvements; ok markus

OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8

5 years agoupstream: update setproctitle after re-exec; ok djm
markus@openbsd.org [Fri, 3 Jul 2020 10:12:26 +0000 (10:12 +0000)] 
upstream: update setproctitle after re-exec; ok djm

OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b

5 years agoupstream: keep ignoring HUP after fork+exec; ok djm
markus@openbsd.org [Fri, 3 Jul 2020 10:11:33 +0000 (10:11 +0000)] 
upstream: keep ignoring HUP after fork+exec; ok djm

OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2

5 years agoupstream: don't exit the listener on send_rexec_state errors; ok
markus@openbsd.org [Fri, 3 Jul 2020 10:10:17 +0000 (10:10 +0000)] 
upstream: don't exit the listener on send_rexec_state errors; ok

djm

OpenBSD-Commit-ID: 57cbd757d130d3f45b7d41310b3a15eeec137d5c

5 years agoupstream: Use $OBJ to find key files. Fixes test when run on an obj
dtucker@openbsd.org [Wed, 15 Jul 2020 04:55:47 +0000 (04:55 +0000)] 
upstream: Use $OBJ to find key files. Fixes test when run on an obj

directory (on OpenBSD) or out of tree (in Portable).

OpenBSD-Regress-ID: 938fa8ac86adaa527d64a305bd2135cfbb1c0a17

5 years agoWrap stdint.h in ifdef HAVE_STDINT_H.
Darren Tucker [Sat, 4 Jul 2020 13:11:23 +0000 (23:11 +1000)] 
Wrap stdint.h in ifdef HAVE_STDINT_H.

5 years agoupstream: put back the mux_ctx memleak fix, but only for channels of
djm@openbsd.org [Fri, 3 Jul 2020 07:25:18 +0000 (07:25 +0000)] 
upstream: put back the mux_ctx memleak fix, but only for channels of

type SSH_CHANNEL_MUX_LISTENER; Specifically SSH_CHANNEL_MUX_PROXY channels
should not have this structure freed.

OpenBSD-Commit-ID: f3b213ae60405f77439e2b06262f054760c9d325

5 years agoupstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;
djm@openbsd.org [Fri, 3 Jul 2020 07:17:35 +0000 (07:17 +0000)] 
upstream: revert r1.399 - the lifetime of c->mux_ctx is more complex;

simply freeing it here causes other problems

OpenBSD-Commit-ID: c6fee8ca94e2485faa783839541962be2834c5ed

5 years agoupstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - if
djm@openbsd.org [Fri, 3 Jul 2020 07:02:37 +0000 (07:02 +0000)] 
upstream: avoid tilde_expand_filename() in expanding ~/.ssh/rc - if

sshd is in chroot mode, the likely absence of a password database will cause
tilde_expand_filename() to fatal; ok dtucker@

OpenBSD-Commit-ID: e20aee6159e8b79190d18dba1513fc1b7c8b7ee1

5 years agoupstream: when redirecting sshd's log output to a file, undo this
djm@openbsd.org [Fri, 3 Jul 2020 06:46:41 +0000 (06:46 +0000)] 
upstream: when redirecting sshd's log output to a file, undo this

redirection after the session child process is forked(); ok dtucker@

OpenBSD-Commit-ID: 6df86dd653c91f5bc8ac1916e7680d9d24690865

5 years agoupstream: start ClientAliveInterval bookkeeping before first pass
djm@openbsd.org [Fri, 3 Jul 2020 06:29:57 +0000 (06:29 +0000)] 
upstream: start ClientAliveInterval bookkeeping before first pass

through select() loop; fixed theoretical case where busy sshd may ignore
timeouts from client; inspired by and ok dtucker

OpenBSD-Commit-ID: 96bfc4b1f86c7da313882a84755b2b47eb31957f

5 years agoadd check for fido_cred_set_prot() to configure
Damien Miller [Fri, 3 Jul 2020 05:28:27 +0000 (15:28 +1000)] 
add check for fido_cred_set_prot() to configure

5 years agoupstream: Only reset the serveralive check when we receive traffic from
dtucker@openbsd.org [Fri, 3 Jul 2020 05:09:06 +0000 (05:09 +0000)] 
upstream: Only reset the serveralive check when we receive traffic from

the server and ignore traffic from a port forwarding client, preventing a
client from keeping a connection alive when it should be terminated.  Based
on a patch from jxraynor at gmail.com via openssh-unix-dev and bz#2265, ok
djm@

OpenBSD-Commit-ID: a941a575a5cbc244c0ef5d7abd0422bbf02c2dcd

5 years agosync sys-queue.h with OpenBSD upstream
Damien Miller [Fri, 3 Jul 2020 05:15:15 +0000 (15:15 +1000)] 
sync sys-queue.h with OpenBSD upstream

needed for TAILQ_CONCAT

5 years agoupstream: fix memory leak of mux_ctx; patch from Sergiy Lozovsky
djm@openbsd.org [Fri, 3 Jul 2020 05:08:41 +0000 (05:08 +0000)] 
upstream: fix memory leak of mux_ctx; patch from Sergiy Lozovsky

via bz3189 ok dtucker

OpenBSD-Commit-ID: db249bd4526fd42d0f4f43f72f7b8b7705253bde

5 years agoupstream: free kex in ssh_packet_close; ok djm semarie
markus@openbsd.org [Wed, 1 Jul 2020 16:28:31 +0000 (16:28 +0000)] 
upstream: free kex in ssh_packet_close; ok djm semarie

OpenBSD-Commit-ID: dbc181e90d3d32fd97b10d75e68e374270e070a2

5 years agoupstream: Replace TAILQ concatenation loops with TAILQ_CONCAT
bket@openbsd.org [Sat, 27 Jun 2020 13:39:09 +0000 (13:39 +0000)] 
upstream: Replace TAILQ concatenation loops with TAILQ_CONCAT

OK djm@

OpenBSD-Commit-ID: 454b40e09a117ddb833794358970a65b14c431ef

5 years agoupstream: backout 1.293 fix kex mem-leak in ssh_packet_close at markus
semarie@openbsd.org [Fri, 26 Jun 2020 11:26:01 +0000 (11:26 +0000)] 
upstream: backout 1.293 fix kex mem-leak in ssh_packet_close at markus

request

the change introduced a NULL deref in sshpkt_vfatal() (uses of ssh->kex after
calling ssh_packet_clear_keys())

OpenBSD-Commit-ID: 9c9a6721411461b0b1c28dc00930d7251a798484

5 years agodocument a PAM spec problem in a frustrated comment
Damien Miller [Fri, 26 Jun 2020 06:07:12 +0000 (16:07 +1000)] 
document a PAM spec problem in a frustrated comment

5 years agoupstream: avoid spurious error message when ssh-keygen creates files
djm@openbsd.org [Fri, 26 Jun 2020 05:42:16 +0000 (05:42 +0000)] 
upstream: avoid spurious error message when ssh-keygen creates files

outside ~/.ssh; with dtucker@

OpenBSD-Commit-ID: ac0c662d44607e00ec78c266ee60752beb1c7e08