[wip] merge by tgauth · Pull Request #842 · PowerShell/openssh-portable

tgauth · 2026-04-21T20:35:14Z

PR Summary

PR Context

behaviour is, and adjust the text for -R to make them more consistent; issue raised by mikhail mp39590; behaviour explained by naddy ok djm OpenBSD-Commit-ID: 15ff3bd1518d86c84fa8e91d7aa72cfdb41dccc8

with "make UNITTEST_BENCHMARK=yes" ok dtucker@ OpenBSD-Regress-ID: 7f16a2e247f860897ca46ff87bccbe6002a32564

on platforms where sig_atomic_t is not the same as int. bz#3811, patch from jlduran at gmail com. OpenBSD-Commit-ID: b6bc9e9006e7f81ade57d41a48623a4323deca6c

The unit tests now use sqrt(), which in some platforms (notably DragonFlyBSD and Solaris) is not in libc but rather libm. Since only the unit tests use this, add TESTLIBS and if necessary put libm in it.

INFINITY is specified in c99, so define if not provided.

Fixes builds on older platforms.

Prevents "unprotected private key file" error when running tests.

truncated after the hostname. Reported by the OpenAI Security Research Team ok deraadt@ OpenBSD-Commit-ID: c0b516d7c80c4779a403826f73bcd8adbbc54ebd

the entire line in one operation and using unbuffered stdio. Usually writes to this file are serialised on the "Are you sure you want to continue connecting?" prompt, but if host key checking is disabled and connections were being made with high concurrency then interleaved writes might have been possible. feedback/ok deraadt@ millert@ OpenBSD-Commit-ID: d11222b49dabe5cfe0937b49cb439ba3d4847b08

…w_all

…merge-v10.3P1-20260420

- Resolve leftover conflict markers in test_helper.c - Add CLOCK_REALTIME fallback define for Windows unit tests - Add benchmarks() entry point in win32compat unit tests to satisfy benchmark harness linking

…merge-v10.3P1-20260420

tgauth · 2026-04-21T20:35:27Z

/azp run

azure-pipelines · 2026-04-21T20:35:38Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

This PR looks like an upstream merge/work-in-progress that (a) refreshes some core OpenSSH sources/docs, (b) extends the unit-test harness to support benchmarking mode, and (c) adds a set of GitHub tooling/scripts and merge/test instructions to support the Windows fork’s upstream-merge workflow.

Changes:

Add benchmarking mode plumbing to the unit-test helper + propagate UNITTEST_ARGS through unittest makefiles and regress/Makefile.
Refactor known_hosts entry writing in hostfile.c to format into an sshbuf and write in one fwrite(), plus stricter parsing of truncated lines.
Add multiple .github/tools/*.ps1 “merge/build/test” helper scripts and extensive merge/testing documentation.

Reviewed changes

Copilot reviewed 56 out of 56 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
ssh-agent.c	Casts `signalled_keydrop` for logging format correctness; version bump.
scp.1	Updates option docs for `-3` / `-R` behavior; date/version bump.
regress/unittests/win32compat/tests.c	Adds `benchmarks()` entrypoint (currently delegates to `tests()`).
regress/unittests/utf8/tests.c	Adds `benchmarks()` stub (“no benchmarks”).
regress/unittests/utf8/Makefile	Expands linked sources and passes `${UNITTEST_ARGS}` into the test runner.
regress/unittests/test_helper/test_helper.h	Adds benchmark macros + new `bench_*` API declarations and `test_is_benchmark()`.
regress/unittests/test_helper/test_helper.c	Implements benchmark mode CLI flags and timing/statistics collection.
regress/unittests/sshsig/tests.c	Adds `benchmarks()` stub (“no benchmarks”).
regress/unittests/sshkey/tests.c	Routes benchmark mode to `sshkey_benchmarks()`.
regress/unittests/sshkey/test_sshkey.c	Adds keygen/sign/verify benchmarks using new BENCH macros.
regress/unittests/sshbuf/tests.c	Adds includes + `benchmarks()` stub (“no benchmarks”).
regress/unittests/misc/tests.c	Adds `benchmarks()` stub (“no benchmarks”).
regress/unittests/misc/Makefile	Passes `${UNITTEST_ARGS}` into the test runner.
regress/unittests/match/tests.c	Adds `benchmarks()` stub (“no benchmarks”).
regress/unittests/match/Makefile	Passes `${UNITTEST_ARGS}` into the test runner.
regress/unittests/kex/tests.c	Adds `benchmarks()` entrypoint (delegates to `kex_tests()`).
regress/unittests/kex/test_kex.c	Adds benchmark-aware KEX path and allows cipher/mac overrides in proposals.
regress/unittests/kex/Makefile	Passes `${UNITTEST_ARGS}` into the test runner.
regress/unittests/hostkeys/tests.c	Adds includes + `benchmarks()` stub (“no benchmarks”).
regress/unittests/hostkeys/Makefile	Passes `${UNITTEST_ARGS}` into the test runner (while preserving `-d testdata`).
regress/unittests/conversion/tests.c	Adds `benchmarks()` stub (“no benchmarks”).
regress/unittests/conversion/Makefile	Passes `${UNITTEST_ARGS}` into the test runner.
regress/unittests/bitmap/tests.c	Scales test iteration count with fast/slow modes + adds `benchmarks()` stub.
regress/unittests/bitmap/Makefile	Expands linked sources and passes `${UNITTEST_ARGS}` into the test runner.
regress/unittests/authopt/tests.c	Adds `benchmarks()` stub (“no benchmarks”).
regress/unittests/authopt/Makefile	Passes `${UNITTEST_ARGS}` into the test runner (while preserving `-d testdata`).
regress/unittests/Makefile.inc	Adds `-lm`, introduces UNITTEST_BENCH* vars, and builds `UNITTEST_ARGS` incl. `-b/-B/-O`.
regress/Makefile	Adds `unit-bench` target and threads benchmark/test args through unit test invocations.
hostfile.c	Refactors host entry formatting/writing; adds truncated-line handling while parsing hostkeys.
defines.h	Adds fallback `INFINITY` definition when missing.
configure.ac	Detects `sqrt()`/`-lm` for unit tests and checks for `INFINITY` declarations.
Makefile.in	Appends configured `@TESTLIBS@` and adds `unit-bench` wrapper target.
.github/tools/Test-OpenSSHFunctionality.ps1	Adds Windows E2E functional SSH test script (install service, create user, connect, cleanup).
.github/tools/Test-OpenSSHBuild.ps1	Adds build artifact verification + build log parsing helper.
.github/tools/Test-MergePrerequisites.ps1	Adds pre-merge environment validation (tools, remotes, target tag, clean state).
.github/tools/Start-OpenSSHBuild.ps1	Adds build wrapper around OpenSSHBuildHelper with log-marker based success detection.
.github/tools/Save-MergeResolution.ps1	Adds merge-conflict resolution recorder into `.git/merge-resolution-log.json`.
.github/tools/Replay-MergeResolutions.ps1	Adds conflict-resolution replay tool that writes/stages saved resolutions.
.github/tools/Invoke-OpenSSHTests.ps1	Adds orchestrator to run Unit/Bash/E2E tests via OpenSSHTestHelper on Windows.
.github/tools/Invoke-Git.ps1	Adds structured git operation wrapper (merge/cherry-pick/status/log/diff/etc.) with async I/O.
.github/tools/Get-ConflictContext.ps1	Adds 3-way conflict context extractor for difficult merges.
.github/tools/Get-CommitGroups.ps1	Adds GitHub API-based upstream commit batching tool (CI success or CI presence).
.github/setup_ci.sh	Adjusts Cygwin ACL handling and changes Cygwin `setup.exe` drive path.
.github/prompt/merge.prompt.md	Adds merge prompt for agents describing the two-phase merge workflow and tool usage.
.github/instructions/testing.instructions.md	Adds comprehensive testing instructions for agents (incl. new tools).
.github/instructions/setup.instructions.md	Adds repo setup instructions for agents.
.github/instructions/repository-overview.instructions.md	Adds repo structure + Windows compat layer overview.
.github/instructions/merge/research.instructions.md	Adds merge research references and heuristics.
.github/instructions/merge/merge-process-overview.instructions.md	Adds end-to-end merge workflow instructions (scratch/real branch phases, tooling).
.github/instructions/merge/agent-communication-merge.instructions.md	Adds required communication templates for tool output and merge progress.
.github/instructions/getting-started.instructions.md	Adds index/entrypoint doc linking to key instructions.
.github/instructions/build.instructions.md	Adds build instructions and policies for agents (warnings baseline, paths.targets restore, etc.).
.github/instructions/agent-communication.instructions.md	Adds general communication rules for agents (chat vs tool output).
.github/ci-status.md	Adds CI badge section for OpenSSH 10.0 branch.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-21T20:40:49Z

+	free(bench_samples);
+	bench_nalloc = BENCH_SAMPLES_ALLOC;
+	bench_samples = xcalloc(sizeof(*bench_samples), bench_nalloc);
+	bench_accum_secs = 0;


xcalloc() arguments appear swapped: the function takes (nmemb, size), but this call passes (sizeof(*bench_samples), bench_nalloc). This will allocate an unexpectedly large buffer (nmemb=sizeof(timespec), size=8192) and likely OOM/crash; swap the arguments so you allocate bench_nalloc samples.

Copilot · 2026-04-21T20:40:50Z

+	/* median */
+	qsort(bench_samples, bench_nruns, sizeof(*bench_samples), tscmp);
+	i = bench_nruns / 2;
+	med_spr = tstod(&bench_samples[i]);
+	if (bench_nruns > 1 && bench_nruns & 1)
+		med_spr = (med_spr + tstod(&bench_samples[i - 1])) / 2.0;
+	med_rps = (med_spr == 0.0) ? INFINITY : 1.0/med_spr;


