git: d8fa89d4b4bb - releng/15.2 - OpenSSH: Update to 10.6p1

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Thu, 12 Nov 2026 23:58:20 UTC
The branch releng/15.2 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=d8fa89d4b4bba3c47dd02eae7952b852c91ae351

commit d8fa89d4b4bba3c47dd02eae7952b852c91ae351
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-11-10 14:08:18 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-11-12 23:57:52 +0000

    OpenSSH: Update to 10.6p1
    
    This release contains security fixes and small bugfixes.
    
    Full release notes are available at
    https://www.openssh.com/txt/release-10.6 .
    
    Selected items from the upstream release notes:
    
    Security
    ========
    
     * ssh-agent(1): fix an interaction between agent locking and the
       session-bind@openssh.com extension that is used to identify
       forwarded agents. These binding requests were refused when the
       agent was locked, with the result that operations that were
       intended to be limited to local use only could be performed
       remotely, including the ability to add PKCS#11 tokens and make
       use of keys that had destination restrictions applied.
       Reported by sn0x-sharma
    
     * ssh(1): avoid potential realloc use-after-free in the client if a
       remote forwarding is added via the local session multiplexing
       socket while a remote forwarding open request is pending with the
       server. Report and fix from Brian Mingus of Cognatory
    
     * sshd(8): make the authorized_keys "restrict" keyword apply
       correctly to tunnel forwarding too (which is administratively
       disabled by default). Reported by Erichen, Institute of Computing
       Technology, Chinese Academy of Sciences
    
    New features
    ------------
    
     * ssh-keygen(1): add ability to set or clear the touch-required and
       verify-required flags on FIDO private keys when resetting a
       private key's passphrase.
    
     * ssh(1): tweak ordering of certificates tried during pubkey
        authentication to prefer FIDO keys that do not require user
        presence (touch) first, and FIDO keys that require user
        verification via PIN or biometrics last. This effectively tries
        low-friction authenticators before higher friction ones.
    
     * ssh(1): add a "ssh -Z user@host" mode that prints the keys that
       will be tried for public key authentication in the order that
       they will be used.
    
     * sshd(8) use setproctitle(3) to identify sshd-session when its
       acting as a post-authentication monitor.
    
    Approved by:    re (cperciva)
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 6dd16be872c631a4c011983107acd213a6fe619d)
    (cherry picked from commit 1135d4e15933487f4b9927c317bf22dd1baefdfd)
