src/usr.bin/ssh/readconf.c - diff

Return to readconf.c CVS log

Up to [local] / src / usr.bin / ssh

-version 1.325, 2020/02/03 23:47:57
+version 1.326, 2020/02/06 22:46:31
 Line 2642
 Line 2642
 Line 2642
  void
  dump_client_config(Options *o, const char *host)
  {
-         int i;
+         int i, r;
-         char buf[8];
+         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);