From nobody Tue Oct 20 20:54:08 2026 X-Original-To: dev-commits-src-main@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 4j8Pm564ykz6wNFH for ; Tue, 20 Oct 2026 20:54:13 +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 4j8Pm54qk4z4FJl for ; Tue, 20 Oct 2026 20:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792529653; 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=2rtRhDzWxgQCFGXHg+iZo9x1Mls5emUOY4Dh0k89e1I=; b=CxLJcKlXfJ7YxfUfATvAZUzNVT0cJIo6uEn2Dj9iTdMuywBJdqmWMYLqiF1NohJbEf46Cn IDi2j9nwbUKQEfCt+/l7yMpep7QWf5uIFPh8/SRfQKTgcDZxZtucmZiN7ynxXuvtPhdxBh N8rkeg8gr4ZwSEpPZuxxgtez5Etg2XJ7KVEPI91ILo750YL32VUOi9ZMO7uqE3rGWRMw2m eRE1YX687bK6aLuhl1iIhtuqyqSdmjAJyPgVesI+Km/hk/yvPyc01ZzyiPoKYX1yaSTn4b sbHu78rSDAMBQ5J8GA30/EmwxS8lfStql8WwNsW2fXOkUI1UuY/dbbbZgcBh3g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792529653; b=PtQ94pCWndoeNSgjoUNq1YjgDrk0LrY7qQSSBR9vWl8gQkHuUnNUvLNnThJFX0HNICTUIS 8Rn03YZcBQ00/6JIvzdCtsKaKbQ9ufj6r1RCoSWE0JJFr+cHAuGjTnO1dbQgBqE3uEnnld wO78OxJehiQCGetndrjgR4tSe6WAs+oc5IyxV5lu1CkY8rcWJXDp+oDY4Ipj7ftooV4ouR WlUiOG6GcQK/4hJmfZLUcIe4t1REA0AgLH/rJLeYTRr2PBriklrEH8ya0E7Heroe5DWh5I UUhZw3u568UzRx263Je7zR1cuimPAVE+tF4jWn3ojQtVpwbIwiQE/GzC6i+xLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792529653; 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=2rtRhDzWxgQCFGXHg+iZo9x1Mls5emUOY4Dh0k89e1I=; b=J5L26nxKLOAU7vZ2whBQYgH+NnyWYfwirnw0DWuzhEkXg7C74/51QtxZElaOrj7mQ57+pG iIoPNhtqVgKXkvj3ZyZ+v/HqGMuzEStUPsi5UMvEyX3QhfGWA+FpbRtHZWTZr9z+TCi08P Pzuim1E3kGGC33tjf48+8Hpy2jDI3LT5vnfqljXi9FHHJGA4JUrMKdkImWZAqZBoKXj8q2 4EzpQGtSPDRavvmDrxYdqbKxCEJsxwP5HxXdfSs19y22hKBF/NPfg6Z0iM6VkJ33dcH+Sb Elhx1sj9SGPViGzTHlwizx+GAaNLd3K0btiu92X3dg1Gvx0v10NhZWk+nAJ6bQ== 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 4j8Pm54VstzNjf for ; Tue, 20 Oct 2026 20:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c431 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Oct 2026 20:54:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Ed Maste Subject: git: 2d6f961164e4 - main - ssh: use defaultkey sentinel for ML-DSA-44 default host key List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: 2d6f961164e4ab7e823972336dc9cfaae6a88ed8 Auto-Submitted: auto-generated Date: Tue, 20 Oct 2026 20:54:08 +0000 Message-Id: <6ad7d4f0.1c431.6516fc51@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2d6f961164e4ab7e823972336dc9cfaae6a88ed8 commit 2d6f961164e4ab7e823972336dc9cfaae6a88ed8 Author: Osvaldo Janeri Filho AuthorDate: 2026-10-20 19:11:32 +0000 Commit: Ed Maste CommitDate: 2026-10-20 20:53:25 +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 --- 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 db8aab5f8fc1..02ff6964c9e7 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -325,7 +325,7 @@ fill_default_server_options(ServerOptions *options) #endif 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)