---
 crypto/openssh/.depend                             |     2 +-
 crypto/openssh/.github/ci-status.md                |     5 +
 crypto/openssh/.github/configs                     |     3 +
 crypto/openssh/.github/pin_actions.sh              |     3 +
 crypto/openssh/.github/setup_ci.sh                 |     6 +-
 crypto/openssh/.github/workflows/c-cpp.yml         |     9 +-
 crypto/openssh/.github/workflows/selfhosted.yml    |     6 +-
 crypto/openssh/.github/workflows/upstream.yml      |     2 +-
 crypto/openssh/.github/workflows/vm.yml            |     8 +-
 crypto/openssh/ChangeLog                           | 15775 ++++++++++---------
 crypto/openssh/INSTALL                             |     2 +-
 crypto/openssh/Makefile.in                         |     2 +-
 crypto/openssh/README.platform                     |     6 +-
 crypto/openssh/atomicio.c                          |     4 -
 crypto/openssh/auth-options.c                      |     3 +-
 crypto/openssh/auth.h                              |     4 +-
 crypto/openssh/auth2-hostbased.c                   |    49 +-
 crypto/openssh/auth2-pubkey.c                      |   127 +-
 crypto/openssh/auth2.c                             |     5 +-
 crypto/openssh/channels.c                          |   185 +-
 crypto/openssh/channels.h                          |    28 +-
 crypto/openssh/clientloop.c                        |     6 +-
 crypto/openssh/clientloop.h                        |     2 +-
 crypto/openssh/config.h                            |    14 +-
 crypto/openssh/configure.ac                        |    62 +-
 crypto/openssh/contrib/README                      |     2 +-
 crypto/openssh/contrib/redhat/openssh.spec         |     4 +-
 crypto/openssh/contrib/suse/openssh.spec           |     2 +-
 crypto/openssh/crypto_api.h                        |     8 +-
 crypto/openssh/defines.h                           |    16 +
 crypto/openssh/ed25519-openssl.c                   |    53 +-
 crypto/openssh/ed25519.c                           |  6291 +++++---
 crypto/openssh/ed25519.sh                          |   431 +-
 crypto/openssh/gss-serv.c                          |    34 +-
 crypto/openssh/kex.c                               |    39 +-
 crypto/openssh/kex.h                               |     7 +-
 crypto/openssh/kexgen.c                            |     5 +-
 crypto/openssh/kexgexc.c                           |     5 +-
 crypto/openssh/misc-agent.c                        |   240 +-
 crypto/openssh/misc.c                              |   129 +-
 crypto/openssh/misc.h                              |    16 +-
 crypto/openssh/monitor.c                           |     4 +-
 crypto/openssh/monitor_wrap.c                      |     8 +-
 crypto/openssh/mux.c                               |     4 +-
 crypto/openssh/myproposal.h                        |     6 +-
 crypto/openssh/openbsd-compat/Makefile.in          |     1 +
 crypto/openssh/openbsd-compat/bsd-openpty.c        |    10 +-
 crypto/openssh/openbsd-compat/openbsd-compat.h     |     8 +-
 crypto/openssh/openbsd-compat/port-linux-selinux.c |   243 +
 crypto/openssh/openbsd-compat/port-linux.c         |   211 +-
 crypto/openssh/openbsd-compat/readpassphrase.c     |    60 +-
 crypto/openssh/packet.c                            |    42 +-
 crypto/openssh/packet.h                            |     3 +-
 crypto/openssh/pathnames.h                         |     9 +-
 crypto/openssh/readconf.c                          |    29 +-
 crypto/openssh/readconf.h                          |     6 +-
 crypto/openssh/regress/cert-userkey.sh             |     5 +-
 crypto/openssh/regress/keygen-comment.sh           |     4 +-
 crypto/openssh/regress/keytype.sh                  |     4 +-
 crypto/openssh/regress/misc/sk-dummy/sk-dummy.c    |    18 +-
 crypto/openssh/regress/multiplex.sh                |     2 +-
 crypto/openssh/regress/percent.sh                  |    24 +-
 crypto/openssh/regress/unittests/authopt/tests.c   |    40 +-
 .../regress/unittests/crypto/test_ed25519.c        |    24 +-
 .../openssh/regress/unittests/sshkey/mktestdata.sh |     6 +-
 .../unittests/sshkey/testdata/mldsa44_ed25519_1    |   112 +-
 .../sshkey/testdata/mldsa44_ed25519_1-cert.fp      |     2 +-
 .../sshkey/testdata/mldsa44_ed25519_1-cert.pub     |     2 +-
 .../unittests/sshkey/testdata/mldsa44_ed25519_1.fp |     2 +-
 .../sshkey/testdata/mldsa44_ed25519_1.fp.bb        |     2 +-
 .../sshkey/testdata/mldsa44_ed25519_1.pub          |     2 +-
 .../unittests/sshkey/testdata/mldsa44_ed25519_1_pw |   113 +-
 .../unittests/sshkey/testdata/mldsa44_ed25519_2    |   112 +-
 .../unittests/sshkey/testdata/mldsa44_ed25519_2.fp |     2 +-
 .../sshkey/testdata/mldsa44_ed25519_2.fp.bb        |     2 +-
 .../sshkey/testdata/mldsa44_ed25519_2.pub          |     2 +-
 .../unittests/sshsig/testdata/mldsa44-ed25519      |   112 +-
 .../unittests/sshsig/testdata/mldsa44-ed25519.pub  |     2 +-
 .../unittests/sshsig/testdata/mldsa44-ed25519.sig  |   151 +-
 crypto/openssh/sandbox-seccomp-filter.c            |     5 +-
 crypto/openssh/scp.1                               |     6 +-
 crypto/openssh/scp.c                               |    10 +-
 crypto/openssh/servconf.c                          |   162 +-
 crypto/openssh/servconf.h                          |    19 +-
 crypto/openssh/session.c                           |    11 +-
 crypto/openssh/sftp-client.c                       |    38 +-
 crypto/openssh/sftp-client.h                       |     5 +-
 crypto/openssh/sftp-server.8                       |     6 +-
 crypto/openssh/sftp-usergroup.c                    |     2 +
 crypto/openssh/sftp.1                              |    22 +-
 crypto/openssh/sftp.c                              |    64 +-
 crypto/openssh/sk-usbhid.c                         |    15 +-
 crypto/openssh/ssh-add.1                           |    11 +-
 crypto/openssh/ssh-add.c                           |    32 +-
 crypto/openssh/ssh-agent.1                         |    39 +-
 crypto/openssh/ssh-agent.c                         |    80 +-
 crypto/openssh/ssh-ed25519-sk.c                    |    27 +-
 crypto/openssh/ssh-ed25519.c                       |    49 +-
 crypto/openssh/ssh-gss.h                           |     4 +-
 crypto/openssh/ssh-keygen.1                        |     6 +-
 crypto/openssh/ssh-keygen.c                        |    61 +-
 crypto/openssh/ssh-keyscan.c                       |     6 +-
 crypto/openssh/ssh-mldsa-eddsa.c                   |    46 +-
 crypto/openssh/ssh-sk-helper.c                     |     2 +-
 crypto/openssh/ssh.1                               |   148 +-
 crypto/openssh/ssh.c                               |    12 +-
 crypto/openssh/ssh_config.5                        |    53 +-
 crypto/openssh/ssh_namespace.h                     |    21 +-
 crypto/openssh/sshconnect.c                        |    16 +-
 crypto/openssh/sshconnect2.c                       |    20 +-
 crypto/openssh/sshd-auth.c                         |     5 +-
 crypto/openssh/sshd-session.c                      |    31 +-
 crypto/openssh/sshd.8                              |     8 +-
 crypto/openssh/sshd.c                              |    45 +-
 crypto/openssh/sshd_config.5                       |   125 +-
 crypto/openssh/ssherr.c                            |     4 +-
 crypto/openssh/ssherr.h                            |     3 +-
 crypto/openssh/sshkey.c                            |    84 +-
 crypto/openssh/sshkey.h                            |     4 +-
 crypto/openssh/sshpty.c                            |    20 +-
 crypto/openssh/sshpty.h                            |     3 +-
 crypto/openssh/utf8.c                              |    15 +-
 crypto/openssh/version.h                           |     4 +-
 secure/usr.sbin/sshd/Makefile                      |     2 +-
 124 files changed, 15125 insertions(+), 11215 deletions(-)

diff --git a/crypto/openssh/.depend b/crypto/openssh/.depend
index 845fadcebfdd..997f1369d7ff 100644
--- a/crypto/openssh/.depend
+++ b/crypto/openssh/.depend
@@ -91,7 +91,7 @@ monitor_wrap.o: packet.h dispatch.h log.h ssherr.h monitor.h atomicio.h monitor_
 msg.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/bsd-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 sshbuf.h log.h ssherr.h atomicio.h msg.h misc.h
 mux.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/bsd-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 log.h ssherr.h ssh.h ssh2.h misc.h match.h sshbuf.h channels.h packet.h dispatch.h monitor_fdpass.h sshpty.h readconf.h clientloop.h
 nchan.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/bsd-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 ssh2.h sshbuf.h packet.h dispatch.h channels.h compat.h log.h ssherr.h
-packet.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/bsd-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 compat.h ssh2.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h digest.h log.h ssherr.h canohost.h misc.h packet.h dispatch.h sshbuf.h
+packet.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/bsd-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 compat.h ssh2.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h kex.h mac.h crypto_api.h digest.h log.h ssherr.h canohost.h misc.h packet.h dispatch.h sshbuf.h version.h
 platform-listen.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/bsd-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 log.h ssherr.h misc.h
 platform-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/bsd-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
 platform-pledge.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/bsd-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
