]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
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

5 years agomissing ifdef SELINUX; spotted by dtucker
Damien Miller [Fri, 26 Jun 2020 05:30:06 +0000 (15:30 +1000)] 
missing ifdef SELINUX; spotted by dtucker

5 years agoupstream: regress test for ssh-add -d; ok dtucker@
djm@openbsd.org [Fri, 26 Jun 2020 05:12:21 +0000 (05:12 +0000)] 
upstream: regress test for ssh-add -d; ok dtucker@

OpenBSD-Regress-ID: 3a2e044be616afc7dd4f56c100179e83b33d8abf

5 years agoupstream: add test for mux w/-Oproxy; ok djm
markus@openbsd.org [Wed, 24 Jun 2020 15:16:23 +0000 (15:16 +0000)] 
upstream: add test for mux w/-Oproxy; ok djm

OpenBSD-Regress-ID: 764d5c696e2a259f1316a056e225e50023abb027

5 years agoupstream: handle EINTR in waitfd() and timeout_connect() helpers;
djm@openbsd.org [Fri, 26 Jun 2020 05:16:38 +0000 (05:16 +0000)] 
upstream: handle EINTR in waitfd() and timeout_connect() helpers;

bz#3071; ok dtucker@

OpenBSD-Commit-ID: 08fa87be50070bd8b754d9b1ebb1138d7bc9d8ee

5 years agoupstream: allow "ssh-add -d -" to read keys to be deleted from
djm@openbsd.org [Fri, 26 Jun 2020 05:04:07 +0000 (05:04 +0000)] 
upstream: allow "ssh-add -d -" to read keys to be deleted from

stdin bz#3180; ok dtucker@

OpenBSD-Commit-ID: 15c7f10289511eb19fce7905c9cae8954e3857ff

