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
Damien Miller
698fe6fd61
update fuzzer example makefile to clang16
2024-01-08 14:46:19 +11:00
Damien Miller
fc332cb2d6
unbreak fuzzers - missing pkcs11_make_cert()
...
provide stub for use in fuzzer harness
2024-01-08 14:45:49 +11:00
Damien Miller
9ea0a4524a
unbreak fuzzers for clang16
...
getopt() needs a throw() attribute to compile, so supply one when compiling
things with C++
2024-01-08 14:45:14 +11:00
djm@openbsd.org
a72833d007
upstream: remove ext-info-* in the kex.c code, not in callers;
...
with/ok markus@
OpenBSD-Commit-ID: c06fe2d3a0605c517ff7d65e38ec7b2d1b0b2799
2024-01-08 13:26:43 +11:00
djm@openbsd.org
86f9e96d9b
upstream: fix typo; spotted by Albert Chin
...
OpenBSD-Commit-ID: 77140b520a43375b886e535eb8bd842a268f9368
2024-01-08 13:26:42 +11:00
dtucker@openbsd.org
f0cbd26ec9
upstream: Import regenerated moduli.
...
OpenBSD-Commit-ID: 5a636f6ca7f25bfe775df4952f7aac90a7fcbbee
2024-01-08 13:26:29 +11:00
jsg@openbsd.org
64ddf77653
upstream: spelling; ok markus@
...
OpenBSD-Commit-ID: 9d01f2e9d59a999d5d42fc3b3efcf8dfb892e31b
2024-01-08 13:25:21 +11:00
jmc@openbsd.org
503fbe9ea2
upstream: sort -C, and add to usage(); ok djm
...
OpenBSD-Commit-ID: 80141b2a5d60c8593e3c65ca3c53c431262c812f
2024-01-08 13:25:20 +11:00
djm@openbsd.org
5413b1c7ff
upstream: correct section numbers; from Ed Maste
...
OpenBSD-Commit-ID: e289576ee5651528404cb2fb68945556052cf83f
2024-01-08 13:25:20 +11:00
djm@openbsd.org
430ef86464
upstream: match flag type (s/int/u_int)
...
OpenBSD-Commit-ID: 9422289747c35ccb7b31d0e1888ccd5e74ad566a
2024-01-08 13:25:19 +11:00
Damien Miller
1036d77b34
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
2023-12-22 17:56:26 +11:00
Tess Gauthier
e98172c2eb
update ssh-add where imaginary i GNU syntax is used
2023-12-19 20:46:01 -05:00
Tess Gauthier
aeb3bbe81d
resolve merge conflict
2023-12-19 20:33:17 -05:00
Tess Gauthier
59aba65cf2
add double-quotes around service paths for SSHD and SSH-Agent ( #710 )
2023-12-18 12:04:57 -05:00
Tess Gauthier
e7010dc405
cherry-pick of kex-strict extension from upstream ( #709 )
2023-12-18 12:04:18 -05:00
Damien Miller
8241b9c052
crank versions
2023-12-19 01:59:50 +11:00
Damien Miller
2f2c65cb5f
depend
2023-12-19 01:59:06 +11:00
