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.

Sign up for GitHub

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

Jump to bottom

Sync with upstream master branch #713

Open
wants to merge 71 commits into
base: latestw_all
Choose a base branch
from
Open

Sync with upstream master branch #713

wants to merge 71 commits into from

Conversation

tgauth
Copy link
Collaborator

@tgauth tgauth commented Jan 8, 2024 •
edited

PR Summary

  • pull in latest changes from upstream's master branch

djmdjm and others added 30 commits December 22, 2023 17:56
@djmdjm
better detection of broken -fzero-call-used-regs
1036d77 
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
@djmdjm
upstream: match flag type (s/int/u_int)
430ef86 
OpenBSD-Commit-ID: 9422289747c35ccb7b31d0e1888ccd5e74ad566a
@djmdjm
upstream: correct section numbers; from Ed Maste
5413b1c 
OpenBSD-Commit-ID: e289576ee5651528404cb2fb68945556052cf83f
@djmdjm
upstream: sort -C, and add to usage(); ok djm
503fbe9 
OpenBSD-Commit-ID: 80141b2a5d60c8593e3c65ca3c53c431262c812f
@jonathangray @djmdjm
upstream: spelling; ok markus@
64ddf77 
OpenBSD-Commit-ID: 9d01f2e9d59a999d5d42fc3b3efcf8dfb892e31b
@daztucker @djmdjm
upstream: Import regenerated moduli.
f0cbd26 
OpenBSD-Commit-ID: 5a636f6ca7f25bfe775df4952f7aac90a7fcbbee
@djmdjm
upstream: fix typo; spotted by Albert Chin
86f9e96 
OpenBSD-Commit-ID: 77140b520a43375b886e535eb8bd842a268f9368
@djmdjm
upstream: remove ext-info-* in the kex.c code, not in callers;
a72833d 
with/ok markus@

OpenBSD-Commit-ID: c06fe2d3a0605c517ff7d65e38ec7b2d1b0b2799
@djmdjm
unbreak fuzzers for clang16
9ea0a45 
getopt() needs a throw() attribute to compile, so supply one when compiling
things with C++
@djmdjm
unbreak fuzzers - missing pkcs11_make_cert()
fc332cb 
provide stub for use in fuzzer harness
@djmdjm
update fuzzer example makefile to clang16
698fe6f
@djmdjm
upstream: make kex-strict section more explicit about its intent:
f64cede 
banning all messages not strictly required in KEX

OpenBSD-Commit-ID: fc33a2d7f3b7013a7fb7500bdbaa8254ebc88116
@djmdjm
upstream: fix missing field in users-groups-by-id@openssh.com reply
4c3cf36 
documentation

GHPR441 from TJ Saunders

OpenBSD-Commit-ID: ff5733ff6ef4cd24e0758ebeed557aa91184c674
@djmdjm
upstream: Remove outdated note from PROTOCOL.mux
219c813 
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
@AtariDreams @djmdjm
Fix compilation error in ssh-pcks11-client.c
6b8be2c 
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.
@sevan @djmdjm
README.platform: update tuntap url
690bc12
@djmdjm
nite that recent OSX tun/tap is unsupported
42ba34a
@tgauth
fix merge conflicts
9142077
@djmdjm
upstream: adapt ssh_api.c code for kex-strict
602f4be 
from markus@ ok me

OpenBSD-Commit-ID: 4d9f256852af2a5b882b12cae9447f8f00f933ac
@djmdjm
upstream: add a "global" ChannelTimeout type to ssh(1) and sshd(8)
b31b12d 
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
@djmdjm
upstream: extend ChannelTimeout regression test to exercise multiplexed
9707c81 
connections and the new "global" timeout type. ok dtucker@

OpenBSD-Regress-ID: f10d19f697024e9941acad7c2057f73d6eacb8a2
@djmdjm
upstream: fix incorrect capitalisation;
afcc902 
OpenBSD-Commit-ID: cb07eb06e15fa2334660ac73e98f29b6a1931984
@djmdjm
upstream: make DSA key support compile-time optional, defaulting to
4e83812 
on

ok markus@

OpenBSD-Commit-ID: 4f8e98fc1fd6de399d0921d5b31b3127a03f581d
@djmdjm
upstream: ensure key_fd is filled when DSA is disabled; spotted by
f9311e8 
tb@

OpenBSD-Commit-ID: 9dd417b6eec3cf67e870f147464a8d93f076dce7
@djmdjm
upstream: make DSA testing optional, defaulting to on
415c94c 
ok markus

OpenBSD-Regress-ID: dfc27b5574e3f19dc4043395594cea5f90b8572a
@djmdjm
upstream: don't disable RSA test when DSA is disabled; bug introduced
50080fa 
in last commit

OpenBSD-Regress-ID: 8780a7250bf742b33010e9336359a1c516f2d7b5
@djmdjm
skip tests that use multiplexing on Windows
0d96b15 
Some tests here use multiplexing, skip these if DISABLE_FD_PASSING
is set. Should unbreak tests on Windows.
@tgauth
Merge remote-tracking branch 'upstrem-bsd/master' into sync-with-upst…
83b5922 
…ream-2
@tgauth
Merge remote-tracking branch 'upstream-pwsh-openssh-portable/latestw_…
0c166db 
…all' into sync-with-upstream-2
@tgauth
skip bash tests that use multiplexing on Windows with explicit if
afd6135
daztucker and others added 29 commits February 19, 2024 18:48
@daztucker
upstream: Factor out PuTTY setup.
bbf541e 
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
@daztucker
upstream: Exapnd PuTTY test coverage.
84046f9 
Expand the set of ciphers, MACs and KEX methods in the PuTTY interop
tests.

