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

Conversation

rapier1
Copy link
Owner

@rapier1 rapier1 commented Apr 10, 2024

This will update HPN-SSH to 18.4.0 bringing it up to the OpenSSH 9.7p1 release.
Most changes are minor (and largely focused on documentation) but this version
does upgrade binn.[c|h] to the latest version. Unfortunately, this version is no longer
C-89 compatible so we've disabled the C-89 compatabilty tests in the CI regression tests.

djmdjm and others added 30 commits December 22, 2023 17:56
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
OpenBSD-Commit-ID: 9422289747c35ccb7b31d0e1888ccd5e74ad566a
OpenBSD-Commit-ID: e289576ee5651528404cb2fb68945556052cf83f
OpenBSD-Commit-ID: 80141b2a5d60c8593e3c65ca3c53c431262c812f
OpenBSD-Commit-ID: 9d01f2e9d59a999d5d42fc3b3efcf8dfb892e31b
OpenBSD-Commit-ID: 5a636f6ca7f25bfe775df4952f7aac90a7fcbbee
OpenBSD-Commit-ID: 77140b520a43375b886e535eb8bd842a268f9368
with/ok markus@

OpenBSD-Commit-ID: c06fe2d3a0605c517ff7d65e38ec7b2d1b0b2799
getopt() needs a throw() attribute to compile, so supply one when compiling
things with C++
provide stub for use in fuzzer harness
banning all messages not strictly required in KEX

OpenBSD-Commit-ID: fc33a2d7f3b7013a7fb7500bdbaa8254ebc88116
documentation

GHPR441 from TJ Saunders

OpenBSD-Commit-ID: ff5733ff6ef4cd24e0758ebeed557aa91184c674
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
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.
from markus@ ok me

OpenBSD-Commit-ID: 4d9f256852af2a5b882b12cae9447f8f00f933ac
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
connections and the new "global" timeout type. ok dtucker@

OpenBSD-Regress-ID: f10d19f697024e9941acad7c2057f73d6eacb8a2
OpenBSD-Commit-ID: cb07eb06e15fa2334660ac73e98f29b6a1931984
on

ok markus@

OpenBSD-Commit-ID: 4f8e98fc1fd6de399d0921d5b31b3127a03f581d
tb@

OpenBSD-Commit-ID: 9dd417b6eec3cf67e870f147464a8d93f076dce7
ok markus

OpenBSD-Regress-ID: dfc27b5574e3f19dc4043395594cea5f90b8572a
in last commit

OpenBSD-Regress-ID: 8780a7250bf742b33010e9336359a1c516f2d7b5
Some tests here use multiplexing, skip these if DISABLE_FD_PASSING
is set. Should unbreak tests on Windows.
OpenBSD-Commit-ID: bf9e4a1049562ee4322684fbdce07142f04fdbb7
.. 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.
djmdjm and others added 26 commits February 21, 2024 17:18
Hambüchen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OpenBSD-Commit-ID: 0335d641ae6b5b6201b9ffd5dd06345ebbd0a3f3
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
spotted by Coverity (CID 438039)

OpenBSD-Commit-ID: 208839699939721f452a4418afc028a9f9d3d8af
discussed with deraadt and dtucker a while ago
Unbreaks "make test" when compiled --without-openssl.

Similar treatment to how we do DSA and ECDSA.
OpenBSD-Commit-ID: 463e4a69eef3426a43a2b922c4e7b2011885d923
found by RASU JSC, reported by Maks Mishin in GHPR#467

OpenBSD-Commit-ID: 97d96a166b1ad4b8d229864a553e3e56d3116860
Use openssl in the directory specified by --with-ssl-dir as long
as it's functional.  Reported by The Doctor.
$TEST_SHELL. Fixes test when run by a user whose login shell is tcsh.
Found by vinschen at redhat.com.

OpenBSD-Regress-ID: f68d79e7f00caa8d216ebe00ee5f0adbb944062a
allowed_signers files with blank lines; reported by Wiktor Kwapisiewicz

OpenBSD-Commit-ID: b3a22a2afd753d70766f34bc7f309c03706b5298
ppoll() bz3670, reported by Ben Hamilton; ok dtucker@

OpenBSD-Commit-ID: e58f18042b86425405ca09e6e9d7dfa1df9f5f7f
Fixes test failures on Solaris 8 reported by Tom G. Christensen
Add LibreSSL 3.9.0, bump older branches to their respective current
releases.
OpenBSD-Commit-ID: 618ececf58b8cdae016b149787af06240f7b0cbc
This commit should not be used as it contains unresolved
merge conflicts.
marked as HPN-SSH 18.4.0. Minimal changes were required. The only notable
changes are in regression tests to deal with compatibility tests and what
seems to be typo in the OpenSSH source Makefile for the regression tests. These
changes are to resolve issues with compatibility tests and when building
without openssl libraries.
1) Updated binn.c and binn.h to the latest versions
2) Removed unnecessary double dereferencing from metrics.[c|h]
…t from the

CI workflow. I don't think this will be a major issue with our projected audience.
Additionally, in binn.c instances of BOOL value; needed to be defined or the
-Werror tests failed. Likewise, I need to move the position of a /*fall through*/ in binn.c
…that

hpnssh uses port 2222 as the default port.
Files touched: hpnssh.1 hpnssh_config.5
Copy link
Collaborator

@dorrellmw dorrellmw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No changes since previous-stage review approval. CI checks are understood to be failing for reasons unrelated to the code.

@rapier1 rapier1 merged commit 4aa6f04 into master Apr 10, 2024
136 of 139 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants