diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index e76f9c39e..e2f44d38d 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.352 2019/09/06 14:45:34 naddy Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.353 2019/10/31 21:17:49 djm Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -210,7 +210,7 @@ assemble_algorithms(ServerOptions *o) | |||
210 | ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex); | 210 | ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex); |
211 | ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key); | 211 | ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key); |
212 | ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key); | 212 | ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key); |
213 | ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key); | 213 | ASSEMBLE(pubkey_key_types, PUBKEY_DEFAULT_PK_ALG, all_key); |
214 | ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig); | 214 | ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig); |
215 | #undef ASSEMBLE | 215 | #undef ASSEMBLE |
216 | free(all_cipher); | 216 | free(all_cipher); |
@@ -2641,7 +2641,7 @@ dump_config(ServerOptions *o) | |||
2641 | dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ? | 2641 | dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ? |
2642 | o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG); | 2642 | o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG); |
2643 | dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ? | 2643 | dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ? |
2644 | o->pubkey_key_types : KEX_DEFAULT_PK_ALG); | 2644 | o->pubkey_key_types : PUBKEY_DEFAULT_PK_ALG); |
2645 | dump_cfg_string(sRDomain, o->routing_domain); | 2645 | dump_cfg_string(sRDomain, o->routing_domain); |
2646 | 2646 | ||
2647 | /* string arguments requiring a lookup */ | 2647 | /* string arguments requiring a lookup */ |