OpenBSD-Regress-ID: dd28d97d48efe7329a396d0d505ee2907bf7fc57
@daztucker
upstream: Always define puttysetup function.
e27f032 
OpenBSD-Regress-ID: b4c0ccfa4006a1bc5dfd99ccf21c854d3ce2aee0
@djmdjm
upstream: don't append a gratuitous space to the end of subsystem
ee6d932 
arguments; bz3667

OpenBSD-Commit-ID: e11023aeb3f30b77a674e37b8292c862926d5dc6
@tgauth
Merge remote-tracking branch 'upstream-openssh-portable/master' into …
c02b47e 
…sync-with-upstream-2
@djmdjm
upstream: fix proxy multiplexing mode, broken when keystroke timing
9844aa2 
obfuscation was added. GHPR#463 from montag451

OpenBSD-Commit-ID: 4e412d59b3f557d431f1d81c715a3bc0491cc677
@djmdjm
upstream: fix typo in match directive predicate (s/tagged/tag) GHPR#462
ab73f96 
from Tobias Manske

OpenBSD-Commit-ID: 05b23b772677d48aa82eefd7ebebd369ae758908
@djmdjm
upstream: .Cm for a keyword. Part of GHPR#454 from Niklas Hambüchen
d410e17 
OpenBSD-Commit-ID: d59c52559f926fa82859035d79749fbb4a3ce18a
@djmdjm
upstream: clarify permissions requirements for ChrootDirectory Part
d1164cb 
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
@djmdjm
upstream: explain arguments of internal-sftp GHPR#454 from Niklas
9ee335a 
Hambüchen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OpenBSD-Commit-ID: 0335d641ae6b5b6201b9ffd5dd06345ebbd0a3f3
@djmdjm
more descriptive configure test name
d86bf8a
@daztucker
Add nbsd10 test target.
6886e1b
@djmdjm
upstream: Separate parsing of string array options from applying them
65a44a8 
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
@djmdjm
upstream: fix leak of CanonicalizePermittedCNAMEs on error path;
3deb501 
spotted by Coverity (CID 438039)

OpenBSD-Commit-ID: 208839699939721f452a4418afc028a9f9d3d8af
@tgauth
fix merge conflict
ed376e9
@djmdjm
add a --without-retpoline configure option
668d270 
discussed with deraadt and dtucker a while ago
@djmdjm
disable RSA tests when algorithm is not supported
d52b650 
Unbreaks "make test" when compiled --without-openssl.

Similar treatment to how we do DSA and ECDSA.
@djmdjm
upstream: wrap a few PKCS#11-specific bits in ENABLE_PKCS11
2427428 
OpenBSD-Commit-ID: 463e4a69eef3426a43a2b922c4e7b2011885d923
@djmdjm
upstream: fix memory leak in mux proxy mode when requesting forwarding.
c47e1c9 
found by RASU JSC, reported by Maks Mishin in GHPR#467

OpenBSD-Commit-ID: 97d96a166b1ad4b8d229864a553e3e56d3116860
@daztucker
Prefer openssl binary from --with-ssl-dir directory.
9b3f0be 
Use openssl in the directory specified by --with-ssl-dir as long
as it's functional.  Reported by The Doctor.
@daztucker
upstream: Invoke ProxyCommand that uses stderr redirection via
2f9d2af 
$TEST_SHELL. Fixes test when run by a user whose login shell is tcsh.
Found by vinschen at redhat.com.

OpenBSD-Regress-ID: f68d79e7f00caa8d216ebe00ee5f0adbb944062a
@djmdjm
upstream: skip more whitespace, fixes find-principals on
cd82f75 
allowed_signers files with blank lines; reported by Wiktor Kwapisiewicz

OpenBSD-Commit-ID: b3a22a2afd753d70766f34bc7f309c03706b5298
@djmdjm
upstream: avoid logging in signal handler by converting mainloop to
a6a740a 
ppoll() bz3670, reported by Ben Hamilton; ok dtucker@

OpenBSD-Commit-ID: e58f18042b86425405ca09e6e9d7dfa1df9f5f7f
@djmdjm
quote regexes used to test for algorithm support
26b09b4 
Fixes test failures on Solaris 8 reported by Tom G. Christensen
@daztucker
Test against current OpenSSL and LibreSSL releases.
8fc109c 
Add LibreSSL 3.9.0, bump older branches to their respective current
releases.
@djmdjm
upstream: openssh-9.7
3876a3b 
OpenBSD-Commit-ID: 618ececf58b8cdae016b149787af06240f7b0cbc
@djmdjm
crank RPM spec versions
2827214
@djmdjm
version number in README
86bdd38
@tgauth
fix merge conflict
0d44bc9
@timmjd
Copy link

timmjd commented May 8, 2024

Any chance to get a new release of OpenSSH build?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@tgauth @timmjd @djmdjm @jonathangray @daztucker @AtariDreams @sevan