Median calculation looks incorrect: it averages the two middle samples when bench_nruns is odd (bench_nruns & 1), but the average-of-two should be used when the run count is even. As written, odd-sized samples will report an inflated median and even-sized samples won’t be averaged.

Copilot · 2026-04-21T20:40:50Z

+	/* std. dev */
+	std_dev = 0;
+	for (i = 0; i < bench_nruns; i++) {
+		std_dev = tstod(&bench_samples[i]) - mean_spr;
+		std_dev *= std_dev;
+	}
+	std_dev /= (double)bench_nruns;
+	std_dev = sqrt(std_dev);


Std. dev computation doesn’t accumulate across samples: the loop overwrites std_dev each iteration instead of summing squared deltas, so the result only reflects the last sample. Accumulate (e.g., add squared deltas) before dividing by bench_nruns.

Copilot · 2026-04-21T20:40:50Z

+void
+bench_case_start(const char *file, int line)
+{
+	clock_gettime(CLOCK_REALTIME, &bench_start_time);
+}
+
+void
+bench_case_finish(const char *file, int line)
+{


bench_case_start() and bench_case_finish() accept file/line parameters but don’t use them. If the build enables -Wunused-parameter, this will introduce warnings in the test helper; consider marking them unused (cast to void or apply an unused attribute).

Copilot · 2026-04-21T20:40:50Z

+		test "x${UNITTEST_VERBOSE}" = "x" || ARGS="$$ARGS -v"; \
+		test "x${UNITTEST_BENCH_DETAIL}" = "x" || ARGS="$$ARGS -B"; \
+		test "x${UNITTEST_BENCH_ONLY}" = "x" || ARGS="$$ARGS -O ${UNITTEST_BENCH_ONLY}"; \
+		 $$V ${.OBJDIR}/unittests/sshbuf/test_sshbuf $${ARGS}; \


UNITTEST_BENCH_ONLY is appended to ARGS without quoting. If the pattern contains spaces or glob characters, the shell will split/expand it and -O will receive the wrong value. Quote the value when constructing ARGS (similar to Makefile.inc).

Copilot · 2026-04-21T20:40:51Z

 	;;
    setup)
-	if /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
+	if /cygdrive/d/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then


Cygwin setup is now hardcoded to /cygdrive/d/setup.exe. If the runner image (or local dev env) only has setup.exe on C: (the previous path), package installation will fail. Consider probing for both locations (or using an env var) and erroring with a clear message if neither exists.

Suggested change

if /cygdrive/d/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then

cygwin_setup_exe="${CYGWIN_SETUP_EXE:-}"

