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
dtucker@openbsd.org
e27f032aa8
upstream: Always define puttysetup function.
...
OpenBSD-Regress-ID: b4c0ccfa4006a1bc5dfd99ccf21c854d3ce2aee0
2024-02-19 20:35:31 +11:00
dtucker@openbsd.org
84046f9991
upstream: Exapnd PuTTY test coverage.
...
Expand the set of ciphers, MACs and KEX methods in the PuTTY interop
tests.
OpenBSD-Regress-ID: dd28d97d48efe7329a396d0d505ee2907bf7fc57
2024-02-19 18:49:00 +11:00
dtucker@openbsd.org
bbf541ee2a
upstream: Factor out PuTTY setup.
...
Factor out PuTTY and call only when needed.
This allows us to avoid PuTTY key setup when it's not needed, which
speeds up the overall test run by a couple of percent.
OpenBSD-Regress-ID: c25eaccc3c91bc874400f7c85ce40e9032358c1c
2024-02-19 18:48:26 +11:00
naddy@openbsd.org
d31c21c57f
upstream: clean sshd random relinking kit; ok miod@
...
OpenBSD-Commit-ID: 509bb19bb9762a4b3b589af98bac2e730541b6d4
2024-02-19 18:41:19 +11:00
djm@openbsd.org
4dbc5a363f
upstream: whitespace
...
OpenBSD-Commit-ID: b24680bc755b621ea801ff8edf6f0f02b68edae1
2024-02-19 18:40:09 +11:00
Darren Tucker
efde85dda2
Improve error message for OpenSSL header check.
...
bz#3668, ok djm@
2024-02-19 17:29:31 +11:00
Tess Gauthier
915c6e367c
Merge remote-tracking branch 'upstream-openssh-portable/master' into sync-with-upstream-2
2024-02-12 18:28:02 -05:00
Marc-André Moreau
5622b51825
fix freezero duplicate symbol ( #718 )
...
Co-authored-by: Marc-André Moreau <mamoreau@devolutions.net>
2024-02-12 18:26:32 -05:00
Marc-André Moreau
727d4dbac0
fix resource.h file encoding ( #716 )
...
Co-authored-by: Marc-André Moreau <mamoreau@devolutions.net>
2024-02-12 18:18:08 -05:00
Darren Tucker
cbbdf868bc
Interop test against PuTTY snapshot and releases.
2024-02-07 23:10:34 +11:00
Darren Tucker
91898bf786
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.
2024-02-06 16:37:07 +11:00
Darren Tucker
be5ed8ebed
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.
2024-02-06 11:22:20 +11:00
Darren Tucker
0f6a8a0d0a
Use "skip" function instead doing it ourselves.
2024-02-06 11:18:44 +11:00
tgauth@bu.edu
e4dbee4f11
Merge remote-tracking branch 'upstream-openssh-portable/master' into sync-with-upstream-2
2024-02-05 12:12:38 -05:00
Damien Miller
3ad669f81a
ignore some vim droppings
2024-02-01 14:01:18 +11:00
djm@openbsd.org
c283f29d23
upstream: whitespace
...
OpenBSD-Commit-ID: bf9e4a1049562ee4322684fbdce07142f04fdbb7
2024-02-01 13:42:45 +11:00
tgauth@bu.edu
9015aa2eca
add WITH_DSA flag to compilation options
2024-01-22 14:16:56 -05:00
tgauth@bu.edu
afd613528f
skip bash tests that use multiplexing on Windows with explicit if
2024-01-22 13:07:57 -05:00
tgauth@bu.edu
0c166db115
Merge remote-tracking branch 'upstream-pwsh-openssh-portable/latestw_all' into sync-with-upstream-2
2024-01-22 13:07:05 -05:00
Tess Gauthier
6ad8fc3b05
Merge pull request #712 from tgauth/sync-with-upstream
...
Sync with upstream 9.6
2024-01-22 12:40:26 -05:00
tgauth@bu.edu
83b59226a4
Merge remote-tracking branch 'upstrem-bsd/master' into sync-with-upstream-2
2024-01-22 11:09:08 -05:00
Damien Miller
0d96b1506b
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.
2024-01-16 14:40:18 +11:00
djm@openbsd.org
50080fa42f
upstream: don't disable RSA test when DSA is disabled; bug introduced
...
in last commit
OpenBSD-Regress-ID: 8780a7250bf742b33010e9336359a1c516f2d7b5
2024-01-11 15:56:37 +11:00
djm@openbsd.org
415c94ce17
upstream: make DSA testing optional, defaulting to on
...
ok markus
OpenBSD-Regress-ID: dfc27b5574e3f19dc4043395594cea5f90b8572a
2024-01-11 15:55:19 +11:00
djm@openbsd.org
f9311e8921
upstream: ensure key_fd is filled when DSA is disabled; spotted by
...
tb@
OpenBSD-Commit-ID: 9dd417b6eec3cf67e870f147464a8d93f076dce7
2024-01-11 15:46:22 +11:00
djm@openbsd.org
4e838120a7
upstream: make DSA key support compile-time optional, defaulting to
...
on
ok markus@
OpenBSD-Commit-ID: 4f8e98fc1fd6de399d0921d5b31b3127a03f581d
2024-01-11 15:46:22 +11:00
jmc@openbsd.org
afcc9028bf
upstream: fix incorrect capitalisation;
...
OpenBSD-Commit-ID: cb07eb06e15fa2334660ac73e98f29b6a1931984
2024-01-11 14:20:29 +11:00
djm@openbsd.org
9707c8170c
upstream: extend ChannelTimeout regression test to exercise multiplexed
...
connections and the new "global" timeout type. ok dtucker@
OpenBSD-Regress-ID: f10d19f697024e9941acad7c2057f73d6eacb8a2
2024-01-10 09:25:04 +11:00
djm@openbsd.org
b31b12d28d
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
2024-01-10 09:24:53 +11:00
djm@openbsd.org
602f4beeed
upstream: adapt ssh_api.c code for kex-strict
...
from markus@ ok me
OpenBSD-Commit-ID: 4d9f256852af2a5b882b12cae9447f8f00f933ac
2024-01-10 09:24:06 +11:00
tgauth@bu.edu
9142077e39
fix merge conflicts
2024-01-08 16:05:29 -05:00
tgauth@bu.edu
b39454951f
fix failing bash test
2024-01-08 16:00:54 -05:00
Damien Miller
42ba34aba8
nite that recent OSX tun/tap is unsupported
2024-01-08 16:26:37 +11:00
Sevan Janiyan
690bc125f9
README.platform: update tuntap url
2024-01-08 16:24:43 +11:00
Rose
6b8be2ccd7
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.
2024-01-08 16:23:19 +11:00
djm@openbsd.org
219c813415
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
2024-01-08 16:12:17 +11:00
djm@openbsd.org
4c3cf36263
upstream: fix missing field in users-groups-by-id@openssh.com reply
...
documentation
GHPR441 from TJ Saunders
OpenBSD-Commit-ID: ff5733ff6ef4cd24e0758ebeed557aa91184c674
2024-01-08 16:06:29 +11:00
djm@openbsd.org
f64cede2a3
upstream: make kex-strict section more explicit about its intent:
...
banning all messages not strictly required in KEX
OpenBSD-Commit-ID: fc33a2d7f3b7013a7fb7500bdbaa8254ebc88116
2024-01-08 16:06:28 +11:00
