]> git.ipfire.org Git - thirdparty/openssh-portable.git/log
thirdparty/openssh-portable.git
18 months agoupstream: whitespace
djm@openbsd.org [Fri, 2 Feb 2024 00:13:34 +0000 (00:13 +0000)] 
upstream: whitespace

OpenBSD-Commit-ID: b24680bc755b621ea801ff8edf6f0f02b68edae1

18 months agoImprove error message for OpenSSL header check.
Darren Tucker [Mon, 19 Feb 2024 06:29:31 +0000 (17:29 +1100)] 
Improve error message for OpenSSL header check.

bz#3668, ok djm@

18 months agoInterop test against PuTTY snapshot and releases.
Darren Tucker [Wed, 7 Feb 2024 02:45:02 +0000 (13:45 +1100)] 
Interop test against PuTTY snapshot and releases.

18 months agoPut privsep dir on OS X on /usr/local.
Darren Tucker [Tue, 6 Feb 2024 05:21:05 +0000 (16:21 +1100)] 
Put privsep dir on OS X on /usr/local.

On some runners we can't create /var/empty, so put it some place we can
write.  Should fix test breakage on Max OS X 11.

18 months agoAdd --disable-fd-passing option.
Darren Tucker [Tue, 6 Feb 2024 00:19:42 +0000 (11:19 +1100)] 
Add --disable-fd-passing option.

.. and enable for the minix3 test VM.  This will cause it to more reliably
skip tests that need FD passing and should fix the current test breakage.

18 months agoUse "skip" function instead doing it ourselves.
Darren Tucker [Tue, 6 Feb 2024 00:18:44 +0000 (11:18 +1100)] 
Use "skip" function instead doing it ourselves.

18 months agoignore some vim droppings
Damien Miller [Thu, 1 Feb 2024 03:01:18 +0000 (14:01 +1100)] 
ignore some vim droppings

18 months agoupstream: whitespace
djm@openbsd.org [Thu, 1 Feb 2024 02:37:33 +0000 (02:37 +0000)] 
upstream: whitespace

OpenBSD-Commit-ID: bf9e4a1049562ee4322684fbdce07142f04fdbb7

19 months agoskip tests that use multiplexing on Windows
Damien Miller [Tue, 16 Jan 2024 03:40:18 +0000 (14:40 +1100)] 
skip tests that use multiplexing on Windows

Some tests here use multiplexing, skip these if DISABLE_FD_PASSING
is set. Should unbreak tests on Windows.

19 months agoupstream: don't disable RSA test when DSA is disabled; bug introduced
djm@openbsd.org [Thu, 11 Jan 2024 04:50:28 +0000 (04:50 +0000)] 
upstream: don't disable RSA test when DSA is disabled; bug introduced

in last commit

OpenBSD-Regress-ID: 8780a7250bf742b33010e9336359a1c516f2d7b5

19 months agoupstream: make DSA testing optional, defaulting to on
djm@openbsd.org [Thu, 11 Jan 2024 01:45:58 +0000 (01:45 +0000)] 
upstream: make DSA testing optional, defaulting to on

ok markus

OpenBSD-Regress-ID: dfc27b5574e3f19dc4043395594cea5f90b8572a

19 months agoupstream: ensure key_fd is filled when DSA is disabled; spotted by
djm@openbsd.org [Thu, 11 Jan 2024 01:51:16 +0000 (01:51 +0000)] 
upstream: ensure key_fd is filled when DSA is disabled; spotted by

tb@

OpenBSD-Commit-ID: 9dd417b6eec3cf67e870f147464a8d93f076dce7

19 months agoupstream: make DSA key support compile-time optional, defaulting to
djm@openbsd.org [Thu, 11 Jan 2024 01:45:36 +0000 (01:45 +0000)] 
upstream: make DSA key support compile-time optional, defaulting to

on

ok markus@

OpenBSD-Commit-ID: 4f8e98fc1fd6de399d0921d5b31b3127a03f581d

19 months agoupstream: fix incorrect capitalisation;
jmc@openbsd.org [Wed, 10 Jan 2024 06:33:13 +0000 (06:33 +0000)] 
upstream: fix incorrect capitalisation;

OpenBSD-Commit-ID: cb07eb06e15fa2334660ac73e98f29b6a1931984

19 months agoupstream: extend ChannelTimeout regression test to exercise multiplexed
djm@openbsd.org [Tue, 9 Jan 2024 22:19:36 +0000 (22:19 +0000)] 
upstream: extend ChannelTimeout regression test to exercise multiplexed

connections and the new "global" timeout type. ok dtucker@

OpenBSD-Regress-ID: f10d19f697024e9941acad7c2057f73d6eacb8a2

