From nobody Wed Nov 11 14:43:02 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 4jPmTf2KdYz70JGH for ; Wed, 11 Nov 2026 14:43:02 +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 4jPmTf14p1z4NMm for ; Wed, 11 Nov 2026 14:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794408182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZS4gt7Vn7L4tQbjbcVXb2FvRsMIKxW1Fpzswc3n/Rrg=; b=yKsTNpLizJR5ygztKjeG9ksu+ouPRH9c4yI9ME9x2/EuwZ7FrecYhnxpq+sKJDEnPw/CI9 kQC2H5UZTUjxF5/3Ijt/T+7tfIwvhQAjKkIWY1mleK7y80qHozR9P9sgWCA7UAz8yAf/mU uCv1tH5Q1tREHjkS4YXA5Ex1xjRLanoRXBEQxqFIRQo4MLAxqp0H9WmM97uwO4Iw+zWPCr DW7Uk39tLPnHlyLeUfgiYYYi9VWwT3d3qZKXHxXLojUuXR7iKBO+3H5DL0nwDcPzJdwmrJ O5vRQTj+Ehaee3qdF7RgQ6ufiyvRntSZ4UtEO7owYobWJ6YWkIpj3Bq1Iw7ALQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794408182; b=boswXyQWgC1Vtec8FZDqadxW9Mb6oh7sEhhwrtStloN2bCX/4JeP4I4Jcr+YJ/v9lMSBcA 8zPMKQ86BiQ5qgSZboM7sJJiSUCW8ZhQbEaTOJ+f7usUbXd88GZhXuT+44tyUzkNszP5fo VnMWh8VvRM47CyQI5jGxaa/zLkoR82AXCeqZlaj3ygLWqOz/pY8+gtfv8okxmHM6tQ7a7h x4mZ1U3ZfeAt1smMdqndxMNO5VvzSNbCFDX2PXioNZ2vUXOjVnRN0xO/XeYFz8TvDvYfAT HueCa14qpMYP/g6dBhmfJaF3ZYiZIP8teTmjLOeEgbwqYSfe2asVhbvY5BY2pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794408182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZS4gt7Vn7L4tQbjbcVXb2FvRsMIKxW1Fpzswc3n/Rrg=; b=nsyfTRDt6mqYV5MGEBaq9TL07FycutBkOZO/j/eMhoP4roboI36/twvp6mfgljzeJc+4sJ NyxQhb0ejSrLJE/hNaR2vUw9MhdHrDfU6r0G+INCORXeiwDMChgrQOjqtfRwLULYsKRbZW BtlMlyBsVMbM+Q31z26yfoG+AEGVbthF9OspUpCxrSRJevMhvj/OHjNQNH+eiE9LofzAVQ bIqQ9WFA+uZje+P0BcT8fXR2rDDhFnJq4Fla1Dd6ZRaVd4rZ2kN/DZ9cWdFjnIWw4REOTT InwHJh41iPAP/GprssGEkvs5ZVhmkMpBESE5DZnbHDshOc+6OSfbnZGLL6RcSg== 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 4jPmTf0lNKzJjx for ; Wed, 11 Nov 2026 14:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 10a60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 14:43:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 74ae9accdc2f - main - 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74ae9accdc2f9be13c8dab27c94ed42f6a7c8360 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 14:43:02 +0000 Message-Id: <6af47ef6.10a60.3f68acfc@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=74ae9accdc2f9be13c8dab27c94ed42f6a7c8360 commit 74ae9accdc2f9be13c8dab27c94ed42f6a7c8360 Author: Jose Luis Duran AuthorDate: 2026-11-11 14:41:47 +0000 Commit: Jose Luis Duran 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()