Skip to content

[wip] merge #842

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

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

[wip] merge #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
609fe2c
upstream: rework the text for -3 to make it clearer what default
Apr 14, 2025
f3d4655
upstream: basic benchmarking support for the unit test framework enable
djmdjm Apr 15, 2025
1ec5b39
upstream: Cast signalled_keydrop to int when logging to prevent warning
daztucker Apr 15, 2025
849c2fd
Look for sqrt(), possibly in libm.
daztucker Apr 15, 2025
46e52fd
Provide INFINITY if it's not provided.
daztucker Apr 16, 2025
9b50cb1
Add includes.h for new tests.
daztucker Apr 17, 2025
52bddbc
Include time.h for clock_gettime().
daztucker Apr 17, 2025
c627b46
cygwin-install-action now puts setup.exe on D:
daztucker Apr 17, 2025
76631fd
Add 10.0 branch to test status page.
daztucker Apr 17, 2025
b5b405f
Set Windows permssions on regress dir.
daztucker Apr 19, 2025
c991273
upstream: fix a out-of-bounds read if the known_hosts file is
djmdjm Apr 30, 2025
e048230
upstream: make writing known_hosts lines more atomic, by writing
djmdjm Apr 30, 2025
566443b
upstream: correct log messages; the reap function is used for more
djmdjm May 5, 2025
80162f9
upstream: Move agent listener sockets from /tmp to under
djmdjm May 5, 2025
1291242
upstream: missing file in previous commit
djmdjm May 5, 2025
6ab8133
depend
djmdjm May 5, 2025
7a7cc3c
Cygwin install in back on D:
daztucker May 5, 2025
7c0e662
includes.h for compat, time.h for clock_gettime.
daztucker May 5, 2025
27861e9
Supply timespecsub if needed.
daztucker May 5, 2025
61525ba
Handle systems that don't have st_mtim.
daztucker May 5, 2025
57eb87b
Boringssl now puts libcrypto in a different place.
daztucker May 5, 2025
d248082
New location of cygwin setup.
daztucker May 5, 2025
5fd6ef2
Add minimal implementations of fstatat and unlinkat.
daztucker May 6, 2025
fe88354
upstream: - add full stop to the text in -a - move the -U and -u
May 5, 2025
928f8dc
upstream: Now that there's an I-D for certificate keys, refer to
djmdjm May 5, 2025
a32d28d
upstream: finally remove DSA signature support from OpenSSH.
djmdjm May 6, 2025
55b38ff
upstream: test ssh-agent with the -T flag to force the old /tmp
May 6, 2025
93e904a
upstream: memory leak on error path; bz3821
djmdjm May 7, 2025
c5dbbe8
upstream: missing ifdef
djmdjm Apr 15, 2025
0404fa7
upstream: another missing ifdef
djmdjm Apr 15, 2025
7cc8e15
upstream: remove DSA from the regression/unit test suite too.
djmdjm May 6, 2025
d41503a
add GitHub Copilot files
tgauth Jan 9, 2026
1053ed3
update instructions to branch off of current branch instead of latest…
tgauth Jan 9, 2026
2955382
remove direct references to scripts for mcp tools
tgauth Jan 9, 2026
36c4826
fix default log location in tool
tgauth Jan 9, 2026
2ffcb0e
create tool for merge process prerequisites
tgauth Jan 9, 2026
4984b21
replace more direct scripts references to mcp tool references
tgauth Jan 9, 2026
63ac1ac
update mcp server name
tgauth Jan 9, 2026
644bbf5
fix merge prereq tool
tgauth Jan 9, 2026
1d8b201
update merge prereq tool
tgauth Jan 9, 2026
aa02282
update instructions
tgauth Jan 9, 2026
2bbb98e
update instructions
tgauth Jan 9, 2026
123f8e2
refactor tool to workaround io/buffer issues when invoked via MCP
tgauth Jan 15, 2026
09f0fd6
update instructions to use mcp tool to read build logs
tgauth Jan 15, 2026
59178e8
update build verfication script to check correct location for artifacts
tgauth Jan 15, 2026
2985579
fix typo
tgauth Jan 15, 2026
76775b2
fix tool to parse build log for success/failure and update instructions
tgauth Jan 23, 2026
e379310
add merge prompt file
tgauth Jan 23, 2026
5b55ec2
update tools
tgauth Jan 23, 2026
950bb1b
update instructions to build only after batch of commits with a CI run
tgauth Jan 23, 2026
ead71d7
update prereq tool to use start-job with git cmd
tgauth Jan 23, 2026
071bfba
update build instructions with paths.targets info
tgauth Jan 23, 2026
332176b
refine instructions
tgauth Jan 23, 2026
0bb51cd
tweak instructions
tgauth Jan 23, 2026
29ad116
update tool
tgauth Jan 23, 2026
a1072a6
fix bug in tool
tgauth Jan 30, 2026
c19ad3f
update instructions
tgauth Jan 30, 2026
2d2368c
add instructions for communication expectations and examples
tgauth Feb 20, 2026
179d41e
update instructions and tools to clarify end commit expectations
tgauth Feb 20, 2026
7e1ea03
add instructions around addressing compiler warnings
tgauth Feb 20, 2026
c19afda
add tool to wrap GH commands to check exit code
tgauth Mar 6, 2026
8a16638
add tool to get context during complex conflicts
tgauth Mar 6, 2026
7801561
Merge branch 'PowerShell:latestw_all' into latestw_all_copilot
tgauth Mar 9, 2026
5f24965
add scratch branch instructions
tgauth Mar 17, 2026
232775d
refine instructions
tgauth Apr 15, 2026
f06d9c8
add tool to invoke E2E CI
tgauth Apr 16, 2026
440585f
Merge commit 'f3d465530e75cb6c02e2cde1d15e6c4bb51ebfd9' into scratch-…
tgauth Apr 20, 2026
ff950b7
Fix unittest benchmark compatibility after batch 1 merge
tgauth Apr 20, 2026
a0592b9
Merge commit '1ec5b39f1f673beac039bb42c98a11aa2b08a0b2' into scratch-…
tgauth Apr 20, 2026
ff030eb
Merge commit '849c2fd894aa87a7e40c71e8d5bda5392b1205be' into scratch-…
tgauth Apr 21, 2026
b909df4
Merge commit '46e52fdae08b89264a0b23f94391c2bf637def34' into scratch-…
tgauth Apr 21, 2026
49fcafb
Merge commit '9b50cb171b5c56184ce6fa3994ce62f9882d2daf' into scratch-…
tgauth Apr 21, 2026
da2f4b7
Merge commit 'c627b468d3b99e487e2b24c90958ae57e633d681' into scratch-…
tgauth Apr 21, 2026
1fce4c7
Merge commit 'b5b405fee7f3e79d44e2d2971a4b6b4cc53f112e' into scratch-…
tgauth Apr 21, 2026
ae357ac
Merge commit 'e048230106fb3f5e7cc07abc311c6feb5f52fd05' into scratch-…
tgauth Apr 21, 2026
98a11e9
Merge commit '6ab8133c067a8e91ba69ce7ca04f95b50f2f2d7b' into scratch-…
tgauth May 4, 2026
9640f12
Build fixes for batch 9 (V_10_3_P1 merge): misc-agent.c on Windows
tgauth May 4, 2026
0a17550
Merge commit '7a7cc3cf721fe7fe9f4925d92bb7c694b8550a7f' into scratch-…
tgauth May 4, 2026
f272c83
Merge commit '27861e9b15151898841097c14ee974c026093131' into scratch-…
tgauth May 4, 2026
41796c4
Merge commit '61525ba967ac1bb7394ea0792aa6030bcbbad049' into scratch-…
tgauth May 4, 2026
d5eef0f
Merge commit 'd2480827b3ef6ec119965822afdff35d734b2dee' into scratch-…
tgauth May 4, 2026
b21de14
Merge commit '5fd6ef297dec23e3574646b6334087131230d0a6' into scratch-…
tgauth May 4, 2026
9b2af69
Merge commit '93e904a673a632604525fdc98b940b7996f1ce54' into scratch-…
tgauth May 4, 2026
df32151
Remove ssh-dss.c from libssh.vcxproj after upstream DSA removal
tgauth May 4, 2026
1b4a183
Merge commit '7cc8e150d51a4545b86d996692b541419b35d1a3' into scratch-…
tgauth May 4, 2026
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
2 changes: 1 addition & 1 deletion .depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ loginrec.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-comp
logintest.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h loginrec.h
mac.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h digest.h hmac.h umac.h mac.h misc.h ssherr.h sshbuf.h openbsd-compat/openssl-compat.h
match.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h match.h misc.h
misc-agent.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h digest.h log.h ssherr.h misc.h pathnames.h ssh.h xmalloc.h
misc.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h misc.h log.h ssherr.h ssh.h sshbuf.h
moduli.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
monitor.o: chacha.h poly1305.h cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h dh.h packet.h dispatch.h auth-options.h sshpty.h channels.h session.h sshlogin.h canohost.h log.h ssherr.h misc.h servconf.h monitor.h monitor_wrap.h monitor_fdpass.h compat.h ssh2.h authfd.h match.h sk-api.h srclimit.h
Expand Down Expand Up @@ -128,7 +129,6 @@ sntrup761.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-com
srclimit.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h addr.h canohost.h log.h ssherr.h misc.h srclimit.h xmalloc.h servconf.h openbsd-compat/sys-queue.h match.h
ssh-add.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh.h log.h ssherr.h sshkey.h sshbuf.h authfd.h authfile.h pathnames.h misc.h digest.h ssh-sk.h sk-api.h hostfile.h
ssh-agent.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshbuf.h sshkey.h authfd.h log.h ssherr.h misc.h digest.h match.h msg.h pathnames.h ssh-pkcs11.h sk-api.h myproposal.h
ssh-dss.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh-ecdsa-sk.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/openssl-compat.h sshbuf.h ssherr.h digest.h sshkey.h
ssh-ecdsa.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h
ssh-ed25519-sk.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h crypto_api.h log.h ssherr.h sshbuf.h sshkey.h ssh.h digest.h
Expand Down
Loading