19 months agoupstream: add a "global" ChannelTimeout type to ssh(1) and sshd(8)
djm@openbsd.org [Tue, 9 Jan 2024 22:19:00 +0000 (22:19 +0000)] 
upstream: add a "global" ChannelTimeout type to ssh(1) and sshd(8)

that watches all open channels and will close all open channels if there is
no traffic on any of them for the specified interval. This is in addition to
the existing per-channel timeouts added a few releases ago.

This supports use-cases like having a session + x11 forwarding channel
open where one may be idle for an extended period but the other is
actively used. The global timeout would allow closing both channels when
both have been idle for too long.

ok dtucker@

OpenBSD-Commit-ID: 0054157d24d2eaa5dc1a9a9859afefc13d1d7eb3

19 months agoupstream: adapt ssh_api.c code for kex-strict
djm@openbsd.org [Tue, 9 Jan 2024 21:39:14 +0000 (21:39 +0000)] 
upstream: adapt ssh_api.c code for kex-strict

from markus@ ok me

OpenBSD-Commit-ID: 4d9f256852af2a5b882b12cae9447f8f00f933ac

19 months agonite that recent OSX tun/tap is unsupported
Damien Miller [Mon, 8 Jan 2024 05:26:37 +0000 (16:26 +1100)] 
nite that recent OSX tun/tap is unsupported

19 months agoREADME.platform: update tuntap url
Sevan Janiyan [Wed, 27 Dec 2023 04:57:49 +0000 (04:57 +0000)] 
README.platform: update tuntap url

19 months agoFix compilation error in ssh-pcks11-client.c
Rose [Tue, 19 Dec 2023 16:48:20 +0000 (11:48 -0500)] 
Fix compilation error in ssh-pcks11-client.c

Compilation fails becaus of an undefined reference to helper_by_ec,
because we forgot the preprocessor conditional that excludes that function
from being called in unsupported configurations.

19 months agoupstream: Remove outdated note from PROTOCOL.mux
djm@openbsd.org [Mon, 8 Jan 2024 05:11:18 +0000 (05:11 +0000)] 
upstream: Remove outdated note from PROTOCOL.mux

Port forward close by control master is already implemented
by `mux_master_process_close_fwd` in `mux.c`

GHPR442 from bigb4ng

OpenBSD-Commit-ID: ad0734fe5916d2dc7dd02b588906cea4df0482fb

19 months agoupstream: fix missing field in users-groups-by-id@openssh.com reply
djm@openbsd.org [Mon, 8 Jan 2024 05:05:15 +0000 (05:05 +0000)] 
upstream: fix missing field in users-groups-by-id@openssh.com reply

documentation

GHPR441 from TJ Saunders

OpenBSD-Commit-ID: ff5733ff6ef4cd24e0758ebeed557aa91184c674

19 months agoupstream: make kex-strict section more explicit about its intent:
djm@openbsd.org [Mon, 8 Jan 2024 04:10:03 +0000 (04:10 +0000)] 
upstream: make kex-strict section more explicit about its intent:

banning all messages not strictly required in KEX

OpenBSD-Commit-ID: fc33a2d7f3b7013a7fb7500bdbaa8254ebc88116

19 months agoupdate fuzzer example makefile to clang16
Damien Miller [Mon, 8 Jan 2024 03:46:19 +0000 (14:46 +1100)] 
update fuzzer example makefile to clang16

19 months agounbreak fuzzers - missing pkcs11_make_cert()
Damien Miller [Mon, 8 Jan 2024 03:45:49 +0000 (14:45 +1100)] 
unbreak fuzzers - missing pkcs11_make_cert()

provide stub for use in fuzzer harness

19 months agounbreak fuzzers for clang16
Damien Miller [Mon, 8 Jan 2024 03:45:14 +0000 (14:45 +1100)] 
unbreak fuzzers for clang16

getopt() needs a throw() attribute to compile, so supply one when compiling
things with C++

19 months agoupstream: remove ext-info-* in the kex.c code, not in callers;
djm@openbsd.org [Mon, 8 Jan 2024 00:34:33 +0000 (00:34 +0000)] 
upstream: remove ext-info-* in the kex.c code, not in callers;

with/ok markus@

OpenBSD-Commit-ID: c06fe2d3a0605c517ff7d65e38ec7b2d1b0b2799

19 months agoupstream: fix typo; spotted by Albert Chin
djm@openbsd.org [Mon, 8 Jan 2024 00:30:39 +0000 (00:30 +0000)] 
upstream: fix typo; spotted by Albert Chin

OpenBSD-Commit-ID: 77140b520a43375b886e535eb8bd842a268f9368

