git: 74ae9accdc2f - main - rc: Generate ML-DSA44/Ed25519 host keys by default

From: Jose Luis Duran <jlduran_at_FreeBSD.org>
Date: Wed, 11 Nov 2026 14:43:02 UTC
The branch main has been updated by jlduran:

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

commit 74ae9accdc2f9be13c8dab27c94ed42f6a7c8360
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-11-11 14:41:47 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2026-11-11 14:42:37 +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
---
 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()