if [ -z "$cygwin_setup_exe" ]; then

if [ -x /cygdrive/d/setup.exe ]; then

cygwin_setup_exe=/cygdrive/d/setup.exe

elif [ -x /cygdrive/c/setup.exe ]; then

cygwin_setup_exe=/cygdrive/c/setup.exe

else

echo "Could not find Cygwin setup.exe. Set CYGWIN_SETUP_EXE or install setup.exe at /cygdrive/d/setup.exe or /cygdrive/c/setup.exe."

exit 1

fi

elif [ ! -x "$cygwin_setup_exe" ]; then

echo "Configured CYGWIN_SETUP_EXE is not executable: $cygwin_setup_exe"

exit 1

fi

if "$cygwin_setup_exe" -q -P "$(echo "$PACKAGES" | tr ' ' ,)"; then

Copilot · 2026-04-21T20:40:51Z

+	if ((r = fwrite(sshbuf_ptr(entry), sshbuf_len(entry), 1, f)) != 1) {
+		error_f("fwrite: %s", strerror(errno));
+		goto out;


fwrite() returns size_t, but the result is stored in an int. While you’re writing a single item here, using size_t for the return value avoids signed/width warnings and matches the standard library API.

jmc@openbsd.org and others added 30 commits April 15, 2025 14:09

upstream: rework the text for -3 to make it clearer what default

609fe2c

behaviour is, and adjust the text for -R to make them more consistent; issue raised by mikhail mp39590; behaviour explained by naddy ok djm OpenBSD-Commit-ID: 15ff3bd1518d86c84fa8e91d7aa72cfdb41dccc8

upstream: basic benchmarking support for the unit test framework enable

f3d4655

with "make UNITTEST_BENCHMARK=yes" ok dtucker@ OpenBSD-Regress-ID: 7f16a2e247f860897ca46ff87bccbe6002a32564

upstream: Cast signalled_keydrop to int when logging to prevent warning

1ec5b39

on platforms where sig_atomic_t is not the same as int. bz#3811, patch from jlduran at gmail com. OpenBSD-Commit-ID: b6bc9e9006e7f81ade57d41a48623a4323deca6c

Look for sqrt(), possibly in libm.

849c2fd

The unit tests now use sqrt(), which in some platforms (notably DragonFlyBSD and Solaris) is not in libc but rather libm. Since only the unit tests use this, add TESTLIBS and if necessary put libm in it.

Provide INFINITY if it's not provided.

46e52fd

INFINITY is specified in c99, so define if not provided.

Add includes.h for new tests.

9b50cb1

Fixes builds on older platforms.

Include time.h for clock_gettime().

52bddbc

cygwin-install-action now puts setup.exe on D:

c627b46

Add 10.0 branch to test status page.

76631fd

Set Windows permssions on regress dir.

b5b405f

Prevents "unprotected private key file" error when running tests.

upstream: fix a out-of-bounds read if the known_hosts file is

c991273

truncated after the hostname. Reported by the OpenAI Security Research Team ok deraadt@ OpenBSD-Commit-ID: c0b516d7c80c4779a403826f73bcd8adbbc54ebd

add GitHub Copilot files

d41503a

update instructions to branch off of current branch instead of latest…

1053ed3

…w_all

remove direct references to scripts for mcp tools

2955382

fix default log location in tool

36c4826

create tool for merge process prerequisites

2ffcb0e

replace more direct scripts references to mcp tool references

4984b21

update mcp server name

63ac1ac

fix merge prereq tool

644bbf5

update merge prereq tool

1d8b201

update instructions

aa02282

update instructions

2bbb98e

refactor tool to workaround io/buffer issues when invoked via MCP

123f8e2

update instructions to use mcp tool to read build logs

09f0fd6

update build verfication script to check correct location for artifacts

59178e8

fix typo

2985579

fix tool to parse build log for success/failure and update instructions

76775b2

add merge prompt file

e379310

update tools

5b55ec2

tgauth and others added 25 commits January 23, 2026 12:26

update prereq tool to use start-job with git cmd

ead71d7

update build instructions with paths.targets info

071bfba

refine instructions

332176b

tweak instructions

0bb51cd

update tool

29ad116

fix bug in tool

a1072a6

update instructions

c19ad3f

add instructions for communication expectations and examples

2d2368c

update instructions and tools to clarify end commit expectations

179d41e

add instructions around addressing compiler warnings

7e1ea03

add tool to wrap GH commands to check exit code

c19afda

add tool to get context during complex conflicts

8a16638

Merge branch 'PowerShell:latestw_all' into latestw_all_copilot

7801561

add scratch branch instructions

5f24965

refine instructions

232775d

add tool to invoke E2E CI

f06d9c8

Merge commit 'f3d465530e75cb6c02e2cde1d15e6c4bb51ebfd9' into scratch-…

440585f

…merge-v10.3P1-20260420

Fix unittest benchmark compatibility after batch 1 merge

ff950b7

- Resolve leftover conflict markers in test_helper.c - Add CLOCK_REALTIME fallback define for Windows unit tests - Add benchmarks() entry point in win32compat unit tests to satisfy benchmark harness linking

Merge commit '1ec5b39f1f673beac039bb42c98a11aa2b08a0b2' into scratch-…

a0592b9

…merge-v10.3P1-20260420

Merge commit '849c2fd894aa87a7e40c71e8d5bda5392b1205be' into scratch-…

ff030eb

…merge-v10.3P1-20260420

Merge commit '46e52fdae08b89264a0b23f94391c2bf637def34' into scratch-…

b909df4

…merge-v10.3P1-20260420

Merge commit '9b50cb171b5c56184ce6fa3994ce62f9882d2daf' into scratch-…

49fcafb

…merge-v10.3P1-20260420

Merge commit 'c627b468d3b99e487e2b24c90958ae57e633d681' into scratch-…

da2f4b7

…merge-v10.3P1-20260420

Merge commit 'b5b405fee7f3e79d44e2d2971a4b6b4cc53f112e' into scratch-…

1fce4c7

…merge-v10.3P1-20260420

Merge commit 'e048230106fb3f5e7cc07abc311c6feb5f52fd05' into scratch-…

ae357ac

…merge-v10.3P1-20260420

Copilot AI review requested due to automatic review settings April 21, 2026 20:35

Copilot started reviewing on behalf of tgauth April 21, 2026 20:36 View session

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wip] merge#842