19 months agoupstream: Import regenerated moduli.
dtucker@openbsd.org [Thu, 4 Jan 2024 09:51:49 +0000 (09:51 +0000)] 
upstream: Import regenerated moduli.

OpenBSD-Commit-ID: 5a636f6ca7f25bfe775df4952f7aac90a7fcbbee

19 months agoupstream: spelling; ok markus@
jsg@openbsd.org [Wed, 20 Dec 2023 00:06:25 +0000 (00:06 +0000)] 
upstream: spelling; ok markus@

OpenBSD-Commit-ID: 9d01f2e9d59a999d5d42fc3b3efcf8dfb892e31b

19 months agoupstream: sort -C, and add to usage(); ok djm
jmc@openbsd.org [Tue, 19 Dec 2023 06:57:34 +0000 (06:57 +0000)] 
upstream: sort -C, and add to usage(); ok djm

OpenBSD-Commit-ID: 80141b2a5d60c8593e3c65ca3c53c431262c812f

19 months agoupstream: correct section numbers; from Ed Maste
djm@openbsd.org [Tue, 19 Dec 2023 06:41:14 +0000 (06:41 +0000)] 
upstream: correct section numbers; from Ed Maste

OpenBSD-Commit-ID: e289576ee5651528404cb2fb68945556052cf83f

19 months agoupstream: match flag type (s/int/u_int)
djm@openbsd.org [Mon, 18 Dec 2023 15:58:56 +0000 (15:58 +0000)] 
upstream: match flag type (s/int/u_int)

OpenBSD-Commit-ID: 9422289747c35ccb7b31d0e1888ccd5e74ad566a

20 months agobetter detection of broken -fzero-call-used-regs
Damien Miller [Fri, 22 Dec 2023 06:56:26 +0000 (17:56 +1100)] 
better detection of broken -fzero-call-used-regs

gcc 13.2.0 on ppc64le refuses to compile some function, including
cipher.c:compression_alg_list() with an error:

> sorry, unimplemented: argument ‘used’ is not supportedcw
> for ‘-fzero-call-used-regs’ on this target

This extends the autoconf will-it-work test with a similarly-
structured function that seems to catch this.

Spotted/tested by Colin Watson; bz3645

20 months agocrank versions V_9_6_P1
Damien Miller [Mon, 18 Dec 2023 14:59:50 +0000 (01:59 +1100)] 
crank versions

20 months agodepend
Damien Miller [Mon, 18 Dec 2023 14:59:06 +0000 (01:59 +1100)] 
depend

20 months agoupstream: regress test for agent PKCS#11-backed certificates
djm@openbsd.org [Mon, 18 Dec 2023 14:50:08 +0000 (14:50 +0000)] 
upstream: regress test for agent PKCS#11-backed certificates

OpenBSD-Regress-ID: 38f681777cb944a8cc3bf9d0ad62959a16764df9

20 months agoupstream: regress test for constrained PKCS#11 keys
djm@openbsd.org [Mon, 18 Dec 2023 14:49:39 +0000 (14:49 +0000)] 
upstream: regress test for constrained PKCS#11 keys

OpenBSD-Regress-ID: b2f26ae95d609d12257b43aef7cd7714c82618ff

20 months agoupstream: openssh-9.6
djm@openbsd.org [Mon, 18 Dec 2023 14:48:44 +0000 (14:48 +0000)] 
upstream: openssh-9.6

OpenBSD-Commit-ID: 21759837cf0e0092d9a2079f8fb562071c11016b

20 months agoupstream: ssh-agent: record failed session-bind attempts
djm@openbsd.org [Mon, 18 Dec 2023 14:48:08 +0000 (14:48 +0000)] 
upstream: ssh-agent: record failed session-bind attempts

Record failed attempts to session-bind a connection and refuse signing
operations on that connection henceforth.

Prevents a future situation where we add a new hostkey type that is not
recognised by an older ssh-agent, that consequently causes session-bind
to fail (this situation is only likely to arise when people mix ssh(1)
and ssh-agent(1) of different versions on the same host). Previously,
after such a failure the agent socket would be considered unbound and
not subject to restriction.

Spotted by Jann Horn

OpenBSD-Commit-ID: b0fdd023e920aa4831413f640de4c5307b53552e

20 months agoupstream: ban user/hostnames with most shell metacharacters
djm@openbsd.org [Mon, 18 Dec 2023 14:47:44 +0000 (14:47 +0000)] 
upstream: ban user/hostnames with most shell metacharacters

This makes ssh(1) refuse user or host names provided on the
commandline that contain most shell metacharacters.

