Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release candidate for 18.4.0 into master #75

Merged
merged 69 commits into from
Apr 10, 2024
Merged
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
1036d77
better detection of broken -fzero-call-used-regs
djmdjm Dec 22, 2023
430ef86
upstream: match flag type (s/int/u_int)
djmdjm Dec 18, 2023
5413b1c
upstream: correct section numbers; from Ed Maste
djmdjm Dec 19, 2023
503fbe9
upstream: sort -C, and add to usage(); ok djm
Dec 19, 2023
64ddf77
upstream: spelling; ok markus@
jonathangray Dec 20, 2023
f0cbd26
upstream: Import regenerated moduli.
daztucker Jan 4, 2024
86f9e96
upstream: fix typo; spotted by Albert Chin
djmdjm Jan 8, 2024
a72833d
upstream: remove ext-info-* in the kex.c code, not in callers;
djmdjm Jan 8, 2024
9ea0a45
unbreak fuzzers for clang16
djmdjm Jan 8, 2024
fc332cb
unbreak fuzzers - missing pkcs11_make_cert()
djmdjm Jan 8, 2024
698fe6f
update fuzzer example makefile to clang16
djmdjm Jan 8, 2024
f64cede
upstream: make kex-strict section more explicit about its intent:
djmdjm Jan 8, 2024
4c3cf36
upstream: fix missing field in users-groups-by-id@openssh.com reply
djmdjm Jan 8, 2024
219c813
upstream: Remove outdated note from PROTOCOL.mux
djmdjm Jan 8, 2024
6b8be2c
Fix compilation error in ssh-pcks11-client.c
AZero13 Dec 19, 2023
690bc12
README.platform: update tuntap url
sevan Dec 27, 2023
42ba34a
nite that recent OSX tun/tap is unsupported
djmdjm Jan 8, 2024
602f4be
upstream: adapt ssh_api.c code for kex-strict
djmdjm Jan 9, 2024
b31b12d
upstream: add a "global" ChannelTimeout type to ssh(1) and sshd(8)
djmdjm Jan 9, 2024
9707c81
upstream: extend ChannelTimeout regression test to exercise multiplexed
djmdjm Jan 9, 2024
afcc902
upstream: fix incorrect capitalisation;
Jan 10, 2024
4e83812
upstream: make DSA key support compile-time optional, defaulting to
djmdjm Jan 11, 2024
f9311e8
upstream: ensure key_fd is filled when DSA is disabled; spotted by
djmdjm Jan 11, 2024
415c94c
upstream: make DSA testing optional, defaulting to on
djmdjm Jan 11, 2024
50080fa
upstream: don't disable RSA test when DSA is disabled; bug introduced
djmdjm Jan 11, 2024
0d96b15
skip tests that use multiplexing on Windows
djmdjm Jan 16, 2024
c283f29
upstream: whitespace
djmdjm Feb 1, 2024
3ad669f
ignore some vim droppings
djmdjm Feb 1, 2024
0f6a8a0
Use "skip" function instead doing it ourselves.
daztucker Feb 6, 2024
be5ed8e
Add --disable-fd-passing option.
daztucker Feb 6, 2024
91898bf
Put privsep dir on OS X on /usr/local.
daztucker Feb 6, 2024
cbbdf86
Interop test against PuTTY snapshot and releases.
daztucker Feb 7, 2024
efde85d
Improve error message for OpenSSL header check.
daztucker Feb 19, 2024
4dbc5a3
upstream: whitespace
djmdjm Feb 2, 2024
d31c21c
upstream: clean sshd random relinking kit; ok miod@
Feb 10, 2024
bbf541e
upstream: Factor out PuTTY setup.
daztucker Feb 9, 2024
84046f9
upstream: Exapnd PuTTY test coverage.
daztucker Feb 9, 2024
e27f032
upstream: Always define puttysetup function.
daztucker Feb 19, 2024
ee6d932
upstream: don't append a gratuitous space to the end of subsystem
djmdjm Feb 20, 2024
9844aa2
upstream: fix proxy multiplexing mode, broken when keystroke timing
djmdjm Feb 21, 2024
ab73f96
upstream: fix typo in match directive predicate (s/tagged/tag) GHPR#462
djmdjm Feb 21, 2024
d410e17
upstream: .Cm for a keyword. Part of GHPR#454 from Niklas Hambüchen
djmdjm Feb 21, 2024
d1164cb
upstream: clarify permissions requirements for ChrootDirectory Part
djmdjm Feb 21, 2024
9ee335a
upstream: explain arguments of internal-sftp GHPR#454 from Niklas
djmdjm Feb 21, 2024
d86bf8a
more descriptive configure test name
djmdjm Feb 22, 2024
6886e1b
Add nbsd10 test target.
daztucker Feb 22, 2024
65a44a8
upstream: Separate parsing of string array options from applying them
djmdjm Mar 4, 2024
3deb501
upstream: fix leak of CanonicalizePermittedCNAMEs on error path;
djmdjm Mar 4, 2024
668d270
add a --without-retpoline configure option
djmdjm Mar 5, 2024
d52b650
disable RSA tests when algorithm is not supported
djmdjm Mar 6, 2024
2427428
upstream: wrap a few PKCS#11-specific bits in ENABLE_PKCS11
djmdjm Mar 6, 2024
c47e1c9
upstream: fix memory leak in mux proxy mode when requesting forwarding.
djmdjm Mar 6, 2024
9b3f0be
Prefer openssl binary from --with-ssl-dir directory.
daztucker Mar 7, 2024
2f9d2af
upstream: Invoke ProxyCommand that uses stderr redirection via
daztucker Mar 8, 2024
cd82f75
upstream: skip more whitespace, fixes find-principals on
djmdjm Mar 8, 2024
a6a740a
upstream: avoid logging in signal handler by converting mainloop to
djmdjm Mar 9, 2024
26b09b4
quote regexes used to test for algorithm support
djmdjm Mar 10, 2024
8fc109c
Test against current OpenSSL and LibreSSL releases.
daztucker Mar 11, 2024
3876a3b
upstream: openssh-9.7
djmdjm Mar 11, 2024
2827214
crank RPM spec versions
djmdjm Mar 11, 2024
86bdd38
version number in README
djmdjm Mar 11, 2024
065e63d
This is a staging commit for merging HPN-SSH to OpenSSH 9.7
rapier1 Mar 11, 2024
ebcdb90
Working merge of OpenSSH 9.7 into HPN-SSH. This is tentatively
rapier1 Mar 11, 2024
44937cd
Neglected to apply two fixes from another branches.
rapier1 Mar 12, 2024
90127cd
binn.[c|h] are no lnoger C89 compliant so we are removing the C89 tes…
rapier1 Mar 12, 2024
41ebf6e
I seem to have forgotten to actually remove the C89 test so this
rapier1 Mar 12, 2024
196110f
Documentation update for FallbackPort switch and to explicitly state …
rapier1 Mar 14, 2024
9d2f537
Merge branch 'dev_minor' of github.com:rapier1/hpn-ssh into dev_minor
rapier1 Mar 14, 2024
6112792
Merge pull request #69 from rapier1/dev_minor
dorrellmw Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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.
  • Loading branch information
