git: 2d6f961164e4 - main - ssh: use defaultkey sentinel for ML-DSA-44 default host key
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Oct 2026 20:54:08 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=2d6f961164e4ab7e823972336dc9cfaae6a88ed8
commit 2d6f961164e4ab7e823972336dc9cfaae6a88ed8
Author: Osvaldo Janeri Filho <ojanerif@amd.com>
AuthorDate: 2026-10-20 19:11:32 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
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)