Some programs that invoke ssh(1) using untrusted data do not filter
metacharacters in arguments they supply. This could create
interactions with user-specified ProxyCommand and other directives
that allow shell injection attacks to occur.

It's a mistake to invoke ssh(1) with arbitrary untrusted arguments,
but getting this stuff right can be tricky, so this should prevent
most obvious ways of creating risky situations. It however is not
and cannot be perfect: ssh(1) has no practical way of interpreting
what shell quoting rules are in use and how they interact with the
user's specified ProxyCommand.

To allow configurations that use strange user or hostnames to
continue to work, this strictness is applied only to names coming
from the commandline. Names specified using User or Hostname
directives in ssh_config(5) are not affected.

feedback/ok millert@ markus@ dtucker@ deraadt@

OpenBSD-Commit-ID: 3b487348b5964f3e77b6b4d3da4c3b439e94b2d9

20 months agoupstream: stricter handling of channel window limits
djm@openbsd.org [Mon, 18 Dec 2023 14:47:20 +0000 (14:47 +0000)] 
upstream: stricter handling of channel window limits

This makes ssh/sshd more strict in handling non-compliant peers that
send more data than the advertised channel window allows. Previously
the additional data would be silently discarded. This change will
cause ssh/sshd to terminate the connection if the channel window is
exceeded by more than a small grace allowance.

ok markus@

OpenBSD-Commit-ID: 811e21b41831eba3dd7f67b3d409a438f20d3037

20 months agoupstream: Make it possible to load certs from PKCS#11 tokens
djm@openbsd.org [Mon, 18 Dec 2023 14:46:56 +0000 (14:46 +0000)] 
upstream: Make it possible to load certs from PKCS#11 tokens

Adds a protocol extension to allow grafting certificates supplied by
ssh-add to keys loaded from PKCS#11 tokens in the agent.

feedback/ok markus@

OpenBSD-Commit-ID: bb5433cd28ede2bc910996eb3c0b53e20f86037f

20 months agoupstream: apply destination constraints to all p11 keys
djm@openbsd.org [Mon, 18 Dec 2023 14:46:12 +0000 (14:46 +0000)] 
upstream: apply destination constraints to all p11 keys

Previously applied only to the first key returned from each token.

ok markus@

OpenBSD-Commit-ID: 36df3afb8eb94eec6b2541f063d0d164ef8b488d

20 months agoupstream: add "ext-info-in-auth@openssh.com" extension
djm@openbsd.org [Mon, 18 Dec 2023 14:45:49 +0000 (14:45 +0000)] 
upstream: add "ext-info-in-auth@openssh.com" extension

This adds another transport protocol extension to allow a sshd to send
SSH2_MSG_EXT_INFO during user authentication, after the server has
learned the username that is being logged in to.

This lets sshd to update the acceptable signature algoritms for public
key authentication, and allows these to be varied via sshd_config(5)
"Match" directives, which are evaluated after the server learns the
username being authenticated.

Full details in the PROTOCOL file

OpenBSD-Commit-ID: 1de7da7f2b6c32a46043d75fcd49b0cbb7db7779

20 months agoupstream: implement "strict key exchange" in ssh and sshd
djm@openbsd.org [Mon, 18 Dec 2023 14:45:17 +0000 (14:45 +0000)] 
upstream: implement "strict key exchange" in ssh and sshd

This adds a protocol extension to improve the integrity of the SSH
transport protocol, particular in and around the initial key exchange
(KEX) phase.

Full details of the extension are in the PROTOCOL file.

with markus@

OpenBSD-Commit-ID: 2a66ac962f0a630d7945fee54004ed9e9c439f14

20 months agobetter detection of broken -fzero-call-used-regs
Damien Miller [Mon, 18 Dec 2023 03:49:11 +0000 (14:49 +1100)] 
better detection of broken -fzero-call-used-regs

Use OSSH_CHECK_CFLAG_LINK() for detection of these flags and extend
test program to exercise varargs, which seems to catch more stuff.

ok dtucker@

20 months agoupstream: when invoking KnownHostsCommand to determine the order of
djm@openbsd.org [Wed, 13 Dec 2023 03:28:19 +0000 (03:28 +0000)] 
upstream: when invoking KnownHostsCommand to determine the order of

host key algorithms to request, ensure that the hostname passed to the
command is decorated with the port number for ports other than 22.

This matches the behaviour of KnownHostsCommand when invoked to look
up the actual host key.

bz3643, ok dtucker@

OpenBSD-Commit-ID: 5cfabc0b7c6c7ab473666df314f377b1f15420b1

20 months agoupstream: prevent leak in sshsig_match_principals; ok djm@
markus@openbsd.org [Fri, 8 Dec 2023 09:18:39 +0000 (09:18 +0000)] 
upstream: prevent leak in sshsig_match_principals; ok djm@

