CVS commit: [pkgsrc-2026Q2] pkgsrc/security/openssh

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Jul 16 14:03:21 UTC 2026

Modified Files:
        pkgsrc/security/openssh [pkgsrc-2026Q2]: Makefile distinfo

Log Message:
Pullup ticket #7172 - requested by taca
security/openssh: Security fix

Revisions pulled up:
- security/openssh/Makefile                                     1.293
- security/openssh/distinfo                                     1.131

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Mon Jul  6 16:31:47 UTC 2026

   Modified Files:
        pkgsrc/security/openssh: Makefile distinfo

   Log Message:
   openssh: update to 10.4p1.

   Changes since OpenSSH 10.3
   ==========================

   This release contains a number of security fixes as well as general
   bugfixes and a couple of new features.

   Security
   ========

    * sftp(1): when downloading files on the command-line using
      "sftp host:/path .", a malicious server could cause the file to
      be downloaded to an unexpected location. This issue was identified
      by the Swival Security Scanner.

    * scp(1): when copying files between two remote destinations, do
      not allow a malicious server to write files to the parent
      directory of the intended target directory.  This issue was
      identified by the Swival Security Scanner.

    * sshd(8): when using the "internal-sftp" SFTP server implementation
      (this is not the default), long command lines were previously
      truncated silently after the 9th argument. If a security-relevant
      option was in the 10th or later position, it would be discarded.
      Reported by Steve Caffrey.

    * sshd(8): add a documentation note to mention that the
      GSSAPIStrictAcceptorCheck option is ineffective when the server
      is joined to a Windows Active Directory. Reported by Yarin Aharoni
      of Safebreach.

    * sshd(8): DisableForwarding=yes didn't override PermitTunnel=yes
      as it was documented to do. Note that PermitTunnel is not enabled
      by default. Reported independently by Huzaifa Sidhpurwala of
      Redhat and Marko Jevtic.

    * sshd(8): avoid a potential pre-authentication denial of service
      when GSSAPIAuthentication was enabled (this feature is off by
      default). This was not mitigated by MaxAuthTries, but would be
      penalised by PerSourcePenalties. This was reported by Manfred
      Kaiser of the milCERT AT (Austrian Ministry of Defence).

    * sshd(8): fix a number of cases where the minimum authentication
      delay was not being enforced. Reported by the Orange Cyberdefense
      Vulnerability Team.

    * ssh(1): fix a possible client-side use-after-free if the server
      changes its host key during a key reexchange. This was reported by
      Zhenpeng (Leo) Lin of Depthfirst.

   New features
   ------------

    * All: add experimental support for a composite post-quantum
      signature scheme that combines ML-DSA 44 and Ed25519 as specified
      in draft-miller-sshm-mldsa44-ed25519-composite-sigs.

      This scheme is not enabled by default. To use it, you'll need
      to add it to HostKeyAlgorithms, PubkeyAcceptedAlgorithms, etc.
      Keys may be generated using "ssh-keygen -t mldsa44-ed25519".

    * ssh(1), sshd(8): replace the wildcard pattern matcher with an
      implementation based on an NFA. This avoids exponential worst-case
      behaviour for the old implementation.

   Bugfixes
   --------

    * ssh-agent(1): fix incorrect reply to "query" SSH_AGENTC_EXTENSION
      requests. bz3967

    * sshd(8): avoid sending observably different messages for valid vs
      invalid users in GSSAPIAuthentication (disabled by default).

    * ssh(1), sshd(8): fix several bugs that incorrectly
      classified bulk traffic as interactive. bz3972, bz3958

    * ssh-keygen(1), ssh-add(1): skip unsupported key types when
      downloading resident keys from a FIDO token. Previously, downloads
      would abort when one was encountered. GHPR657

    * ssh(1): fix a potential use-after-free on an error path if
      cipher_init() fails.

    * sshd(8): perform stricter encoding and validation of transport
      state passed between sshd privilege separation subprocesses. This
      somewhat further hardens the server against attacks on sshd-auth
      or sshd-session subprocesses.

    * ssh-agent(1): avoid possible runtime denial of service by
      enforcing some limits on the length of usernames in key use
      constraints.

    * sftp(1): fix two separate one-byte out-of-bounds reads, in
      SSH2_FXP_REALPATH and batch command processing.

    * sftp-server(8): disallow use of the copy-data extension to read
      and write to the same inode simultaneously.

    * ssh(1), sshd(8): avoid strlen(NULL) crash if an X11 channel was
      created before the x11-req SSH_MSG_CHANNEL_REQUEST was sent.
      GHPR679

    * sftp(1), scp(1): avoid a situation where sftp_download() could get
      stuck in a loop if a broken server repeatedly returned zero length
      while reading a file.

    * ssh(1): avoid leaking DNS0x20 case-randomised names into names
      canonicalised using CanonicalizePermittedCNAMEs. bz3966

    * sftp-server(8): avoid truncation of pathnames passed to lstat()
      during SSH_FXP_REALPATH handling on systems where PATH_MAX is not
      the actual max. GHPR688

    * ssh(1), sshd(8): correct arming of poll(2) event masks for some
      socket-type channels. GHPR660

    * sshd(8): major refactor of sshd_config parsing and management
      code, to allow for more exact serialisation/deserialisation across
      privilege separation boundaries.

    * ssh-add(1): open connection to the agent only after getopt()
      processing has completed, to give options like "-v" a chance to
      display debug information about this operation.

    * crypto code: fix bounds checking when signing messages of length
      greater than will fit in a size_t. In OpenSSH, message sizes are
      bounded by SSHBUF_SIZE_MAX so this was unreachable.

    * crypto code: add signature malleability and pubkey validity checks
      to ed25519 verification. SSH doesn't depend on these properties

    * crypto code: fix ECDSA order check for curves with cofactor != 1.
      All supported EC curves have cofactor 1, so this was
      unreachable.

    * sshd(8): differentiate between execution failures and a subsystem
      that was not found when logging why a subsystem failed to start.
      GHPR637

    * All: use safer idioms for timegm(3) and mktime(3) error detection.

    * ssh(1), sshd(8): avoid accepting invalid cipher or MAC lists in
      config files or command-line arguments. This could cause runtime
      failures later.

    * ssh(1): fix NULL deref crash during pubkey auth when using a PEM
      style private key with no corresponding .pub key adjacent to it.

    * sshd(8): don't print an error message when trying to load a host
      private key when PKCS#11 keys are in use, as these don't need the
      private half on the filesystem. GHPR664

    * All: don't use deprecated ERR_load_crypto_strings(). GHPR650

    * ssh(1): properly report errors during configuration default
      setting. GHPR649

    * ssh(1): use correct directive name (Match instead of Host) in
      error message. bz3968

    * sftp(1): fix "ls -ln" which was not correctly showing numeric
      UID/GIDs but rather user and group names. bz3953

    * sshd(8): avoid possible NULL dereference if an allocation fails
      during config parsing. bz3948

    * All: fix ineffective guards against loading overly large public
      keys in several places. bz3969 and bz3970

    * sftp(1): ensure file descriptors used by sftp to communicate to
      its ssh(1) subprocess don't leak into executed subprocesses (e.g.
      via "!"). GHPR693

   Portability
   -----------

    * Sync fmt_scaled.c with OpenBSD upstream, picking up an exactness
      fix for large exponents (GHPR671)

    * sshd(8): remove duplicate sandbox entry for clock_gettime64.

    * ssh(1), sshd(8): use correct IPTOS_DSCP_VA value if not provided
      by the system headers.

    * Sync getrrsetbyname.c with OpenBSD upstream, picking up robustness
      fixes.

    * Disable replacements in openbsd-compat for strvisx(3) and
      stravis(3), as these are unused in OpenSSH

    * Avoid fortify warnings on Android bz3954

    * Fix a number of memory leaks on error paths in the portability
      code. GHPR681

    * Revise the README.privsep documentation to reflect sshd's recent
      switch to a multi-binary model.


