diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-10-31 22:17:49 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-10-31 23:46:09 +0100 |
| commit | 01a0670f69c5b86e471e033b92145d6c7cc77c58 (patch) | |
| tree | f0250b52bf554982930f49927b5f5d8359a49a9b /servconf.c | |
| parent | upstream: ssh-keygen support for generating U2F/FIDO keys (diff) | |
| download | openssh-01a0670f69c5b86e471e033b92145d6c7cc77c58.tar.xz openssh-01a0670f69c5b86e471e033b92145d6c7cc77c58.zip | |
upstream: Separate myproposal.h userauth pubkey types
U2F/FIDO keys are not supported for host authentication, so we need
a separate list for user keys.
feedback & ok markus@
OpenBSD-Commit-ID: 7fe2e6ab85f9f2338866e5af8ca2d312abbf0429
Diffstat (limited to '')
| -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 @@ -/* $OpenBSD: servconf.c,v 1.352 2019/09/06 14:45:34 naddy Exp $ */ +/* $OpenBSD: servconf.c,v 1.353 2019/10/31 21:17:49 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -210,7 +210,7 @@ assemble_algorithms(ServerOptions *o) ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex); ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key); ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key); - ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key); + ASSEMBLE(pubkey_key_types, PUBKEY_DEFAULT_PK_ALG, all_key); ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig); #undef ASSEMBLE free(all_cipher); @@ -2641,7 +2641,7 @@ dump_config(ServerOptions *o) dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ? o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG); dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ? - o->pubkey_key_types : KEX_DEFAULT_PK_ALG); + o->pubkey_key_types : PUBKEY_DEFAULT_PK_ALG); dump_cfg_string(sRDomain, o->routing_domain); /* string arguments requiring a lookup */ |