summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-02-06 22:46:31 +0000
committerDamien Miller <djm@mindrot.org>2020-02-07 09:53:00 +1100
commitc7288486731734a864b58d024b1395029b55bbc5 (patch)
tree9b6da9649937a7f617bf0eb07daf1717f489a63e /readconf.c
parenta6ac5d36efc072b15690c65039754f8e44247bdf (diff)
upstream: expand HostkeyAlgorithms prior to config dump, matching
other algorithm lists; ok markus@ OpenBSD-Commit-ID: a66f0fca8cc5ce30405a2867bc115fff600671d0
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/readconf.c b/readconf.c
index 20f1c04e..f3cac6b3 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.325 2020/02/03 23:47:57 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.326 2020/02/06 22:46:31 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2663,8 +2663,20 @@ dump_cfg_forwards(OpCodes code, u_int count, const struct Forward *fwds)
void
dump_client_config(Options *o, const char *host)
{
- int i;
- char buf[8];
+ int i, r;
+ char buf[8], *all_key;
+
+ /*
+ * Expand HostKeyAlgorithms name lists. This isn't handled in
+ * fill_default_options() like the other algorithm lists because
+ * the host key algorithms are by default dynamically chosen based
+ * on the host's keys found in known_hosts.
+ */
+ all_key = sshkey_alg_list(0, 0, 1, ',');
+ if ((r = kex_assemble_names(&o->hostkeyalgorithms, kex_default_pk_alg(),
+ all_key)) != 0)
+ fatal("%s: expand HostKeyAlgorithms: %s", __func__, ssh_err(r));
+ free(all_key);
/* Most interesting options first: user, host, port */
dump_cfg_string(oUser, o->user);