OpenBSD-Commit-ID: 594f61ad4819ff5c72dfe99ba666a17f0e1030ae

20 months agoupstream: short circuit debug log processing early if we're not going
djm@openbsd.org [Wed, 6 Dec 2023 21:06:48 +0000 (21:06 +0000)] 
upstream: short circuit debug log processing early if we're not going

to log anything. From Kobe Housen

OpenBSD-Commit-ID: 2bcddd695872a1bef137cfff7823044dcded90ea

20 months agoAdd tests for OpenSSL 3.2.0 and 3.2 stable branch.
Darren Tucker [Sun, 26 Nov 2023 22:37:28 +0000 (09:37 +1100)] 
Add tests for OpenSSL 3.2.0 and 3.2 stable branch.

20 months agoUse non-zero arg in compiler test program.
Darren Tucker [Fri, 24 Nov 2023 22:03:38 +0000 (09:03 +1100)] 
Use non-zero arg in compiler test program.

Now that we're running the test program, passing zero to the test function
can cause divide-by-zero exceptions which might show up in logs.

20 months agoupstream: Plug mem leak of msg when processing a quit message.
dtucker@openbsd.org [Fri, 24 Nov 2023 00:31:30 +0000 (00:31 +0000)] 
upstream: Plug mem leak of msg when processing a quit message.

Coverity CID#427852, ok djm@

OpenBSD-Commit-ID: bf85362addbe2134c3d8c4b80f16601fbff823b7

20 months agoupstream: Include existing mux path in debug message.
dtucker@openbsd.org [Thu, 23 Nov 2023 03:37:05 +0000 (03:37 +0000)] 
upstream: Include existing mux path in debug message.

OpenBSD-Commit-ID: 1c3641be10c2f4fbad2a1b088a441d072e18bf16

20 months agoAdd an Ubuntu 22.04 test VM.
Darren Tucker [Thu, 23 Nov 2023 08:41:27 +0000 (19:41 +1100)] 
Add an Ubuntu 22.04 test VM.

This is the same version as Github's runners so most of the testing on
it is over there, but having a local VM makes debugging much easier.

20 months agoAdd gcc-12 -Werror test on Ubuntu 22.04.
Darren Tucker [Thu, 23 Nov 2023 08:36:22 +0000 (19:36 +1100)] 
Add gcc-12 -Werror test on Ubuntu 22.04.