diff --git a/crypto/openssh/.github/ci-status.md b/crypto/openssh/.github/ci-status.md
index 6e9c50c06d76..982f52428269 100644
--- a/crypto/openssh/.github/ci-status.md
+++ b/crypto/openssh/.github/ci-status.md
@@ -8,6 +8,11 @@ master :
 [![Coverity Status](https://scan.coverity.com/projects/21341/badge.svg)](https://scan.coverity.com/projects/openssh-portable)
 <br>
 
+10.5 :
+[![C/C++ CI](../../../actions/workflows/c-cpp.yml/badge.svg?branch=V_10_5)](../../../actions/workflows/c-cpp.yml?query=branch:V_10_5)
+[![VM CI](../../../actions/workflows/vm.yml/badge.svg?branch=V_10_5)](../../../actions/workflows/vm.yml?query=branch:V_10_5)
+[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_10_5)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_10_5)
+
 10.4 :
 [![C/C++ CI](../../../actions/workflows/c-cpp.yml/badge.svg?branch=V_10_4)](../../../actions/workflows/c-cpp.yml?query=branch:V_10_4)
 [![VM CI](../../../actions/workflows/vm.yml/badge.svg?branch=V_10_4)](../../../actions/workflows/vm.yml?query=branch:V_10_4)
diff --git a/crypto/openssh/.github/configs b/crypto/openssh/.github/configs
index ece6441b1617..b5eb22473dd2 100755
--- a/crypto/openssh/.github/configs
+++ b/crypto/openssh/.github/configs
@@ -374,6 +374,9 @@ case "$host" in
 	*-darwin22.*)
 		# sudo -S nobody doesn't work on macos 13 for some reason.
 		SKIP_LTESTS="agent-getpeereid" ;;
+	*-apple-darwin25.*|*-apple-darwin26.*|*-apple-darwin27.*)
+		# This test fails, skip until debugged.
+		SKIP_LTESTS="scp3" ;;
 	esac
 	;;
 *-solaris2.10)