5 years agoupstream: constify a few things; ok dtucker (as part of another
djm@openbsd.org [Fri, 26 Jun 2020 05:03:36 +0000 (05:03 +0000)] 
upstream: constify a few things; ok dtucker (as part of another

diff)

OpenBSD-Commit-ID: 7c17fc987085994d752304bd20b1ae267a9bcdf6

5 years agoupstream: Defer creation of ~/.ssh by ssh(1) until we attempt to
dtucker@openbsd.org [Fri, 26 Jun 2020 05:02:03 +0000 (05:02 +0000)] 
upstream: Defer creation of ~/.ssh by ssh(1) until we attempt to

write to it so we don't leave an empty .ssh directory when it's not needed.
Use the same function to replace the code in ssh-keygen that does the same
thing. bz#3156, ok djm@

OpenBSD-Commit-ID: 59c073b569be1a60f4de36f491a4339bc4ae870f

5 years agoupstream: Expand path to ~/.ssh/rc rather than relying on it
dtucker@openbsd.org [Fri, 26 Jun 2020 04:45:11 +0000 (04:45 +0000)] 
upstream: Expand path to ~/.ssh/rc rather than relying on it

being relative to the current directory, so that it'll still be found if the
shell startup changes its directory.  Since the path is potentially longer,
make the cmd buffer that uses it dynamically sized.  bz#3185, with & ok djm@

OpenBSD-Commit-ID: 36e33ff01497af3dc8226d0c4c1526fc3a1e46bf

5 years agoupstream: fix kex mem-leak in ssh_packet_close; ok djm
markus@openbsd.org [Wed, 24 Jun 2020 15:12:09 +0000 (15:12 +0000)] 
upstream: fix kex mem-leak in ssh_packet_close; ok djm

OpenBSD-Commit-ID: e2e9533f393620383afd0b68ef435de8d5e8abe4

5 years agoupstream: fix ssh -O proxy w/mux which got broken by no longer
markus@openbsd.org [Wed, 24 Jun 2020 15:10:38 +0000 (15:10 +0000)] 
upstream: fix ssh -O proxy w/mux which got broken by no longer

making ssh->kex optional in packet.c revision 1.278 ok djm@

OpenBSD-Commit-ID: 2b65df04a064c2c6277359921d2320c90ab7d917

5 years agoupstream: support loading big sshd_config files w/o realloc; ok
markus@openbsd.org [Wed, 24 Jun 2020 15:09:53 +0000 (15:09 +0000)] 
upstream: support loading big sshd_config files w/o realloc; ok

djm

OpenBSD-Commit-ID: ba9238e810074ac907f0cf8cee1737ac04983171

5 years agoupstream: allow sshd_config longer than 256k; ok djm
markus@openbsd.org [Wed, 24 Jun 2020 15:08:53 +0000 (15:08 +0000)] 
upstream: allow sshd_config longer than 256k; ok djm

OpenBSD-Commit-ID: 83f40dd5457a64c1d3928eb4364461b22766beb3

5 years agoupstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok
markus@openbsd.org [Wed, 24 Jun 2020 15:07:33 +0000 (15:07 +0000)] 
upstream: only call sshkey_xmss_init() once for KEY_XMSS_CERT; ok

djm

OpenBSD-Commit-ID: d0002ffb7f20f538b014d1d0735facd5a81ff096

5 years agoupstream: some clarifying comments
djm@openbsd.org [Mon, 22 Jun 2020 23:44:27 +0000 (23:44 +0000)] 
upstream: some clarifying comments

OpenBSD-Commit-ID: 5268479000fd97bfa30ab819f3517139daa054a2

5 years agoupstream: updated argument name for -P in first synopsis was
jmc@openbsd.org [Mon, 22 Jun 2020 06:37:38 +0000 (06:37 +0000)] 
upstream: updated argument name for -P in first synopsis was

missed in previous;

OpenBSD-Commit-ID: 8d84dc3050469884ea91e29ee06a371713f2d0b7

5 years agoupstream: supply word missing in previous;
jmc@openbsd.org [Mon, 22 Jun 2020 06:36:40 +0000 (06:36 +0000)] 
upstream: supply word missing in previous;

OpenBSD-Commit-ID: 16a38b049f216108f66c8b699aa046063381bd23

5 years agomissing files for webauthn/sshsig unit test
Damien Miller [Mon, 22 Jun 2020 06:54:02 +0000 (16:54 +1000)] 
missing files for webauthn/sshsig unit test

5 years agoupstream: add support for verification of webauthn sshsig signature,
djm@openbsd.org [Mon, 22 Jun 2020 06:00:06 +0000 (06:00 +0000)] 
upstream: add support for verification of webauthn sshsig signature,

and example HTML/JS to generate webauthn signatures in SSH formats (also used
to generate the testdata/* for the test).

OpenBSD-Regress-ID: dc575be5bb1796fdf4b8aaee0ef52a6671a0f6fb

5 years agoupstream: Add support for FIDO webauthn (verification only).
djm@openbsd.org [Mon, 22 Jun 2020 05:58:35 +0000 (05:58 +0000)] 
upstream: Add support for FIDO webauthn (verification only).

webauthn is a standard for using FIDO keys in web browsers. webauthn
signatures are a slightly different format to plain FIDO signatures - this
support allows verification of these. Feedback and ok markus@

OpenBSD-Commit-ID: ab7e3a9fb5782d99d574f408614d833379e564ad

5 years agoupstream: refactor ECDSA-SK verification a little ahead of adding
djm@openbsd.org [Mon, 22 Jun 2020 05:56:23 +0000 (05:56 +0000)] 
upstream: refactor ECDSA-SK verification a little ahead of adding

support for FIDO webauthn signature verification support; ok markus@

OpenBSD-Commit-ID: c9f478fd8e0c1bd17e511ce8694f010d8e32043e

5 years agoupstream: support for RFC4648 base64url encoding; ok markus
djm@openbsd.org [Mon, 22 Jun 2020 05:54:10 +0000 (05:54 +0000)] 
upstream: support for RFC4648 base64url encoding; ok markus

OpenBSD-Commit-ID: 0ef22c55e772dda05c112c88412c0797fec66eb4

5 years agoupstream: better terminology for permissions; feedback & ok markus@
djm@openbsd.org [Mon, 22 Jun 2020 05:53:26 +0000 (05:53 +0000)] 
upstream: better terminology for permissions; feedback & ok markus@

OpenBSD-Commit-ID: ff2a71803b5ea57b83cc3fa9b3be42b70e462fb9

5 years agoupstream: better terminology for permissions; feedback & ok markus@
djm@openbsd.org [Mon, 22 Jun 2020 05:52:05 +0000 (05:52 +0000)] 
upstream: better terminology for permissions; feedback & ok markus@

OpenBSD-Commit-ID: ffb220b435610741dcb4de0e7fc68cbbdc876d2c

5 years agoupstream: Correct synopsis and usage for the options accepted when
dtucker@openbsd.org [Fri, 19 Jun 2020 07:21:42 +0000 (07:21 +0000)] 
upstream: Correct synopsis and usage for the options accepted when

passing a command to ssh-agent.  ok jmc@

OpenBSD-Commit-ID: b36f0679cb0cac0e33b361051b3406ade82ea846

5 years agoAdd OPENBSD ORIGINAL marker to bcrypt_pbkdf.
Darren Tucker [Fri, 19 Jun 2020 09:22:00 +0000 (19:22 +1000)] 
Add OPENBSD ORIGINAL marker to bcrypt_pbkdf.

5 years agoExtra brackets around sizeof() in bcrypt.
Darren Tucker [Fri, 19 Jun 2020 09:10:47 +0000 (19:10 +1000)] 
Extra brackets around sizeof() in bcrypt.

Prevents following warning from clang 10:
bcrypt_pbkdf.c:94:40: error: expression does not compute the number of
  elements in this array; element type is ´uint32_tÂ[...]
  place parentheses around the ´sizeof(uint64_t)´ expression to
  silence this warning

5 years agoAdd includes.h to new test.
Darren Tucker [Fri, 19 Jun 2020 08:47:56 +0000 (18:47 +1000)] 
Add includes.h to new test.

Fixes warnings eg "´bounded´ attribute directive ignor" from gcc.

5 years agoSkip OpenSSL specific tests w/out OpenSSL.
Darren Tucker [Fri, 19 Jun 2020 08:38:39 +0000 (18:38 +1000)] 
Skip OpenSSL specific tests w/out OpenSSL.

Allows unit tests to pass when configure'ed --without-openssl.

5 years agoHook sshsig tests up to Portable Makefiles.
Darren Tucker [Fri, 19 Jun 2020 07:15:27 +0000 (17:15 +1000)] 
Hook sshsig tests up to Portable Makefiles.

5 years agoupstream: Test that ssh-agent exits when running as as subprocess
dtucker@openbsd.org [Fri, 19 Jun 2020 05:07:09 +0000 (05:07 +0000)] 
upstream: Test that ssh-agent exits when running as as subprocess

of a specified command (ie "ssh-agent command").  Would have caught bz#3181.

OpenBSD-Regress-ID: 895b4765ba5153eefaea3160a7fe08ac0b6db8b3

5 years agoupstream: run sshsig unit tests
djm@openbsd.org [Fri, 19 Jun 2020 04:34:21 +0000 (04:34 +0000)] 
upstream: run sshsig unit tests

OpenBSD-Regress-ID: 706ef17e2b545b64873626e0e35553da7c06052a

5 years agoupstream: basic unit test for sshsig.[ch], including FIDO keys
djm@openbsd.org [Fri, 19 Jun 2020 04:32:09 +0000 (04:32 +0000)] 
upstream: basic unit test for sshsig.[ch], including FIDO keys

verification only so far

OpenBSD-Regress-ID: fb1f946c8fc59206bc6a6666e577b5d5d7e45896

5 years agoupstream: basic unit test for FIDO kep parsing
djm@openbsd.org [Fri, 19 Jun 2020 03:48:49 +0000 (03:48 +0000)] 
upstream: basic unit test for FIDO kep parsing

OpenBSD-Regress-ID: 8089b88393dd916d7c95422b442a6fd4cfe00c82

5 years agoupstream: check public host key matches private; ok markus@ (as
djm@openbsd.org [Thu, 18 Jun 2020 23:34:19 +0000 (23:34 +0000)] 
upstream: check public host key matches private; ok markus@ (as

part of previous diff)

OpenBSD-Commit-ID: 65a4f66436028748b59fb88b264cb8c94ce2ba63

5 years agoupstream: avoid spurious "Unable to load host key" message when
djm@openbsd.org [Thu, 18 Jun 2020 23:33:38 +0000 (23:33 +0000)] 
upstream: avoid spurious "Unable to load host key" message when

sshd can load a private key but no public counterpart; with & ok markus@

OpenBSD-Commit-ID: 0713cbdf9aa1ff8ac7b1f78b09ac911af510f81b

5 years agoupstream: correct RFC number; from HARUYAMA Seigo via GH PR191
djm@openbsd.org [Fri, 12 Jun 2020 05:26:37 +0000 (05:26 +0000)] 
upstream: correct RFC number; from HARUYAMA Seigo via GH PR191

OpenBSD-Commit-ID: 8d03b6c96ca98bfbc23d3754c3c33e1fe0852e10

5 years agoupstream: unbreak "sshd -ddd" - close of config passing fd happened too
djm@openbsd.org [Fri, 5 Jun 2020 06:18:07 +0000 (06:18 +0000)] 
upstream: unbreak "sshd -ddd" - close of config passing fd happened too

early. ok markus@

OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0

5 years agoAdd support for AUDIT_ARCH_RISCV64
Andreas Schwab [Mon, 25 May 2020 09:10:44 +0000 (11:10 +0200)] 
Add support for AUDIT_ARCH_RISCV64

5 years agoupstream: make sshbuf_putb(b, NULL) a no-op
djm@openbsd.org [Fri, 5 Jun 2020 03:25:35 +0000 (03:25 +0000)] 
upstream: make sshbuf_putb(b, NULL) a no-op

OpenBSD-Commit-ID: 976fdc99b500e347023d430df372f31c1dd128f7

5 years agoupstream: make sshbuf_dump() args const
djm@openbsd.org [Fri, 5 Jun 2020 03:24:36 +0000 (03:24 +0000)] 
upstream: make sshbuf_dump() args const

OpenBSD-Commit-ID: b4a5accae750875d665b862504169769bcf663bd

5 years agoupstream: wrap long line
djm@openbsd.org [Fri, 5 Jun 2020 03:24:16 +0000 (03:24 +0000)] 
upstream: wrap long line

OpenBSD-Commit-ID: ed405a12bd27bdc9c52e169bc5ff3529b4ebbbb2

5 years agoupstream: Correct historical comment: provos@ modified OpenSSH to
dtucker@openbsd.org [Fri, 5 Jun 2020 03:15:26 +0000 (03:15 +0000)] 
upstream: Correct historical comment: provos@ modified OpenSSH to

work with SSLeay (very quickly replaced by OpenSSL) not SSL in general.  ok
deraadt, historical context markus@

OpenBSD-Commit-ID: 7209e07a2984b50411ed8ca5a4932da5030d2b90

5 years agoupstream: Import regenerated moduli file.
dtucker@openbsd.org [Wed, 3 Jun 2020 08:23:18 +0000 (08:23 +0000)] 
upstream: Import regenerated moduli file.

OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54

5 years agoTest fallthrough in OSSH_CHECK_CFLAG_COMPILE.
Darren Tucker [Fri, 5 Jun 2020 03:20:10 +0000 (13:20 +1000)] 
Test fallthrough in OSSH_CHECK_CFLAG_COMPILE.

clang 10's -Wimplicit-fallthrough does not understand /* FALLTHROUGH */
comments and we don't use the __attribute__((fallthrough)) that it's
looking for.  This has the effect of turning off -Wimplicit-fallthrough
where it does not currently help (particularly with -Werror).  ok djm@

5 years agoupstream: Import regenerated moduli file.
dtucker@openbsd.org [Wed, 3 Jun 2020 08:23:18 +0000 (08:23 +0000)] 
upstream: Import regenerated moduli file.

OpenBSD-Commit-ID: 52ff0e3205036147b2499889353ac082e505ea54

5 years agoupstream: Remove now-unused proto_spec and associated definitions.
dtucker@openbsd.org [Mon, 1 Jun 2020 07:11:38 +0000 (07:11 +0000)] 
upstream: Remove now-unused proto_spec and associated definitions.

ok djm@

OpenBSD-Commit-ID: 2e2b18e3aa6ee22a7b69c39f2d3bd679ec35c362

5 years agoupstream: Fix error message on close(2) and add printf format
millert@openbsd.org [Fri, 29 May 2020 21:22:02 +0000 (21:22 +0000)] 
upstream: Fix error message on close(2) and add printf format

attributes. From Christos Zoulas, OK markus@

OpenBSD-Commit-ID: 41523c999a9e3561fcc7082fd38ea2e0629ee07e

5 years agoupstream: Make dollar_expand variadic and pass a real va_list to
dtucker@openbsd.org [Fri, 29 May 2020 11:17:56 +0000 (11:17 +0000)] 
upstream: Make dollar_expand variadic and pass a real va_list to

vdollar_percent_expand. Fixes build error on arm64 spotted by otto@.

OpenBSD-Commit-ID: 181910d7ae489f40ad609b4cf4a20f3d068a7279

5 years agoOmit ToS setting if we don't have IPV6_TCLASS too.
Darren Tucker [Fri, 29 May 2020 10:39:00 +0000 (20:39 +1000)] 
Omit ToS setting if we don't have IPV6_TCLASS too.

Fixes tests on old BSDs.

5 years agoupstream: Pass a NULL instead of zeroed out va_list from
dtucker@openbsd.org [Fri, 29 May 2020 09:02:44 +0000 (09:02 +0000)] 
upstream: Pass a NULL instead of zeroed out va_list from

dollar_expand.  The original intent was in case there's some platform where
va_list is not a pointer equivalent, but on i386 this chokes on the memset.
This unbreaks that build, but will require further consideration.

OpenBSD-Commit-ID: 7b90afcd8e1137a1d863204060052aef415baaf7

5 years agoupstream: remove a stray .El;
jmc@openbsd.org [Fri, 29 May 2020 05:48:39 +0000 (05:48 +0000)] 
upstream: remove a stray .El;

OpenBSD-Commit-ID: 58ddfe6f8a15fe10209db6664ecbe7896f1d167c

5 years agoupstream: Add regression and unit tests for ${ENV} style
dtucker@openbsd.org [Fri, 29 May 2020 04:32:26 +0000 (04:32 +0000)] 
upstream: Add regression and unit tests for ${ENV} style

environment variable expansion in various keywords (bz#3140).  ok djm@

OpenBSD-Regress-ID: 4d9ceb95d89365b7b674bc26cf064c15a5bbb197