forked from rpms/openssh
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
|
diff --git a/readconf.c b/readconf.c
|
||
|
|
index 374e741..23d74fb 100644
|
||
|
|
--- a/readconf.c
|
||
|
|
+++ b/readconf.c
|
||
|
|
@@ -2229,6 +2229,10 @@ dump_client_config(Options *o, const char *host)
|
||
|
|
int i;
|
||
|
|
char vbuf[5];
|
||
|
|
|
||
|
|
+ /* This is normally prepared in ssh_kex2 */
|
||
|
|
+ if (kex_assemble_names(KEX_DEFAULT_PK_ALG, &o->hostkeyalgorithms) != 0)
|
||
|
|
+ fatal("%s: kex_assemble_names failed", __func__);
|
||
|
|
+
|
||
|
|
/* Most interesting options first: user, host, port */
|
||
|
|
dump_cfg_string(oUser, o->user);
|
||
|
|
dump_cfg_string(oHostName, host);
|
||
|
|
@@ -2289,7 +2293,7 @@ dump_client_config(Options *o, const char *host)
|
||
|
|
dump_cfg_string(oBindAddress, o->bind_address);
|
||
|
|
dump_cfg_string(oCiphers, o->ciphers ? o->ciphers : KEX_CLIENT_ENCRYPT);
|
||
|
|
dump_cfg_string(oControlPath, o->control_path);
|
||
|
|
- dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms ? o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);
|
||
|
|
+ dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms);
|
||
|
|
dump_cfg_string(oHostKeyAlias, o->host_key_alias);
|
||
|
|
dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types);
|
||
|
|
dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);
|
||
|
|
diff --git a/servconf.c b/servconf.c
|
||
|
|
index 04404a4..08c8139 100644
|
||
|
|
--- a/servconf.c
|
||
|
|
+++ b/servconf.c
|
||
|
|
@@ -242,8 +242,6 @@ fill_default_server_options(ServerOptions *options)
|
||
|
|
options->hostbased_authentication = 0;
|
||
|
|
if (options->hostbased_uses_name_from_packet_only == -1)
|
||
|
|
options->hostbased_uses_name_from_packet_only = 0;
|
||
|
|
- if (options->hostkeyalgorithms == NULL)
|
||
|
|
- options->hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG);
|
||
|
|
if (options->rsa_authentication == -1)
|
||
|
|
options->rsa_authentication = 1;
|
||
|
|
if (options->pubkey_authentication == -1)
|
||
|
|
@@ -329,6 +327,8 @@ fill_default_server_options(ServerOptions *options)
|
||
|
|
kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 ||
|
||
|
|
kex_assemble_names(KEX_SERVER_KEX, &options->kex_algorithms) != 0 ||
|
||
|
|
kex_assemble_names(KEX_DEFAULT_PK_ALG,
|
||
|
|
+ &options->hostkeyalgorithms) != 0 ||
|
||
|
|
+ kex_assemble_names(KEX_DEFAULT_PK_ALG,
|
||
|
|
&options->hostbased_key_types) != 0 ||
|
||
|
|
kex_assemble_names(KEX_DEFAULT_PK_ALG,
|
||
|
|
&options->pubkey_key_types) != 0)
|