diff --git a/crypto/openssh/.github/pin_actions.sh b/crypto/openssh/.github/pin_actions.sh
index 8b64e823827e..2a9f49894a2e 100755
--- a/crypto/openssh/.github/pin_actions.sh
+++ b/crypto/openssh/.github/pin_actions.sh
@@ -33,3 +33,6 @@ done
 
 # Output actions for allowlist.
 awk 'BEGIN{IFS=":"} /^ +uses:.*@/{print $2","}' workflows/*.yml | sort -u
+echo
+echo "Update allowlist at https://github.com/organizations/openssh/settings/actions"
+echo "Don't remove any old entries that might be in use by release branches."
diff --git a/crypto/openssh/.github/setup_ci.sh b/crypto/openssh/.github/setup_ci.sh
index 8cbe9fd429cd..c706be9bf659 100755
--- a/crypto/openssh/.github/setup_ci.sh
+++ b/crypto/openssh/.github/setup_ci.sh
@@ -59,6 +59,7 @@ EOD
 	;;
 *)
 	PACKAGER=apt
+	PACKAGES="libcrypt-dev"
 esac
 
 TARGETS=${config}
@@ -140,7 +141,6 @@ for TARGET in $TARGETS; do
 	;;
     sk)
 	INSTALL_FIDO_PPA="yes"
-	PACKAGES="$PACKAGES libfido2-dev libu2f-host-dev libcbor-dev"
 	;;
     selinux)
 	PACKAGES="$PACKAGES libselinux1-dev selinux-policy-dev libaudit-dev"
@@ -203,7 +203,9 @@ done
 if [ "yes" = "$INSTALL_FIDO_PPA" ]; then
     sudo apt update -qq
     sudo apt install -qy software-properties-common
-    sudo apt-add-repository -y ppa:yubico/stable
+    # Not all release+arch combinations have this, so optionally install.
+    (sudo apt-add-repository -y ppa:yubico/stable && \
+	sudo apt install libfido2-dev libu2f-host-dev libcbor-dev) || true
 fi
 
 tries=3
diff --git a/crypto/openssh/.github/workflows/c-cpp.yml b/crypto/openssh/.github/workflows/c-cpp.yml
index 8f5e80668e9f..049f95f80f59 100644
--- a/crypto/openssh/.github/workflows/c-cpp.yml
+++ b/crypto/openssh/.github/workflows/c-cpp.yml
@@ -28,11 +28,16 @@ jobs:
         target:
           - ubuntu-22.04
           - ubuntu-latest
+          - ubuntu-26.04
           - ubuntu-22.04-arm
           - ubuntu-24.04-arm
+          - ubuntu-26.04-arm
           - macos-14
           - macos-15
           - macos-15-intel
+          - macos-26
+          - macos-26-intel
+          - xcode-27
           - windows-2022
           - windows-2025
         config: [default]
@@ -120,6 +125,8 @@ jobs:
           - { target: ubuntu-24.04-arm, config: kitchensink }
           - { target: macos-14, config: pam }
           - { target: macos-15, config: pam }
+          - { target: macos-26, config: pam }
+          - { target: xcode-27, config: pam }
     runs-on: ${{ matrix.target }}
     env:
       EPHEMERAL_VM: yes
@@ -172,7 +179,7 @@ jobs:
       run: sh -c 'SUDO="$(which sudo 2>/dev/null)"; $SUDO chown -R "${LOGNAME}" regress'
     - name: show logs
       if: failure()
-      run: sh -c "for i in regress/failed*.log; do echo ====; echo logfile $i; echo =====; cat $i; done"
+      run: sh -c 'for i in regress/failed*.log; do echo ====; echo logfile $i; echo =====; tail -50 $i; done'
     - name: save logs
       if: failure()
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # main
diff --git a/crypto/openssh/.github/workflows/selfhosted.yml b/crypto/openssh/.github/workflows/selfhosted.yml
index 02d768018c85..b407d8645ceb 100644
--- a/crypto/openssh/.github/workflows/selfhosted.yml
+++ b/crypto/openssh/.github/workflows/selfhosted.yml
@@ -40,11 +40,13 @@ jobs:
           - fbsd12
           - fbsd13
           - fbsd14
+          - fbsd15
           - nbsd3
           - nbsd4
           - nbsd8
           - nbsd9
           - nbsd10
+          - nbsd11
           - obsd51
           - obsd67
           - obsd72
@@ -84,9 +86,11 @@ jobs:
           - { target: fbsd12, config: pam, host: libvirt }
           - { target: fbsd13, config: pam, host: libvirt }
           - { target: fbsd14, config: pam, host: libvirt }
+          - { target: fbsd15, config: pam, host: libvirt }
           - { target: nbsd8,  config: pam, host: libvirt }
           - { target: nbsd9,  config: pam, host: libvirt }
           - { target: nbsd10, config: pam, host: libvirt }
+          - { target: nbsd11, config: pam, host: libvirt }
           - { target: omnios, config: pam, host: libvirt }
           # ARM64 VMs
           - { target: obsdsnap-arm64, config: default, host: libvirt-arm64 }
@@ -94,10 +98,10 @@ jobs:
           - { target: win10, config: default,        host: persist-win10 }
           - { target: win10, config: cygwin-release, host: persist-win10 }
           # Physical hosts with native runners.
-          - { target: ARM, config: default, host: ARM }
           - { target: ARM64, config: default, host: ARM64 }
           - { target: ARM64, config: pam, host: ARM64 }
           # Physical hosts with remote runners.
+          - { target: debian-arm, config: default, host: remote-debian-arm}
           - { target: debian-riscv64, config: default, host: remote-debian-riscv64 }
           - { target: openwrt-mips, config: default, host: remote-openwrt-mips }
           - { target: openwrt-mipsel, config: default, host: remote-openwrt-mipsel }
diff --git a/crypto/openssh/.github/workflows/upstream.yml b/crypto/openssh/.github/workflows/upstream.yml
index 8a105ce6844f..d40b509fd879 100644
--- a/crypto/openssh/.github/workflows/upstream.yml
+++ b/crypto/openssh/.github/workflows/upstream.yml
@@ -54,7 +54,7 @@ jobs:
         esac
         vmrun "echo $o | sudo tee -a /etc/mk.conf"
     - name: update netcat
-      run: vmrun "cd /usr/src/usr.bin/nc && make clean all && sudo make install"
+      run: vmrun "cd /usr/src/usr.bin/nc && make clean all && sudo make install || true"
     - name: make clean
       run: vmrun "make -C /usr/src/usr.bin/ssh obj clean && make -C /usr/src/regress/usr.bin/ssh obj clean && sudo chmod -R g-w /usr/src /usr/obj"
     - name: make
diff --git a/crypto/openssh/.github/workflows/vm.yml b/crypto/openssh/.github/workflows/vm.yml
index 8906557cd8c8..1dfcfbcc3678 100644
--- a/crypto/openssh/.github/workflows/vm.yml
+++ b/crypto/openssh/.github/workflows/vm.yml
@@ -161,19 +161,19 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - "9.0"
           - "9.4"
           - "10.0"
           - "10.1"
+          - "11.0"
         config: [default]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # main
+    - uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # main
     - name: autoreconf
       run: sh -c autoreconf
 
     - name: start NetBSD ${{ matrix.target }} VM
-      uses: vmactions/netbsd-vm@99816dccf75edf233ed6cd00a159e3a5b85ea373 # v1
+      uses: vmactions/netbsd-vm@00081e82b14bc40114eb97f32b4455306828516b # v1
       with:
         release: ${{ matrix.target }}
         usesh: true
@@ -181,7 +181,7 @@ jobs:
         copyback: false
         prepare: |
           case "$(uname -r)" in
-          9.*) export PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/9.0_2026Q1/All" ;;
+          9.*) export PKG_PATH="http://archive.NetBSD.org/pub/pkgsrc-archive/packages/NetBSD/$(uname -p)/9.0_2026Q1/All" ;;
           esac
           timeout 600 /usr/sbin/pkg_add sudo || /usr/sbin/pkg_add sudo
           openssl rand -base64 9 >$GITHUB_WORKSPACE/regress/password
diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog
index 96c2e27b87cc..d1af5c837b3a 100644
--- a/crypto/openssh/ChangeLog
+++ b/crypto/openssh/ChangeLog
@@ -1,11732 +1,11957 @@
-commit 77337b8a6d05324dc86a42f1cb0f60b04fc60529
+commit fdda125f5349558c17ef572f2afced1980b7d208
 Author: Damien Miller <djm@mindrot.org>
-Date:   Tue Aug 11 12:21:59 2026 +1000
+Date:   Tue Oct 6 19:01:18 2026 +1100
 
-    depend
+    .depend
 
-commit 772a5b728e404f5d992fe6e3c7994e44f7f1ace3
+commit ce43722bcc9f5426c6469ae06527b809a9cb8920
 Author: Damien Miller <djm@mindrot.org>
-Date:   Tue Aug 11 12:21:12 2026 +1000
+Date:   Tue Oct 6 18:57:28 2026 +1100
 
-    update version
+    update RPM spec files
 
-commit bd714fadddcafe44fd572b79656a591110cff048
+commit b27b24bd295594816adcc979788eca001140532c
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 10 23:28:15 2026 +0000
+Date:   Mon Oct 5 09:54:05 2026 +0000
 
-    upstream: add regress test for servers that hang durig banner write;
-    
-    from Thomas Yiu
+    upstream: openssh-10.6
     
-    OpenBSD-Regress-ID: 86a25553c75bddc6fc239dc272aca97c61047d22
+    OpenBSD-Commit-ID: 907104c6a6e058860522bf752663d71b37bfa43f
 
-commit 7e5b75aacee593ade47ba030f4778c3b9bf78787
-Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 10 23:27:30 2026 +0000
+commit 1058092dba9145325a5f50793570fc754b375c3d
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sat Oct 3 05:08:49 2026 +0000
 
-    upstream: openssh-10.5
+    upstream: Add test for proxycommand percent expansions.
     
-    OpenBSD-Commit-ID: 047bc46c0a58babdf702e01b8ffc7728d404cb9c
+    OpenBSD-Regress-ID: be34cb5cf08f1025413df248cb7a65e18ca3e2a1
 
-commit d535299b891962f72b875afa6878ccbffdd022a3
+commit 630144f410985ce9bad03929556b3c364bc0e255
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 10 23:27:04 2026 +0000
+Date:   Wed Sep 23 21:45:51 2026 +0000
 
-    upstream: remove ml-dsa/x25519 from the default algorithm list for
-    
-    release (it will be back soon)
+    upstream: backout regress bits related to multiplexing change
     
-    OpenBSD-Commit-ID: 2466825e05a2cae6b0cb5fa34f39792a0b5a46d3
+    OpenBSD-Regress-ID: 3fdaea9d640ce1d4950223b66f26f6f1ab46f4c9
 
-commit 407a2b79d439b1272879a910db6c94d1165075a8
-Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 10 23:24:03 2026 +0000
+commit ac6ad1afd1c3531fad2e96a00c84bd9867cf5561
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 6 16:48:54 2026 +1100
 
-    upstream: make reading server banner non-blocking; prevents one
+    remove the --disable-fd-passing configure option
     
-    stuck server from blocking a many-host keyscan; from Thomas Yiu
+    Also add a deprecation warning when the lack FD passing support and also
+    requires root for the post-auth sshd-session process
+
+commit b37c095aa39bb2c01754673dec50a684a536db24
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 6 16:43:39 2026 +1100
+
+    disable features when post-auth sshd runs as root
     
-    ok dtucker@ markus@
+    On platforms that require root privilege for the post-authentication
+    sshd-session process (e.g. OpenServer 5, QNX 6), disable and restrict
+    a number of features that assume user privilege.
     
-    OpenBSD-Commit-ID: 4970af00975119ebf9c1e0e132e3317b72ac0c2e
+    This includes GatewayPorts, StreamLocalForwarding and -R forwardings
+    binding to ports <1024
 
-commit 64ede7991d9e2021d84fb3eb89ed1dd1c2a1179e
+commit 4b29da5952b1ede28f0d225cf722dee4923ba04c
 Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Sat Aug 8 21:14:57 2026 +1000
+Date:   Mon Oct 5 17:08:15 2026 +1100
 
-    Use clang-20 when building hardenedmalloc for tests.
+    Don't automatically enable FORTIFY_SOURCE.
     
-    Some versions of clang-19 report:
-    error: invalid feature combination:  +avx10.1-256; will be promoted to
-    avx10.1-512 [-Werror,-Winvalid-feature-combination]
+    It can cause problems on some platforms, in particular NetBSD <11 since
+    it will cause function pointer comparisons in atomicio to fail and some
+    things including scp to hang.  Previously we had a workaround but that
+    was removed in a765b86d.  See NetBSD bug 45200 and pkgsrc bug pkg/60563.
 
-commit 05ec77c14b9143b4d49f05a8dcd1366a92b9024e
-Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Sat Aug 8 07:27:54 2026 +0000
+commit 0c4c9a7b320bd7ff61c4a2dc345cb2e27e9663b2
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Oct 5 06:03:40 2026 +0000
 
-    upstream: remove mlkem768brainpoolp256r1-sha256; requested by
+    upstream: Further restrict the characters allowed in a command-line
     
-    markus
+    supplied user name, disallowing '$' and '\'. Reported by SecBuddyF KeenLab
+    Tencent (CodeBuddy Security).
     
-    OpenBSD-Commit-ID: 0fcb5943abe5476e42983dcfc4c400e39e5db6a7
+    OpenBSD-Commit-ID: 13671c178f492af63b5c1296f284818c7809ed9a
 
-commit 08d9155d6eefd8f7bccd07140af1d67b94e67bb8
-Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Sat Aug 8 07:25:55 2026 +0000
+commit 15289cc38956aa74d4947174a68c10ac9ad2157f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Oct 3 17:20:09 2026 +1000
 
-    upstream: move comment to a better place; suggested by markus@
+    Remove NetBSD 9.0 test target.
     
-    OpenBSD-Commit-ID: 451ba42a5dc88723a0b8837d4583957f18edbf40
+    It can no longer install the sudo package and is covered by the
+    selfhosted VMs.
 
-commit 72ed5241a8cf465d7a45035dedf1baa74ad6c3f7
-Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Fri Aug 7 05:49:53 2026 +0000
+commit 4f4bee9ec673b29949ec0e79c92cd56b61f772e6
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Oct 3 17:12:13 2026 +1000
 
-    upstream: add some options to allow setting or clearing the
+    Replace native ARM runner with remote runner.
     
-    touch-required and verify-required flags on FIDO private keys when resetting
-    the passphrase.
+    Native ARM32 runners are no longer supported by Github.
+
+commit e0f28caca5a77e84bef02c9f6476d2d4bd31b937
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Oct 3 16:18:30 2026 +1000
+
+    Pull older NetBSD sudo package from archive.
+
+commit d1d37e27a14f3336e36666d59c4b3e1c76cce328
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Oct 3 00:46:58 2026 +0000
+
+    upstream: make StreamLocalBindMask properly first-match-wins;
     
-    feedback/ok tb@
+    spotted while fixing bz4013
     
-    OpenBSD-Commit-ID: 8895e62eae5778711fe7dd6c09f8679acb2e6674
+    OpenBSD-Commit-ID: 35ef4524da0d03a439751f7bcd4847f76d93ec7f
 
-commit 6a57081dc35acf3ee298108d4bc3580489608d5f
+commit bc00e06e0cda509c06b47ee4d1551efc904894a1
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Fri Aug 7 05:18:05 2026 +0000
+Date:   Sat Oct 3 00:46:29 2026 +0000
 
-    upstream: Allow session-bind@openssh.com requests when the agent is
+    upstream: make StreamLocalBindMask properly respect Host/Match
     
-    locked, otherwise forwarding sessions established with an agent was locked
-    will be treated as local, rather than remote.
-    
-    Reported by sn0x-sharma
+    blocks and make it first-match-wins as documented. bz4013
     
-    OpenBSD-Commit-ID: 524f210c6f2b3a06e0a2f6d0af5188a9a75fa2c7
+    OpenBSD-Commit-ID: e2efc85b42bbf7067ece4f1ab12d7d02ec6c3e12
 
-commit 9910d5ef53124ce1157d57bc11e222658aa41299
+commit 87f0cd1892e501f835dd210abea5461807c8deba
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Fri Aug 7 05:03:56 2026 +0000
+Date:   Thu Oct 1 07:10:56 2026 +0000
 
-    upstream: avoid potential realloc use-after-free in the client if a
+    upstream: start process of deprecating the -R flag. This was the
     
-    remote forwarding is added via the local session multiplexing socket while a
-    remote forwarding open request is pending with the server.
+    old way of performing a remote-to-remote copy that was basically executed scp
+    on the remote host. It barely worked (needing agent forwarding enabled or
+    usable credentials on the remote host) and has largely been replaced by a
+    better SFTP-protocol remote-to-remote copy that runs through the host
+    performing the copy.
     
-    Report and fix from Brian Mingus of Cognatory
+    We'll disable this option in a release or two; ok dtucker@
     
-    OpenBSD-Commit-ID: c7888d566576386d0e96859f9ec7310a1e2d3609
+    OpenBSD-Commit-ID: dc273300651e581c3db18edf21f2b05ceac60fd7
 
-commit 388390148359da911f77e8d1d7377f46c412a9d8
-Author: naddy@openbsd.org <naddy@openbsd.org>
-Date:   Tue Aug 4 22:47:07 2026 +0000
+commit 88fe0b074ee0c0cdf6d87f8b86b4c959e7d2bdbc
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 1 07:08:05 2026 +0000
 
-    upstream: fix up synopsis and tweak wording for -Z
+    upstream: mention default KDF rounds is now 32
     
-    OpenBSD-Commit-ID: 7f0f8e7f610f6af6890cb10915bf316f23651505
+    OpenBSD-Commit-ID: 0d17bf0ad02c8c0d897d9d01d1e4eb0f65ea749c
 
-commit e6ece1bc262c067416483502c45b9fd7366f347c
-Author: naddy@openbsd.org <naddy@openbsd.org>
-Date:   Tue Aug 4 22:14:52 2026 +0000
+commit f938c78d490cb7556aa8ca1625e9b9bd1f963ed3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 1 07:07:49 2026 +0000
 
-    upstream: document existence of
+    upstream: Implement a maximum number of KDF rounds that will be
     
-    mlkem768{brainpoolp256r1,nistp256}-sha256 KEXes
+    accepted when writing an OpenSSH-format private key or when loading one. This
+    limit is set pretty high (1<<20), but ensures that a service that is passed a
+    bad key with an ridiculously high number of rounds will _eventually_ complete
+    parsing it.
     
-    OpenBSD-Commit-ID: e9a9b01a19ed3ccdd82c7fc4c77395495b28faf9
-
-commit 4c414d99f3a8c2b3d24ee8448b8a388446531ebb
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Thu Aug 6 23:30:30 2026 +1000
-
-    Re-allow PAMServiceName inside a Match block.
+    Also bump the default number of KDF rounds from 24 to 32 (this is a
+    linear increase, not like bcrypt(3) which is exponential).
     
-    This is documented to be allowed, and was up until 10.4p1 when a
-    transcription error in the config handling rework reverted it to
-    global-only, ie not allowed inside Match.  bz#3987.
+    Pointed out by Aris Adamantiadis
+    
+    OpenBSD-Commit-ID: 843ff37b066b2879f4579a784e42a3c9d22b2ddc
 
-commit 5adaaa7781d86dde2f099b3944f08d57aa65107f
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Tue Aug 4 22:20:47 2026 +1000
+commit 39b9bd1cb7d32428842c67e7e8b217027c16962b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 1 04:17:39 2026 +0000
 
-    Rerun VM tests on regress Makefile change too
+    upstream: fix the bit length of ML-DSA 44/Ed25519 keys that was
+    
+    being incorrectly reported as 256. The private key length for these composite
+    keys is 512 bits. This value is only used for display.
+    
+    Spotted by Yiyue Wang
+    
+    OpenBSD-Commit-ID: 5ba7c8a9a457434ca0652042e1c5940bbc6ef5e0
 
-commit b1000abf541dd4c7378c2211b49e98ded968ef13
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Tue Aug 4 14:23:59 2026 +1000
+commit c07ea2180adebd6019a6ebdd89becb9d9f4b4897
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 1 03:11:49 2026 +0000
 
-    Run tests on regress Makefile changes too.
+    upstream: sftp: be stricter in accepting paths returned by the
+    
+    server for SSH_FXP_REALPATH or SSH2_FXP_READDIR replies, as these can be used
+    in some situations to decide the destination path for recursive transfers.
+    
+    Report and patch from Junghoon Cho
+    
+    OpenBSD-Commit-ID: ad357002a1b75c87113f01086a9f0c12c36082d8
 
-commit b8b12ca0653df9130cd61fb3ff37e57d2d8c9f2d
+commit 39cba820eda49ea084c9270917dfb5efc03f08cc
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Tue Aug 4 02:48:00 2026 +0000
+Date:   Thu Oct 1 02:01:51 2026 +0000
 
-    upstream: disable pubkey-priority test until I can fix it to not pick
+    upstream: handle max-pk-ok path identically when the incoming user
     
-    up the user's keys from ~/.ssh
+    is invalid; avoids max-pk-ok feature presenting a username validity oracle
     
-    OpenBSD-Regress-ID: 5295a8cefe1d2def5c8b10f9d60d9bb7a350d316
+    analysis and patch from Chris Rohlf in collaboration with Claude and
+    Anthropic Research
+    
+    OpenBSD-Commit-ID: c05d01b1724c76c9e30ed5e0f06686820f94bce8
 
-commit d5dc50020f3a9c09a99915f7dd95373e4f9986a0
+commit e27b6cc2e6e8ba03808f7078740e5ba800515d4d
 Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date:   Mon Aug 3 23:22:23 2026 +0000
+Date:   Sun Sep 27 22:39:40 2026 +0000
 
-    upstream: Fix expected output for implicit ordering test. ok djm@
+    upstream: Disallow nul byte in received scp -O filename. Not
     
-    OpenBSD-Regress-ID: 3ba8907d381fb738578ba2090d4b2f22d35a555a
-
-commit 265336a702d6a4a117889f2fe281e8f2bbb7e0ef
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Mon Aug 3 22:15:07 2026 +1000
-
-    Don't enable Brainpool on AWS-LC or BoringSSL.
+    reachable in normal operation since a nul would cause a filename mismatch,
+    but potentially possible if being used an unusual configuration such as a
+    custom filter.
     
-    These fail at runtime, so disable until we figure out why.
-
-commit b5ad8c3b1f22831dc2a16bfac9e92916c8d0e4ec
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Mon Aug 3 22:06:26 2026 +1000
-
-    Correct filename in comment.
+    Reported by Chua Wei Xun <weixun.chua at e-cq.net>, ok djm@
+    
+    OpenBSD-Commit-ID: 1fb35933acdc11dd66bdba780bd9e100bda69079
 
-commit 7d6170c00ec7bab059742370f92144b155bdb191
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Mon Aug 3 21:18:48 2026 +1000
+commit fc6ca48d15419f23a6a2ea3c0115b8f32c3dcc69
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 23 21:42:39 2026 +0000
 
-    Fix OpenSSL ECC detection message.
+    upstream: backout
+    
+    > avoid race between multiple processes attempting to
+    >
+    > establish multiplexing control socket by moving socket creation earlier in
+    > ssh(1)'s life. Patch from Jens Rosenboom via bz3971
+    
+    It caused problems with ControlPersist sessions.
+    
+    Reported by semarie@ job@
+    
+    OpenBSD-Commit-ID: b78a34d605c47cb145e16a3bba295caa0e9db680
 
-commit e766b76b6112c9327f73b834af00e00da13ab981
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Mon Aug 3 18:19:58 2026 +1000
+commit e0f85d83ccc15b1b218fa8a000fc29a2e3d2defd
+Author: job@openbsd.org <job@openbsd.org>
+Date:   Tue Sep 22 22:51:43 2026 +0000
 
-    Make EC_KEY_METHOD_new optional again.
+    upstream: Check that compressed payloads don't inflate beyond the
     
-    The change making ECC required also incorrectly made EC_KEY_METHOD_new
-    required, causing builds with BoringSSL to fail.
+    maximum payload length
+    
+    From a report by Oleh Konko (1seal)
+    
+    OK djm@
+    
+    OpenBSD-Commit-ID: a0d3e7aa432777c28bfe23e5447ac117d6c151d9
 
-commit e47a744c8b7051c56a9e46b487f68f1f803fe804
+commit ed67a24515aa65fded1e10426198a4251f836338
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 3 06:53:11 2026 +0000
+Date:   Tue Sep 22 22:30:27 2026 +0000
 
-    upstream: crank up MaxAuthTries to avoid failures here
+    upstream: ssh-agent: no unlink(2) on empty filename
     
-    OpenBSD-Regress-ID: 052b0c4cc8bd6ea2679fbc9f96f4cb7f48c73035
+    from markus@ ok me
+    
+    OpenBSD-Commit-ID: 7a517a64389e389e5d23f781d1762c2b6aaffe98
 
-commit 129f5ac61f8b90639dedb264947153d1c4b9acf5
+commit d4ed84e4cb15305d763a3acb16d8cf8693c65840
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 3 06:52:50 2026 +0000
+Date:   Tue Sep 22 22:29:27 2026 +0000
 
-    upstream: regression test for pubkey ordering in the client; ok
+    upstream: ssh-agent: fix socket cleanup for -a option (no pathspec)
     
-    dtucker
+    from markus@ ok me
     
-    OpenBSD-Regress-ID: e55fa977be300307e6e03a001716b3dce8faa1a1
+    OpenBSD-Commit-ID: 3194c1ed609eaa05932b9f6036ace7561e140627
 
-commit 6fe6ab77daa4472d0243580e355e0674a95b8acb
-Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 3 06:50:49 2026 +0000
+commit 1d5340fce24526719e32aebc4c721fc228182ace
+Author: job@openbsd.org <job@openbsd.org>
+Date:   Tue Sep 22 04:38:09 2026 +0000
 
-    upstream: Tweak ordering of certificates tried during pubkey
+    upstream: Disable LZ77 dictionary coder to avoid a potential
     
-    authentication to prefer FIDO keys that do not require user presence (touch)
-    first, followed by ones that do and with FIDO keys that require user
-    verification via PIN or biometrics last.
+    side-channel leak
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
     
-    This effectively tries low-friction authenticators before higher
-    friction authenticators.
+    A chosen-plaintext attack method exists which makes use of
+    dictionary-based compression to recover secrets from one channel by
+    interacting with the SSH session's shared compression dictionary through
+    another channel.
     
-    ok dtucker@
+    Attacker-controlled input can recognizably reflect into the total length
+    of transmitted ciphertexts by virtue of LZ77 replacing repeated strings
+    with back-references into the SSH session's encoder search buffer,
+    which is shared across all channels. For this reason, the documentation
+    already recommended against enabling compression for connections that
+    share trusted and untrusted traffic.
     
-    OpenBSD-Commit-ID: 067076c652dbb4f2aa89c6e82b19d8cbfec1d1be
+    As an extra precaution, use only Huffman coding when compressing
+    plaintexts, as this algorithm does not use a dictionary. But, this
+    results in a reduction of compression effectiveness.
+    
+    Inspired by "Crossing the Streams: SSH Plaintext Recovery via a Common
+    Compression Context in Multiplexed Channels." by Fabian Bäumer and
+    Marcus Brinkmann, preprint https://arxiv.org/abs/2609.07709 (2026)
+    
+    OK djm@ dtucker@
+    
+    OpenBSD-Commit-ID: 839e5e53ad76786d0e90bed530304e4e13acbba0
 
-commit 29f1b46e0f6fb4aba9ae34e4b46532b5748f395e
+commit ccc26c76cd47ca224ff5e4ef8b96007b65ff0b4e
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 3 06:47:24 2026 +0000
+Date:   Tue Sep 22 03:26:32 2026 +0000
 
-    upstream: Add a "ssh -Z user@host" mode that dumps the pubkeys that
-    
-    will be tried for authentication in the order that they will be used.
+    upstream: check ssh's handling of stale multiplexing sockets From Jens
     
-    feedback tb@ ok dtucker@
+    Rosenboom
     
-    OpenBSD-Commit-ID: 617a7f149d1410980eac551e4780280190a5f218
+    OpenBSD-Regress-ID: 875302cf1f6546fe316ef7ca6f2cf24be12ad23f
 
-commit 2aee73ed90b3b47d0dd86875989003f0982ccf22
+commit 2a72e9755bdd63c3a4b6a25437a63e8b5eef23a4
 Author: djm@openbsd.org <djm@openbsd.org>
-Date:   Mon Aug 3 06:43:16 2026 +0000
+Date:   Tue Sep 22 03:22:00 2026 +0000
 
-    upstream: fix ML-KEM/ECDH interop problem (does not affect
+    upstream: avoid race between multiple processes attempting to
     
-    mlkem768x25519-sha256) from markus@
+    establish multiplexing control socket by moving socket creation earlier in
+    ssh(1)'s life. Patch from Jens Rosenboom via bz3971
     
-    OpenBSD-Commit-ID: 9c72e9c0407906bb7d5fb16648b38282676391e9
+    ok naddy dtucker
+    
+    OpenBSD-Commit-ID: 8361fb1cd20668216e06c9ba7b4ce72b2ba56fb7
 
-commit ec0485632885e0c533b35e5970e4b583781db83f
-Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Sat Aug 1 12:10:40 2026 +1000
+commit 941d7632096abd37bb10826cf8f08c5cfb99ccc4
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Sep 22 00:24:47 2026 +0000
 
-    Require NISTP521 in libcrypto.
+    upstream: Include local and remote versions in ~I connection info.
     
-    Previously we supported building without NISTP521 in libcrypto since
-    some vendors shipped without it, but this now seems uncommon. This
-    removes that support, requiring a fully functional libcrypto.
+    ok job@ djm@.
     
-    This removes another set of diffs vs upstream and should reduce the
-    maintenance burden.  ok djm@
+    OpenBSD-Commit-ID: 8cc5d41e5e034e86de66c1e3bfda52c95f0e1c52
 
-commit e416edf1b2b58b0195714bafbec614f85ebd7768
+commit a765b86d03c442bfbe1144ac4f180c8ff9f543c4
 Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Fri Jul 31 21:32:53 2026 +1000
+Date:   Tue Sep 22 11:44:31 2026 +1000
 
-    Remove support for libcrypto w/out ECC.
-    
-    Since 2010, we have supported building against an OpenSSL that did not
-    have any ECC support, since at the time many systems still shipped with
-    OpenSSL versions prior to ECC being added.  We no longer support OpenSSL
-    versions that old, and while it's possible to build a modern libcrypto
-    without ECC, doing so seems very uncommon.
-    
-    Having OPENSSL_HAS_ECC sprinkled throughout the code increases the
-    cost of syncing changes and is a maintenance burden, so this has now
-    outlived its usefulness and is being removed.  It is still possible to
-    build --without-openssl on such systems if required.
+    Remove the NetBSD BROKEN_READ_COMPARISON workaround.
     
-    This includes a few whitespace and header order changes to bring
-    Portable back into sync with OpenBSD in those places, and removes the
-    corresponding test.
+    It does not seem to be needed on current versions, and it can cause
+    pre-auth CPU spinning now that we're using atomicio() in the banner
+    exchange.  ok djm@
+
+commit a5094d4ec9046d5e0a26eb040ce69f05b61f535b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Sep 20 18:06:27 2026 -0600
+
+    Ignore build/install status of netcat in tests.
     
-    ok djm@
+    If it fails (such as right now, since the hosts are missing a header
+    change) but the old binary works for our purposes we can still run the
+    tests we care about.
 
-commit 15d1832b5e1248da3577ea1a7c5e636cd16067e0
+commit ffdb78080ffd97ccbb0a7af6737407e6963f362d
 Author: Darren Tucker <dtucker@dtucker.net>
-Date:   Thu Jul 30 22:15:46 2026 +1000
+Date:   Sun Sep 20 15:46:31 2026 -0600
 
-    Add includes.h for compat interfaces.
+    Add FreeBSD 15 test targets.
 
-commit d8140f07061ad3460cd0d167c23781d79a961ccd
-Author: brynet@openbsd.org <brynet@openbsd.org>
-Date:   Thu Jul 30 07:40:48 2026 +0000
+commit eabf1987de772f0f2d772fd6bd72b4c84d0ab780
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Sep 20 01:05:55 2026 +0000
 
-    upstream: Use ssh_mldsa44_ed25519_cleanup consistently to avoid
-    
-    calling freezero with the wrong size.
-    
-    With help from tb@
+    upstream: Better wording.
     
-    ok tb, dtucker@
+    OpenBSD-Commit-ID: d8594787882a3cced845333bed4d222cc2427f1e
+
+commit 62ed23d2f79616f86881da7d5e114b14bed7decc
*** 33873 LINES SKIPPED ***