djm@openbsd.org
697359be9c
upstream: allow WAYLAND_DISPLAY to enable SSH_ASKPASS
...
From dkg via GHPR479; ok dtucker@
OpenBSD-Commit-ID: 1ac1f9c45da44eabbae89375393c662349239257
2024-03-30 15:35:03 +11:00
dtucker@openbsd.org
7844705b03
upstream: Use egrep instead of grep -E.
...
Some plaforms don't have the latter so this makes things easier
in -portable.
OpenBSD-Regress-ID: ff82260eb0db1f11130200b25d820cf73753bbe3
2024-03-29 22:01:20 +11:00
dtucker@openbsd.org
22b2b6c555
upstream: test -h is the POSIXly way of testing for a symlink. Reduces
...
diff vs Portable.
OpenBSD-Regress-ID: 6f31cd6e231e3b8c5c2ca0307573ccb7484bff7d
2024-03-29 21:43:24 +11:00
Darren Tucker
edcff77f82
Fix name of OpenBSD upstream CI jobs.
2024-03-26 18:58:58 +11:00
Darren Tucker
861b084429
Resync with upstream: ${} around DATAFILE.
2024-03-26 18:55:33 +11:00
djm@openbsd.org
63f248c769
upstream: optional debugging
...
OpenBSD-Regress-ID: b4852bf97ac8fb2e3530f2d5f999edd66058d7bc
2024-03-26 18:54:38 +11:00
dtucker@openbsd.org
16e2ebe06a
upstream: Verify string returned from local shell command.
...
OpenBSD-Regress-ID: 5039bde24d33d809aebfa8d3ad7fe9053224e6f8
2024-03-26 18:54:38 +11:00
dtucker@openbsd.org
b326f7a1f3
upstream: Improve shell portability: grep -q is not portable so
...
redirect stdout, and use printf instead of relying on echo to do \n
substitution. Reduces diff vs Portable.
Also resync somewhat with upstream.
OpenBSD-Regress-ID: 9ae876a8ec4c4725f1e9820a0667360ee2398337
2024-03-26 18:54:14 +11:00
dtucker@openbsd.org
dbf2e319f0
upstream: Save error code from SSH for use inside case statement,
...
from portable. In some shells, "case" will reset the value of $?, so save it
first.
OpenBSD-Regress-ID: da32e5be19299cb4f0f7de7f29c11257a62d6949
2024-03-26 18:47:22 +11:00
dtucker@openbsd.org
d2c8c4fa7d
upstream: Increase timeout. Resyncs with portable where some of
...
the test VMs are slow enough for this to matter.
OpenBSD-Regress-ID: 6a83a693602eb0312f06a4ad2cd6f40d99d24b26
2024-03-26 18:46:58 +11:00
dtucker@openbsd.org
83621b6351
upstream: In PuTTY interop test, don't assume the PuTTY major
...
version is 0. Patch from cjwatson at debian.org via bz#3671.
OpenBSD-Regress-ID: 835ed03c1b04ad46be82e674495521f11b840191
2024-03-26 18:46:29 +11:00
Darren Tucker
8a421b9277
Really mkdir /usr/local/etc in CI tests.
2024-03-26 18:38:14 +11:00
Darren Tucker
2946ed522c
Better short name for OpenBSD upstream CI jobs too.
2024-03-26 17:19:09 +11:00
Darren Tucker
18dbe8eff6
Ensure /usr/local/etc exists before using in tests.
2024-03-26 17:13:52 +11:00
Darren Tucker
5fc1085128
Be more specific about when to rerun workflows.
2024-03-26 16:50:46 +11:00
Darren Tucker
5516923e8a
Add short names for test jobs on github CI.
2024-03-26 16:39:50 +11:00
Darren Tucker
dc37d2d247
If we're using xpg4's id, remember to pass args.
2024-03-26 16:26:14 +11:00
dtucker@openbsd.org
fe16948793
upstream: Import regenerated moduli.
...
OpenBSD-Commit-ID: ad3d1486d105b008c93e952d158e5af4d9d4c531
2024-03-26 13:03:00 +11:00
job@openbsd.org
151146f03b
upstream: Clarify how literal IPv6 addresses can be used in -J mode
...
OK djm@
OpenBSD-Commit-ID: 524ddae97746b3563ad4a887dfd0a6e6ba114c50
2024-03-26 13:02:27 +11:00
Darren Tucker
0d5bdc87a6
Add Mac OS X 14 test targets.
2024-03-25 16:14:21 +11:00
Darren Tucker
2d7964a03e
Move xpg4 'id' handling into test-exec.sh.
...
Handle replacement of 'id' the same way as we do other Portable specific
replacements in test-exec.sh. This brings percent.sh back into sync
with upstream.
2024-03-25 14:05:40 +11:00
Darren Tucker
75d1d49ed1
Update branches shown on ci-status to 9.7 and 9.6.
2024-03-25 10:38:03 +11:00
Darren Tucker
f9193f03db
Improve detection of -fzero-call-used-regs=used.
...
Should better detect problems with gcc 13 on m68k. bz#3673 from Colin
Watson via bz#3673 and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934
Signed-off-by: Darren Tucker <dtucker@dtucker.net>
2024-03-25 10:12:58 +11:00
Tess Gauthier
607df771b2
Delete contrib/win32/openssh/DockerFile ( #722 )
2024-03-18 13:58:04 -04:00
Tess Gauthier
0d44bc9b49
fix merge conflict
2024-03-11 11:46:39 -04:00
Damien Miller
86bdd3853f
version number in README
2024-03-11 16:20:49 +11:00
Damien Miller
282721418e
crank RPM spec versions
2024-03-11 16:20:08 +11:00
djm@openbsd.org
3876a3bbd2
upstream: openssh-9.7
...
OpenBSD-Commit-ID: 618ececf58b8cdae016b149787af06240f7b0cbc
2024-03-11 16:19:44 +11:00
Darren Tucker
8fc109cc61
Test against current OpenSSL and LibreSSL releases.
...
Add LibreSSL 3.9.0, bump older branches to their respective current
releases.
2024-03-11 12:59:26 +11:00
Damien Miller
26b09b45fe
quote regexes used to test for algorithm support
...
Fixes test failures on Solaris 8 reported by Tom G. Christensen
2024-03-10 16:24:57 +11:00
djm@openbsd.org
a6a740a494
upstream: avoid logging in signal handler by converting mainloop to
...
ppoll() bz3670, reported by Ben Hamilton; ok dtucker@
OpenBSD-Commit-ID: e58f18042b86425405ca09e6e9d7dfa1df9f5f7f
2024-03-09 16:13:57 +11:00
djm@openbsd.org
cd82f7526e
upstream: skip more whitespace, fixes find-principals on
...
allowed_signers files with blank lines; reported by Wiktor Kwapisiewicz
OpenBSD-Commit-ID: b3a22a2afd753d70766f34bc7f309c03706b5298
2024-03-09 09:17:22 +11:00
dtucker@openbsd.org
2f9d2af5cb
upstream: Invoke ProxyCommand that uses stderr redirection via
...
$TEST_SHELL. Fixes test when run by a user whose login shell is tcsh.
Found by vinschen at redhat.com.
OpenBSD-Regress-ID: f68d79e7f00caa8d216ebe00ee5f0adbb944062a
2024-03-08 23:12:10 +11:00
Darren Tucker
9b3f0beb40
Prefer openssl binary from --with-ssl-dir directory.
...
Use openssl in the directory specified by --with-ssl-dir as long
as it's functional. Reported by The Doctor.
2024-03-07 19:25:17 +11:00
djm@openbsd.org
c47e1c9c79
upstream: fix memory leak in mux proxy mode when requesting forwarding.
...
found by RASU JSC, reported by Maks Mishin in GHPR#467
OpenBSD-Commit-ID: 97d96a166b1ad4b8d229864a553e3e56d3116860
2024-03-06 14:03:28 +11:00
djm@openbsd.org
242742827f
upstream: wrap a few PKCS#11-specific bits in ENABLE_PKCS11
...
OpenBSD-Commit-ID: 463e4a69eef3426a43a2b922c4e7b2011885d923
2024-03-06 11:33:18 +11:00
Damien Miller
d52b650921
disable RSA tests when algorithm is not supported
...
Unbreaks "make test" when compiled --without-openssl.
Similar treatment to how we do DSA and ECDSA.
2024-03-06 11:31:36 +11:00
Damien Miller
668d270a6c
add a --without-retpoline configure option
...
discussed with deraadt and dtucker a while ago
2024-03-06 10:33:20 +11:00
Tess Gauthier
ed376e945e
fix merge conflict
2024-03-04 12:13:33 -05:00
djm@openbsd.org
3deb501f86
upstream: fix leak of CanonicalizePermittedCNAMEs on error path;
...
spotted by Coverity (CID 438039)
OpenBSD-Commit-ID: 208839699939721f452a4418afc028a9f9d3d8af
2024-03-04 15:19:29 +11:00
djm@openbsd.org
65a44a8a4f
upstream: Separate parsing of string array options from applying them
...
to the active configuration. This fixes the config parser from erroneously
rejecting cases like:
AuthenticationMethods password
Match User ivy
AuthenticationMethods any
bz3657 ok markus@
OpenBSD-Commit-ID: 7f196cba634c2a3dba115f3fac3c4635a2199491
2024-03-04 14:46:46 +11:00
Darren Tucker
6886e1b1f5
Add nbsd10 test target.
2024-02-22 17:59:35 +11:00
Damien Miller
d86bf8a3f6
more descriptive configure test name
2024-02-22 12:06:10 +11:00
djm@openbsd.org
9ee335aacc
upstream: explain arguments of internal-sftp GHPR#454 from Niklas
...
Hambüchen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
OpenBSD-Commit-ID: 0335d641ae6b5b6201b9ffd5dd06345ebbd0a3f3
2024-02-21 17:18:02 +11:00
djm@openbsd.org
d1164cb100
upstream: clarify permissions requirements for ChrootDirectory Part
...
of GHPR#454 from Niklas Hambüchen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
OpenBSD-Commit-ID: d37bc8786317a11649c62ff5e2936441186ef7a0
2024-02-21 17:18:01 +11:00
djm@openbsd.org
d410e17d18
upstream: .Cm for a keyword. Part of GHPR#454 from Niklas Hambüchen
...
OpenBSD-Commit-ID: d59c52559f926fa82859035d79749fbb4a3ce18a
2024-02-21 17:18:01 +11:00
djm@openbsd.org
ab73f9678e
upstream: fix typo in match directive predicate (s/tagged/tag) GHPR#462
...
from Tobias Manske
OpenBSD-Commit-ID: 05b23b772677d48aa82eefd7ebebd369ae758908
2024-02-21 17:01:37 +11:00
djm@openbsd.org
9844aa2521
upstream: fix proxy multiplexing mode, broken when keystroke timing
...
obfuscation was added. GHPR#463 from montag451
OpenBSD-Commit-ID: 4e412d59b3f557d431f1d81c715a3bc0491cc677
2024-02-21 16:58:02 +11:00
Tess Gauthier
c02b47e35d
Merge remote-tracking branch 'upstream-openssh-portable/master' into sync-with-upstream-2
2024-02-20 11:50:49 -05:00
djm@openbsd.org
ee6d932acb
upstream: don't append a gratuitous space to the end of subsystem
...
arguments; bz3667
OpenBSD-Commit-ID: e11023aeb3f30b77a674e37b8292c862926d5dc6
2024-02-20 15:10:55 +11:00