Explictly specify gcc-11 on Ubuntu 22.04 (it's the system compiler).

20 months agoCheck return value from write to prevent warning.
Darren Tucker [Thu, 23 Nov 2023 08:34:57 +0000 (19:34 +1100)] 
Check return value from write to prevent warning.

... and since we're testing for flags with -Werror, this caused
configure to mis-detect compiler flags.

20 months agoRun compiler test program when compiling natively.
Darren Tucker [Wed, 22 Nov 2023 10:18:55 +0000 (21:18 +1100)] 
Run compiler test program when compiling natively.

ok djm@

20 months agoFactor out compiler test program into a macro.
Darren Tucker [Wed, 22 Nov 2023 10:18:07 +0000 (21:18 +1100)] 
Factor out compiler test program into a macro.

ok djm@

21 months agoAdd fbsd14 VM to test pool.
Darren Tucker [Tue, 21 Nov 2023 21:55:36 +0000 (08:55 +1100)] 
Add fbsd14 VM to test pool.

21 months agoExpand -fzero-call-used-regs test to cover gcc 11.
Darren Tucker [Tue, 21 Nov 2023 05:19:29 +0000 (16:19 +1100)] 
Expand -fzero-call-used-regs test to cover gcc 11.

It turns out that gcc also has some problems with -fzero-call-used-regs,
at least v11 on mips.  Previously the test in OSSH_CHECK_CFLAG_COMPILE
was sufficient to catch it with "=all", but not sufficient for "=used".
Expand the testcase and include it in the other tests for good measure.
See bz#3629.  ok djm@.

21 months agoStop using -fzero-call-used-regs=all
Darren Tucker [Tue, 21 Nov 2023 03:04:34 +0000 (14:04 +1100)] 
Stop using -fzero-call-used-regs=all

... since it seems to be problematic with several different versions of
clang.  Only use -fzero-call-used-regs=used which is less
problematic, except with Apple's clang where we don't use it at all.
bz#3629, ok djm@

21 months agoAllow for vendor prefix on clang version numbers.
Darren Tucker [Tue, 21 Nov 2023 03:02:18 +0000 (14:02 +1100)] 
Allow for vendor prefix on clang version numbers.

Correctly detects the version of OpenBSD's native clang, as well as
Apple's.  Spotted tb@, ok djm@.

21 months agoupstream: set errno=EAFNOSUPPORT when filtering addresses that don't
djm@openbsd.org [Mon, 20 Nov 2023 02:50:00 +0000 (02:50 +0000)] 
upstream: set errno=EAFNOSUPPORT when filtering addresses that don't

match AddressFamily; yields slightly better error message if no address
matches. bz#3526

OpenBSD-Commit-ID: 29cea900ddd8b04a4d1968da5c4a893be2ebd9e6

21 months agoupstream: when connecting via socket (the default case), filter
djm@openbsd.org [Wed, 15 Nov 2023 23:03:38 +0000 (23:03 +0000)] 
upstream: when connecting via socket (the default case), filter

addresses by AddressFamily if one was specified. Fixes the case where, if
CanonicalizeHostname is enabled, ssh may ignore AddressFamily. bz5326; ok
dtucker

OpenBSD-Commit-ID: 6c7d7751f6cd055126b2b268a7b64dcafa447439

21 months agoupstream: when deciding whether to enable keystroke timing
djm@openbsd.org [Wed, 15 Nov 2023 22:51:49 +0000 (22:51 +0000)] 
upstream: when deciding whether to enable keystroke timing

obfuscation, only consider enabling it when a channel with a tty is open.

Avoids turning on the obfucation when X11 forwarding only is in use,
which slows it right down. Reported by Roger Marsh

OpenBSD-Commit-ID: c292f738db410f729190f92de100c39ec931a4f1

21 months agoupstream: Make sure sftp_get_limits() only returns 0 if 'limits'
tobhe@openbsd.org [Mon, 13 Nov 2023 09:18:19 +0000 (09:18 +0000)] 
upstream: Make sure sftp_get_limits() only returns 0 if 'limits'

was initialized. This fixes a potential uninitialized use of 'limits' in
sftp_init() if sftp_get_limits() returned early because of an unexpected
message type.

ok djm@

OpenBSD-Commit-ID: 1c177d7c3becc1d71bc8763eecf61873a1d3884c

21 months agoTest current releases of LibreSSL and OpenSSL.
Darren Tucker [Mon, 13 Nov 2023 09:03:31 +0000 (20:03 +1100)] 
Test current releases of LibreSSL and OpenSSL.

Retire some of the older releases.

21 months agoupstream: Specify ssh binary to use
dtucker@openbsd.org [Wed, 1 Nov 2023 02:08:38 +0000 (02:08 +0000)] 
upstream: Specify ssh binary to use

... instead of relying on installed one.  Fixes test failures in -portable
when running tests prior to installation.

OpenBSD-Regress-ID: b6d6ba71c23209c616efc805a60d9a445d53a685

21 months agoPut long-running test targets on hipri runners.
Darren Tucker [Wed, 1 Nov 2023 02:11:31 +0000 (13:11 +1100)] 
Put long-running test targets on hipri runners.

Some of the selfhosted test targets take a long time to run for various
reasons, so label them for "libvirt-hipri" runners so that they can
start immediately.  This should reduce the time to complete all tests.

21 months agoupstream: add some tests of forced commands overriding Subsystem
djm@openbsd.org [Wed, 1 Nov 2023 00:29:46 +0000 (00:29 +0000)] 
upstream: add some tests of forced commands overriding Subsystem

directives

OpenBSD-Regress-ID: eb48610282f6371672bdf2a8b5d2aa33cfbd322b

21 months agoupstream: Don't try to use sudo inside sshd log wrapper.
dtucker@openbsd.org [Tue, 31 Oct 2023 04:15:40 +0000 (04:15 +0000)] 
upstream: Don't try to use sudo inside sshd log wrapper.

We still need to check if we're using sudo since we don't want to chown
unecessarily, as on some platforms this causes an error which pollutes
stderr. We also don't want to unnecessarily invoke sudo, since it's
running in the context of the proxycommand, on *other* platforms it
may not be able to authenticate, and if we're using SUDO then it should
already be privileged.

OpenBSD-Regress-ID: 70d58df7503db699de579a9479300e5f3735f4ee

21 months agoupstream: Only try to chmod logfile if we have sudo. If we don't have
dtucker@openbsd.org [Tue, 31 Oct 2023 02:58:45 +0000 (02:58 +0000)] 
upstream: Only try to chmod logfile if we have sudo. If we don't have

sudo then we won't need to chmod.

OpenBSD-Regress-ID: dbad2f5ece839658ef8af3376cb1fb1cabe2e324

21 months agoupstream: move PKCS#11 setup code to test-exec.sh so it can be reused
djm@openbsd.org [Mon, 30 Oct 2023 23:00:25 +0000 (23:00 +0000)] 
upstream: move PKCS#11 setup code to test-exec.sh so it can be reused

elsewhere

OpenBSD-Regress-ID: 1d29e6be40f994419795d9e660a8d07f538f0acb

21 months agoupstream: tidy and refactor PKCS#11 setup code
djm@openbsd.org [Mon, 30 Oct 2023 17:32:00 +0000 (17:32 +0000)] 
upstream: tidy and refactor PKCS#11 setup code

Replace the use of a perl script to delete the controlling TTY with a
SSH_ASKPASS script to directly load the PIN.

Move PKCS#11 setup code to functions in anticipation of it being used
elsewhere in additional tests.

Reduce stdout spam

OpenBSD-Regress-ID: 07705c31de30bab9601a95daf1ee6bef821dd262

21 months agoAdd obsd74 test VM and retire obsd69 and obsd70.
Darren Tucker [Mon, 30 Oct 2023 10:35:03 +0000 (21:35 +1100)] 
Add obsd74 test VM and retire obsd69 and obsd70.

21 months agoAdd OpenSSL 3.3.0 as a known dev version.
Darren Tucker [Mon, 30 Oct 2023 07:34:12 +0000 (18:34 +1100)] 
Add OpenSSL 3.3.0 as a known dev version.

21 months agoRestore nopasswd sudo rule on Mac OS X.
Darren Tucker [Mon, 30 Oct 2023 02:32:03 +0000 (13:32 +1100)] 
Restore nopasswd sudo rule on Mac OS X.

This seems to be missing from some (but not all) github runners, so
restore it if it seems to be missing.

21 months agoDon't exit early when setting up on Mac OS X.
Darren Tucker [Mon, 30 Oct 2023 02:26:52 +0000 (13:26 +1100)] 
Don't exit early when setting up on Mac OS X.

We probably need some of the other bits in there (specifically, setting
the perms on the home directory) so make it less of a special snowflake.

21 months agoupstream: Only try to chown logfiles that exist to prevent spurious
dtucker@openbsd.org [Sun, 29 Oct 2023 06:22:07 +0000 (06:22 +0000)] 
upstream: Only try to chown logfiles that exist to prevent spurious

errors.

OpenBSD-Regress-ID: f1b20a476734e885078c481f1324c9ea03af991e

21 months agoupstream: make use of bsd.regress.mk in extra and interop targets; ok
anton@openbsd.org [Thu, 26 Oct 2023 18:52:45 +0000 (18:52 +0000)] 
upstream: make use of bsd.regress.mk in extra and interop targets; ok

dtucker@

OpenBSD-Regress-ID: 7ea21b5f6fc4506165093b2123d88d20ff13a4f0

21 months agoupstream: Skip conch interop tests when not enabled instead of fatal.
dtucker@openbsd.org [Thu, 26 Oct 2023 12:44:07 +0000 (12:44 +0000)] 
upstream: Skip conch interop tests when not enabled instead of fatal.

OpenBSD-Regress-ID: b0abf81c24ac6c21f367233663228ba16fa96a46

21 months agoupstream: Import regenerated moduli.
dtucker@openbsd.org [Wed, 25 Oct 2023 05:38:08 +0000 (05:38 +0000)] 
upstream: Import regenerated moduli.

OpenBSD-Commit-ID: 95f5dd6107e8902b87dc5b005ef2b53f1ff378b8

21 months agoupstream: ssh conch interop tests requires a controlling terminal;
anton@openbsd.org [Wed, 25 Oct 2023 08:01:59 +0000 (08:01 +0000)] 
upstream: ssh conch interop tests requires a controlling terminal;

ok dtucker@

OpenBSD-Regress-ID: cbf2701bc347c2f19d907f113779c666f1ecae4a

21 months agoupstream: Use private key that is allowed by sshd defaults in conch
anton@openbsd.org [Mon, 23 Oct 2023 11:30:49 +0000 (11:30 +0000)] 
upstream: Use private key that is allowed by sshd defaults in conch

interop tests.

ok dtucker@

OpenBSD-Regress-ID: 3b7f65c8f409c328bcd4b704f60cb3d31746f045

22 months agoInstall Dropbear for interop testing.
Darren Tucker [Fri, 20 Oct 2023 09:43:00 +0000 (20:43 +1100)] 
Install Dropbear for interop testing.

22 months agoResync PuTTY and Conch path handling with upstream.
Darren Tucker [Fri, 20 Oct 2023 09:39:03 +0000 (20:39 +1100)] 
Resync PuTTY and Conch path handling with upstream.

Now that configure finds these for us we can remove these -portable
specific changes.

22 months agoHave configure find PuTTY and Conch binaries.
Darren Tucker [Fri, 20 Oct 2023 09:35:46 +0000 (20:35 +1100)] 
Have configure find PuTTY and Conch binaries.

This will let us remove some -portable specific changes from
test-exec.sh.

22 months agoupstream: Allow overriding the locations of the Dropbear binaries
dtucker@openbsd.org [Fri, 20 Oct 2023 07:37:07 +0000 (07:37 +0000)] 
upstream: Allow overriding the locations of the Dropbear binaries

similar to what we do for the PuTTY ones.

OpenBSD-Regress-ID: 7de0e00518fb0c8fdc5f243b7f82f523c936049c

22 months agoupstream: Add interop test with Dropbear.
dtucker@openbsd.org [Fri, 20 Oct 2023 06:56:45 +0000 (06:56 +0000)] 
upstream: Add interop test with Dropbear.

Right now this is only dbclient not the Dropbear server since it won't
currently run as a ProxyCommand.

OpenBSD-Regress-ID: 8cb898c414fcdb252ca6328896b0687acdaee496

22 months agoUpdate openssl-devel dependency in RPM spec.
Fabio Pedretti [Mon, 16 Oct 2023 09:59:53 +0000 (11:59 +0200)] 
Update openssl-devel dependency in RPM spec.

Since openssh 9.4p1, openssl >= 1.1.1 is required, so
build with --without-openssl elsewhere.
According to https://repology.org/project/openssl/versions
openssl 1.1.1 is available on fedora >= 29 and rhel >= 8.
Successfully build tested, installed and run on rhel 6

22 months agoRemove reference of dropped sshd.pam.old file
Fabio Pedretti [Mon, 16 Oct 2023 08:13:06 +0000 (10:13 +0200)] 
Remove reference of dropped sshd.pam.old file

The file was removed in openssh 8.8

22 months agoupstream: Move declaration of "len" into the block where it's used.
dtucker@openbsd.org [Mon, 16 Oct 2023 08:40:00 +0000 (08:40 +0000)] 
upstream: Move declaration of "len" into the block where it's used.

This lets us compile Portable with -Werror with when OpenSSL doesn't have
Ed25519 support.

OpenBSD-Commit-ID: e02e4b4af351946562a7caee905da60eff16ba29

22 months agorun t-extra regress tests
Damien Miller [Fri, 13 Oct 2023 04:15:05 +0000 (15:15 +1100)] 
run t-extra regress tests

This exposes the t-extra regress tests (including agent-pkcs11.sh) as
a new extra-tests target in the top level Makefile and runs them by
default. ok dtucker@

22 months agoDon't use make -j2.
Darren Tucker [Thu, 12 Oct 2023 11:01:23 +0000 (22:01 +1100)] 
Don't use make -j2.

While we have 2 cores available on github runners, not using it means
that the most recent log message is the actual failure, rather than
having to search back through the log for it.

22 months agoCorrect arg order for ED255519 AC_LINK_IFELSE test.
Darren Tucker [Thu, 12 Oct 2023 05:23:05 +0000 (16:23 +1100)] 
Correct arg order for ED255519 AC_LINK_IFELSE test.

22 months agoupstream: typos and extra debug trace calls
djm@openbsd.org [Thu, 12 Oct 2023 03:51:08 +0000 (03:51 +0000)] 
upstream: typos and extra debug trace calls

OpenBSD-Regress-ID: 98a2a6b9333743274359e3c0f0e65cf919a591d1

22 months agoupstream: ensure logs are owned by correct user; feedback/ok
djm@openbsd.org [Thu, 12 Oct 2023 03:48:53 +0000 (03:48 +0000)] 
upstream: ensure logs are owned by correct user; feedback/ok

dtucker@

OpenBSD-Regress-ID: c3297af8f07717f1d400a5d34529962f1a76b5a3

22 months agoupstream: 64 %-expansion keys ought to be enough for anybody; ok
djm@openbsd.org [Thu, 12 Oct 2023 03:36:32 +0000 (03:36 +0000)] 
upstream: 64 %-expansion keys ought to be enough for anybody; ok

dtucker (we just hit the previous limit in some cases)

OpenBSD-Commit-ID: 84070f8001ec22ff5d669f836b62f206e08c5787

22 months agoupstream: don't dereference NULL pointer when hashing jumphost
djm@openbsd.org [Thu, 12 Oct 2023 02:48:43 +0000 (02:48 +0000)] 
upstream: don't dereference NULL pointer when hashing jumphost

OpenBSD-Commit-ID: 251c0263e1759a921341c7efe7f1d4c73e1c70f4