diff options
author | Colin Watson <cjwatson@debian.org> | 2020-10-18 12:04:32 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-10-18 12:04:32 +0100 |
commit | 2b2c99658e3e8ed452e28f88f9cdbcdfb2a461cb (patch) | |
tree | 336445493163aa0370cb7830d97ebd8819b2e2c5 /kex.c | |
parent | 202f5a676221c244cd450086c334c2b59f339e86 (diff) | |
parent | 279261e1ea8150c7c64ab5fe7cb4a4ea17acbb29 (diff) |
Import openssh_8.4p1.orig.tar.gz
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.158 2020/03/13 04:01:56 djm Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.159 2020/07/05 23:59:45 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -247,7 +247,7 @@ kex_assemble_names(char **listp, const char *def, const char *all) | |||
247 | list = tmp; | 247 | list = tmp; |
248 | } else if (*list == '-') { | 248 | } else if (*list == '-') { |
249 | /* Remove names from default list */ | 249 | /* Remove names from default list */ |
250 | if ((*listp = match_filter_blacklist(def, list + 1)) == NULL) { | 250 | if ((*listp = match_filter_denylist(def, list + 1)) == NULL) { |
251 | r = SSH_ERR_ALLOC_FAIL; | 251 | r = SSH_ERR_ALLOC_FAIL; |
252 | goto fail; | 252 | goto fail; |
253 | } | 253 | } |
@@ -284,7 +284,7 @@ kex_assemble_names(char **listp, const char *def, const char *all) | |||
284 | goto fail; | 284 | goto fail; |
285 | } | 285 | } |
286 | free(matching); | 286 | free(matching); |
287 | if ((matching = match_filter_whitelist(all, cp)) == NULL) { | 287 | if ((matching = match_filter_allowlist(all, cp)) == NULL) { |
288 | r = SSH_ERR_ALLOC_FAIL; | 288 | r = SSH_ERR_ALLOC_FAIL; |
289 | goto fail; | 289 | goto fail; |
290 | } | 290 | } |