From nobody Wed Nov 11 21:40:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jPxln6krVz6xrFF for ; Wed, 11 Nov 2026 21:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPxln62fcz4cWJ for ; Wed, 11 Nov 2026 21:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794433253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkXR3KKm7VRwaA+MzcTOHBnsjyPVI34jrepPXG+X+2c=; b=dqbRe101PTimhsslhTDEHBNDBpFvB1ak5PzdhutzLChdu9Gr7CGAnCnT17R75Kmc5cOP// QO3jP/PKSVH04s29BqVhMN/x7gKRR6BoOl58tvRmM0nLsyjdYRj/W87v0mJ37nGWWhBhQG 6DhAz2dli3TLMLZIDJtS1MYPUU6r2OVdm03iYohyQaZmx23fl4SqVnJziCrxmTVH1bkaCJ PeuumsbrKHKEHv1xIShUapFogCWr+1BXnb5Cn4yJwAiJd0HZkQKc6HgRBISyborBHJt4rv O7NUiclsDgkPjVwzN+vqBAKNTqocdwsrKVH814TAocdhZbeeZaL/QEeJ4HhQUw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794433253; b=sQsK0Cwc0RDaBfW/lbnmM/sKVWOqgAf/GcDYfTOt5w4Cb1E2aoJ2FEQCP+O9sBgMOC9lHo 2+9E1yg8YDvdzwDqwqh36sG60bP8ZkXfzLajshLVp2t2cgMvonIzXttT6wVIQgP9T0vOEj t95P9Yly34fEAixkGbOYQ0mufKI9h20wXxYT7Js917X/cNmDE3ONKqZ4a2x7K4LU4WUAcR bAS10qXZ8qenzzOya8jgKC8tkhDkQeo5XyWODXHTKIWfT91DO2lUrN68bQ7FluefdvDKfj Msyg4jWkPKHU+SYyhN4kGv51VceyzvenycuAhNsKZ93Hd5j7jg/Kj/wxhEavbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794433253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkXR3KKm7VRwaA+MzcTOHBnsjyPVI34jrepPXG+X+2c=; b=SbF42QV3gCxxr+s1rK8nETfdAfoqpISi+MZfyR13xhyiAkR0+vX+hfBeo72l4VVtpu2zvD lbRiporQ+v7fkrFkrzPQ2JjPUfkmQXuFrm0cSxSLNkRwfWlQYXL1wPrtoltqopCHk65e3G hGB8hCYPvBQVWfKSXZnCxmmxP/EoBlRA/g22Q41vniFqaYpmw/puy5pXny5widWE2Lzj+s IdCx14UzVHwJ79YogLNYc1fvCLlzdbJZbKChbLqdx2Iqwtytd8m801ODVbBfpstdnVGmnC BNhPm0qAsntHWRsYwgCz9c5qKeFQwYNraKpXi/BtYFiWA4nWC/egoMn4GJV1WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPxln5k1CzXtS for ; Wed, 11 Nov 2026 21:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 152fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 21:40:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Osvaldo Janeri Filho From: Ed Maste Subject: git: 55ede03fc24a - stable/15 - ssh: use defaultkey sentinel for ML-DSA-44 default host key List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 55ede03fc24aa8de58814563e82e72cf8b34d9cc Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 21:40:53 +0000 Message-Id: <6af4e0e5.152fb.11f56bd6@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=55ede03fc24aa8de58814563e82e72cf8b34d9cc commit 55ede03fc24aa8de58814563e82e72cf8b34d9cc Author: Osvaldo Janeri Filho AuthorDate: 2026-10-20 19:11:32 +0000 Commit: Ed Maste CommitDate: 2026-11-11 21:39:41 +0000 ssh: use defaultkey sentinel for ML-DSA-44 default host key servconf_add_hostkey() compares its file argument to defaultkey by pointer to skip an unreadable default key; the ML-DSA-44 entry passed the "[default]" literal, so the skip (and the "No host key files found" fallback) never applied to it. MFC after: 1 week Reviewed by: emaste Fixes: bb5c77e9d281 ("OpenSSH: Update to 10.4p1") Differential Revision: https://reviews.freebsd.org/D60922 (cherry picked from commit 2d6f961164e4ab7e823972336dc9cfaae6a88ed8) --- crypto/openssh/servconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 06c45557f145..32430e775962 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -338,7 +338,7 @@ fill_default_server_options(ServerOptions *options) _PATH_HOST_ECDSA_KEY_FILE, 0); servconf_add_hostkey(defaultkey, 0, options, _PATH_HOST_ED25519_KEY_FILE, 0); - servconf_add_hostkey("[default]", 0, options, + servconf_add_hostkey(defaultkey, 0, options, _PATH_HOST_MLDSA44_ED25519_KEY_FILE, 0); } if (options->num_host_key_files == 0)