[wip] merge#842
tgauth wants to merge 56 commits intoPowerShell:latestw_allfrom
tgauth:scratch-merge-v10.3P1-20260420

tgauth commented Apr 21, 2026

Uh oh!

tgauth commented Apr 21, 2026

Uh oh!

azure-pipelines Bot commented Apr 21, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 21, 2026

Uh oh!

Copilot AI Apr 21, 2026

Uh oh!

Copilot AI Apr 21, 2026

Uh oh!

Copilot AI Apr 21, 2026

Uh oh!

Copilot AI Apr 21, 2026

Uh oh!

Copilot AI Apr 21, 2026

Uh oh!

Copilot AI Apr 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

-	if /cygdrive/d/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
+	cygwin_setup_exe="${CYGWIN_SETUP_EXE:-}"
+	if [ -z "$cygwin_setup_exe" ]; then
+		if [ -x /cygdrive/d/setup.exe ]; then
+			cygwin_setup_exe=/cygdrive/d/setup.exe
+		elif [ -x /cygdrive/c/setup.exe ]; then
+			cygwin_setup_exe=/cygdrive/c/setup.exe
+		else
+			echo "Could not find Cygwin setup.exe. Set CYGWIN_SETUP_EXE or install setup.exe at /cygdrive/d/setup.exe or /cygdrive/c/setup.exe."
+			exit 1
+		fi
+	elif [ ! -x "$cygwin_setup_exe" ]; then
+		echo "Configured CYGWIN_SETUP_EXE is not executable: $cygwin_setup_exe"
+		exit 1
+	fi
+	if "$cygwin_setup_exe" -q -P "$(echo "$PACKAGES" | tr ' ' ,)"; then

Conversation

tgauth commented Apr 21, 2026

PR Summary

PR Context

Uh oh!

tgauth commented Apr 21, 2026

Uh oh!

azure-pipelines Bot commented Apr 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants