From nobody Wed Nov 11 21:11:27 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 4jPx5r57ncz6xpHG for ; Wed, 11 Nov 2026 21:11:28 +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 4jPx5r070Yz4WjF for ; Wed, 11 Nov 2026 21:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794431488; 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=pxMEntDUgXD0jP3BsMFwyWXfv0lOsROs/4PXDdT1XNk=; b=poYJzECIVi/g9ywEiCbRbMnRC3pB+XeYkNkr2pan1pqZpZDl2G8nstrCMYl+qu+R2KtGfV 2QeAMcMLlfI2ZEwfQhToqaygZg5Ole+v2AHHFr24JvP9hx5zgIS63/9qtkOFqfpdzZfx2w 8QEcgRb3i50G4bHmC6q3HZCLdI5dnKV+GAScvJ0VPgFxs2LrOESuFxywrxmmnHkaV0TZ35 h+UIOtnYRWFvlfKPAPuaVCwysVu+yBi3XcLE8O/+Lsg0CFbY84DuSWilfqv5P/x7QF/uy3 crgWXFb3X49ldlYwK274AsL2DWn+35yJ+MAal819Rmo0/9i7kJ/H9ZFu1CXtFA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794431488; b=NWcnaUZIE7o+S0YgNplhyHSurK2RFUNOiiWvJ4ZlYFqxTpGc29LIhP+A+lNUAAx/GPchIj Nj+b7pes8RdUxYzUO/h17EgeaG2rKkFtOWORk94Qc7LV8xQG20+BCCbZIM1yg6TeuKmgqp IK5sZ4vvQNFRLzxBEqsCTRSbkGoJTl1dcm+Zu5LjtXXY64X5sq6Bvl9t2ktUoXHAyx9hmW KbE2njMGVIPzX+Vh6y7oQl2vdRZpB0kS+84pqPnsoOwX/es54RopZrphcOwEfWif9ueOGF AWA/mRvygCmHckGUy7FTHIGjCEXIysZmWUAm+cZDg4UaKvJulMjgagKFo+XpBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794431488; 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=pxMEntDUgXD0jP3BsMFwyWXfv0lOsROs/4PXDdT1XNk=; b=nppwb4bsrAvFfajUC56YaslRyky2am9/JysgIEMlZ38ke9zfCT8zvabcVXVghUQtUbvke2 PBmtZ0souUAEDN6Sh7PU65+wa4v6b135BhXreIWH0iXSbZEimoq7aJqyGVWxxmh/LDLHRC HfmdXdOu2xuxzTlcln7jqj5gh7p/X/LoESbfwv6aPbiLdqBInv7jh96EjjHP6XpCK2fWFz s8YcfGjP/ik1LlOD0her0sNsCcOE1oG8cbZ/5RAkkhiQBEEzFLNtZMJNjCuzAT/cBPknK1 ug6xzP7uhGmjRGMH4il3wz9ZlreNr1EX/0XR+aufMuKXCZBMPB9Uxa8RaCb5yA== 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 4jPx5q5RFgzXkK for ; Wed, 11 Nov 2026 21:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 11256 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 21:11:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jose Luis Duran From: Ed Maste Subject: git: bb3fe4a04aff - stable/15 - rc: Generate ML-DSA44/Ed25519 host keys by default 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: bb3fe4a04aff26d6c240ef7b37eafcf3e65d27c7 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 21:11:27 +0000 Message-Id: <6af4d9ff.11256.98eb878@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bb3fe4a04aff26d6c240ef7b37eafcf3e65d27c7 commit bb3fe4a04aff26d6c240ef7b37eafcf3e65d27c7 Author: Jose Luis Duran AuthorDate: 2026-11-11 14:41:47 +0000 Commit: Ed Maste CommitDate: 2026-11-11 19:03:25 +0000 rc: Generate ML-DSA44/Ed25519 host keys by default Commit bd9d7cdd1420 ("OpenSSH: Update to 10.5p1") introduced support for ML-DSA44/Ed25519 host keys. Generate these keys by default when the sshd service is first started. Reported by: Herbert J. Skuhra Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D61433 (cherry picked from commit 74ae9accdc2f9be13c8dab27c94ed42f6a7c8360) --- libexec/rc/rc.d/sshd | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/sshd b/libexec/rc/rc.d/sshd index 1d2c89cc88a8..7fee33d15b75 100755 --- a/libexec/rc/rc.d/sshd +++ b/libexec/rc/rc.d/sshd @@ -23,6 +23,7 @@ extra_commands="configtest keygen reload" : ${sshd_rsa_enable:="yes"} : ${sshd_ecdsa_enable:="yes"} : ${sshd_ed25519_enable:="yes"} +: ${sshd_mldsa44_ed25519_enable:="yes"} # sshd in a jail would not see other jails. As such exclude it from # svcj_all_enable="YES" by setting sshd_svcj to NO. This allows to @@ -34,15 +35,16 @@ sshd_keygen_alg() { local alg=$1 local ALG="$(echo $alg | tr a-z A-Z)" + local rcalg="$(echo "$alg" | tr - _)" local keyfile - if ! checkyesno "sshd_${alg}_enable" ; then + if ! checkyesno "sshd_${rcalg}_enable" ; then return 0 fi case $alg in - rsa|ecdsa|ed25519) - keyfile="/etc/ssh/ssh_host_${alg}_key" + rsa|ecdsa|ed25519|mldsa44-ed25519) + keyfile="/etc/ssh/ssh_host_${rcalg}_key" ;; *) return 1 @@ -69,6 +71,7 @@ sshd_keygen() sshd_keygen_alg rsa sshd_keygen_alg ecdsa sshd_keygen_alg ed25519 + sshd_keygen_alg mldsa44-ed25519 } sshd_configtest()