To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.292.2.1 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.130 -r1.130.2.1 pkgsrc/security/openssh/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.292 pkgsrc/security/openssh/Makefile:1.292.2.1
--- pkgsrc/security/openssh/Makefile:1.292      Thu Apr  2 10:32:43 2026
+++ pkgsrc/security/openssh/Makefile    Thu Jul 16 14:03:21 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.292 2026/04/02 10:32:43 wiz Exp $
+# $NetBSD: Makefile,v 1.292.2.1 2026/07/16 14:03:21 maya Exp $
 
-DISTNAME=              openssh-10.3p1
+DISTNAME=              openssh-10.4p1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 

Index: pkgsrc/security/openssh/distinfo
diff -u pkgsrc/security/openssh/distinfo:1.130 pkgsrc/security/openssh/distinfo:1.130.2.1
--- pkgsrc/security/openssh/distinfo:1.130      Thu Apr  2 10:32:43 2026
+++ pkgsrc/security/openssh/distinfo    Thu Jul 16 14:03:21 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.130 2026/04/02 10:32:43 wiz Exp $
+$NetBSD: distinfo,v 1.130.2.1 2026/07/16 14:03:21 maya Exp $
 
-BLAKE2s (openssh-10.3p1.tar.gz) = d545521a15ec2a466d0035c441e96336caa9dc0634b66842987c570ec409b424
-SHA512 (openssh-10.3p1.tar.gz) = cb2bd67086491c25e305879b924c3dfa8236502a60c7f250b2fd17d2d9a79ebfc2e40b2f43e42dcf598cc510996e00cc03df9b8e38f34bc2dc71a3d4ff3788fa
-Size (openssh-10.3p1.tar.gz) = 2007369 bytes
+BLAKE2s (openssh-10.4p1.tar.gz) = b564ae804db768051fa4235c0f77352f004dde6dfe87dc67b5f0e3946a0311d1
+SHA512 (openssh-10.4p1.tar.gz) = c49600022a3a3f0f0ba4284072cccbe1088030cd175ea166e08251224712731f97cb1a3f039d19f71714c537ab88b177602be0932bc35a26f3227dc09c43f37c
+Size (openssh-10.4p1.tar.gz) = 2321796 bytes
 SHA1 (patch-Makefile.in) = d58adac52e169f25f0b0c3a321f154b44b0475e6
 SHA1 (patch-configure.ac) = 10894c1b98298a1672ec151a223f6180bf841fa4
 SHA1 (patch-defines.h) = c1dbb18076b4fa399b0f791bb543ef1e5cb0408e