upstream: some language improvements; ok markus

OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8

1 files changed, 6 insertions, 6 deletions

diff --git a/readconf.c b/readconf.c
index c0595a52b..9e597748c 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.331 2020/05/29 04:25:40 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.332 2020/07/05 23:59:45 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2221,11 +2221,11 @@ fill_default_options(Options * options)
         all_key = sshkey_alg_list(0, 0, 1, ',');
         all_sig = sshkey_alg_list(0, 1, 1, ',');
         /* remove unsupported algos from default lists */
-        def_cipher = match_filter_whitelist(KEX_CLIENT_ENCRYPT, all_cipher);
-        def_mac = match_filter_whitelist(KEX_CLIENT_MAC, all_mac);
-        def_kex = match_filter_whitelist(KEX_CLIENT_KEX, all_kex);
-        def_key = match_filter_whitelist(KEX_DEFAULT_PK_ALG, all_key);
-        def_sig = match_filter_whitelist(SSH_ALLOWED_CA_SIGALGS, all_sig);
+        def_cipher = match_filter_allowlist(KEX_CLIENT_ENCRYPT, all_cipher);
+        def_mac = match_filter_allowlist(KEX_CLIENT_MAC, all_mac);
+        def_kex = match_filter_allowlist(KEX_CLIENT_KEX, all_kex);
+        def_key = match_filter_allowlist(KEX_DEFAULT_PK_ALG, all_key);
+        def_sig = match_filter_allowlist(SSH_ALLOWED_CA_SIGALGS, all_sig);
 #define ASSEMBLE(what, defaults, all) \
         do { \
                 if ((r = kex_assemble_names(&options->what, \