diff options
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index dc0e557ad..87ceb3dab 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.274 2015/07/01 02:26:31 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.275 2015/07/10 06:21:53 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -100,6 +100,7 @@ | |||
100 | #include "key.h" | 100 | #include "key.h" |
101 | #include "cipher.h" | 101 | #include "cipher.h" |
102 | #include "kex.h" | 102 | #include "kex.h" |
103 | #include "myproposal.h" | ||
103 | #include "log.h" | 104 | #include "log.h" |
104 | #include "misc.h" | 105 | #include "misc.h" |
105 | #include "readconf.h" | 106 | #include "readconf.h" |
@@ -2362,10 +2363,11 @@ client_input_hostkeys(void) | |||
2362 | debug3("%s: received %s key %s", __func__, | 2363 | debug3("%s: received %s key %s", __func__, |
2363 | sshkey_type(key), fp); | 2364 | sshkey_type(key), fp); |
2364 | free(fp); | 2365 | free(fp); |
2366 | |||
2365 | /* Check that the key is accepted in HostkeyAlgorithms */ | 2367 | /* Check that the key is accepted in HostkeyAlgorithms */ |
2366 | if (options.hostkeyalgorithms != NULL && | 2368 | if (match_pattern_list(sshkey_ssh_name(key), |
2367 | match_pattern_list(sshkey_ssh_name(key), | 2369 | options.hostkeyalgorithms ? options.hostkeyalgorithms : |
2368 | options.hostkeyalgorithms, 0) != 1) { | 2370 | KEX_DEFAULT_PK_ALG, 0) != 1) { |
2369 | debug3("%s: %s key not permitted by HostkeyAlgorithms", | 2371 | debug3("%s: %s key not permitted by HostkeyAlgorithms", |
2370 | __func__, sshkey_ssh_name(key)); | 2372 | __func__, sshkey_ssh_name(key)); |
2371 | continue; | 2373 | continue; |