djmdjm committed Jan 16, 2024
commit 0d96b1506b2f4757fefa5d1f884d49e96a6fd4c3
70 changes: 37 additions & 33 deletions regress/channel-timeout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,40 +74,44 @@ if [ $r -ne 23 ]; then
fail "ssh failed"
fi

verbose "multiplexed command timeout"
(cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout session:command=1") \
> $OBJ/sshd_proxy
open_mux
mux_client "sleep 5 ; exit 23"
r=$?
if [ $r -ne 255 ]; then
fail "ssh returned unexpected error code $r"
fi
close_mux

verbose "irrelevant multiplexed command timeout"
(cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout session:shell=1") \
> $OBJ/sshd_proxy
open_mux
mux_client "sleep 5 ; exit 23"
r=$?
if [ $r -ne 23 ]; then
fail "ssh returned unexpected error code $r"
if config_defined DISABLE_FD_PASSING ; then
verbose "skipping multiplexing tests"
else
verbose "multiplexed command timeout"
(cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout session:command=1") \
> $OBJ/sshd_proxy
open_mux
mux_client "sleep 5 ; exit 23"
r=$?
if [ $r -ne 255 ]; then
fail "ssh returned unexpected error code $r"
fi
close_mux

verbose "irrelevant multiplexed command timeout"
(cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout session:shell=1") \
> $OBJ/sshd_proxy
open_mux
mux_client "sleep 5 ; exit 23"
r=$?
if [ $r -ne 23 ]; then
fail "ssh returned unexpected error code $r"
fi
close_mux

verbose "global command timeout"
(cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout global=10") \
> $OBJ/sshd_proxy
open_mux
mux_client "sleep 1 ; echo ok ; sleep 1; echo ok; sleep 60; touch $OBJ/finished.1" >/dev/null &
mux_client "sleep 60 ; touch $OBJ/finished.2" >/dev/null &
mux_client "sleep 2 ; touch $OBJ/finished.3" >/dev/null &
wait
test -f $OBJ/finished.1 && fail "first mux process completed"
test -f $OBJ/finished.2 && fail "second mux process completed"
test -f $OBJ/finished.3 || fail "third mux process did not complete"
close_mux
fi
close_mux

verbose "global command timeout"
(cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout global=10") \
> $OBJ/sshd_proxy
open_mux
mux_client "sleep 1 ; echo ok ; sleep 1; echo ok; sleep 60; touch $OBJ/finished.1" >/dev/null &
mux_client "sleep 60 ; touch $OBJ/finished.2" >/dev/null &
mux_client "sleep 2 ; touch $OBJ/finished.3" >/dev/null &
wait
test -f $OBJ/finished.1 && fail "first mux process completed"
test -f $OBJ/finished.2 && fail "second mux process completed"
test -f $OBJ/finished.3 || fail "third mux process did not complete"
close_mux

# Set up a "slow sftp server" that sleeps before executing the real one.
cat > $OBJ/slow-sftp-server.sh << _EOF
Expand Down