summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-07-05 23:59:45 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:07:42 +1000
commit6d755706a0059eb9e2d63517f288b75cbc3b4701 (patch)
treeadb003b1adcea270f4480baa4ff83d495b3478f3 /compat.c
parentb0c1e8384d5e136ebdf895d1434aea7dd8661a1c (diff)
upstream: some language improvements; ok markus
OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/compat.c b/compat.c
index 7c0e1c230..dec8e7e93 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.114 2020/06/01 07:11:38 dtucker Exp $ */ 1/* $OpenBSD: compat.c,v 1.115 2020/07/05 23:59:45 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -163,8 +163,8 @@ compat_cipher_proposal(char *cipher_prop)
163 if (!(datafellows & SSH_BUG_BIGENDIANAES)) 163 if (!(datafellows & SSH_BUG_BIGENDIANAES))
164 return cipher_prop; 164 return cipher_prop;
165 debug2("%s: original cipher proposal: %s", __func__, cipher_prop); 165 debug2("%s: original cipher proposal: %s", __func__, cipher_prop);
166 if ((cipher_prop = match_filter_blacklist(cipher_prop, "aes*")) == NULL) 166 if ((cipher_prop = match_filter_denylist(cipher_prop, "aes*")) == NULL)
167 fatal("match_filter_blacklist failed"); 167 fatal("match_filter_denylist failed");
168 debug2("%s: compat cipher proposal: %s", __func__, cipher_prop); 168 debug2("%s: compat cipher proposal: %s", __func__, cipher_prop);
169 if (*cipher_prop == '\0') 169 if (*cipher_prop == '\0')
170 fatal("No supported ciphers found"); 170 fatal("No supported ciphers found");
@@ -177,8 +177,8 @@ compat_pkalg_proposal(char *pkalg_prop)
177 if (!(datafellows & SSH_BUG_RSASIGMD5)) 177 if (!(datafellows & SSH_BUG_RSASIGMD5))
178 return pkalg_prop; 178 return pkalg_prop;
179 debug2("%s: original public key proposal: %s", __func__, pkalg_prop); 179 debug2("%s: original public key proposal: %s", __func__, pkalg_prop);
180 if ((pkalg_prop = match_filter_blacklist(pkalg_prop, "ssh-rsa")) == NULL) 180 if ((pkalg_prop = match_filter_denylist(pkalg_prop, "ssh-rsa")) == NULL)
181 fatal("match_filter_blacklist failed"); 181 fatal("match_filter_denylist failed");
182 debug2("%s: compat public key proposal: %s", __func__, pkalg_prop); 182 debug2("%s: compat public key proposal: %s", __func__, pkalg_prop);
183 if (*pkalg_prop == '\0') 183 if (*pkalg_prop == '\0')
184 fatal("No supported PK algorithms found"); 184 fatal("No supported PK algorithms found");
@@ -192,14 +192,14 @@ compat_kex_proposal(char *p)
192 return p; 192 return p;
193 debug2("%s: original KEX proposal: %s", __func__, p); 193 debug2("%s: original KEX proposal: %s", __func__, p);
194 if ((datafellows & SSH_BUG_CURVE25519PAD) != 0) 194 if ((datafellows & SSH_BUG_CURVE25519PAD) != 0)
195 if ((p = match_filter_blacklist(p, 195 if ((p = match_filter_denylist(p,
196 "curve25519-sha256@libssh.org")) == NULL) 196 "curve25519-sha256@libssh.org")) == NULL)
197 fatal("match_filter_blacklist failed"); 197 fatal("match_filter_denylist failed");
198 if ((datafellows & SSH_OLD_DHGEX) != 0) { 198 if ((datafellows & SSH_OLD_DHGEX) != 0) {
199 if ((p = match_filter_blacklist(p, 199 if ((p = match_filter_denylist(p,
200 "diffie-hellman-group-exchange-sha256," 200 "diffie-hellman-group-exchange-sha256,"
201 "diffie-hellman-group-exchange-sha1")) == NULL) 201 "diffie-hellman-group-exchange-sha1")) == NULL)
202 fatal("match_filter_blacklist failed"); 202 fatal("match_filter_denylist failed");
203 } 203 }
204 debug2("%s: compat KEX proposal: %s", __func__, p); 204 debug2("%s: compat KEX proposal: %s", __func__, p);
205 if (*p == '\0') 205 if (*p == '\0')