diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-07-05 23:59:45 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-07-15 15:07:42 +1000 |
| commit | 6d755706a0059eb9e2d63517f288b75cbc3b4701 (patch) | |
| tree | adb003b1adcea270f4480baa4ff83d495b3478f3 /compat.c | |
| parent | b0c1e8384d5e136ebdf895d1434aea7dd8661a1c (diff) | |
upstream: some language improvements; ok markus
OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
Diffstat (limited to 'compat.c')
| -rw-r--r-- | compat.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: compat.c,v 1.114 2020/06/01 07:11:38 dtucker Exp $ */ +/* $OpenBSD: compat.c,v 1.115 2020/07/05 23:59:45 djm Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -163,8 +163,8 @@ compat_cipher_proposal(char *cipher_prop) if (!(datafellows & SSH_BUG_BIGENDIANAES)) return cipher_prop; debug2("%s: original cipher proposal: %s", __func__, cipher_prop); - if ((cipher_prop = match_filter_blacklist(cipher_prop, "aes*")) == NULL) - fatal("match_filter_blacklist failed"); + if ((cipher_prop = match_filter_denylist(cipher_prop, "aes*")) == NULL) + fatal("match_filter_denylist failed"); debug2("%s: compat cipher proposal: %s", __func__, cipher_prop); if (*cipher_prop == '\0') fatal("No supported ciphers found"); @@ -177,8 +177,8 @@ compat_pkalg_proposal(char *pkalg_prop) if (!(datafellows & SSH_BUG_RSASIGMD5)) return pkalg_prop; debug2("%s: original public key proposal: %s", __func__, pkalg_prop); - if ((pkalg_prop = match_filter_blacklist(pkalg_prop, "ssh-rsa")) == NULL) - fatal("match_filter_blacklist failed"); + if ((pkalg_prop = match_filter_denylist(pkalg_prop, "ssh-rsa")) == NULL) + fatal("match_filter_denylist failed"); debug2("%s: compat public key proposal: %s", __func__, pkalg_prop); if (*pkalg_prop == '\0') fatal("No supported PK algorithms found"); @@ -192,14 +192,14 @@ compat_kex_proposal(char *p) return p; debug2("%s: original KEX proposal: %s", __func__, p); if ((datafellows & SSH_BUG_CURVE25519PAD) != 0) - if ((p = match_filter_blacklist(p, + if ((p = match_filter_denylist(p, "curve25519-sha256@libssh.org")) == NULL) - fatal("match_filter_blacklist failed"); + fatal("match_filter_denylist failed"); if ((datafellows & SSH_OLD_DHGEX) != 0) { - if ((p = match_filter_blacklist(p, + if ((p = match_filter_denylist(p, "diffie-hellman-group-exchange-sha256," "diffie-hellman-group-exchange-sha1")) == NULL) - fatal("match_filter_blacklist failed"); + fatal("match_filter_denylist failed"); } debug2("%s: compat KEX proposal: %s", __func__, p); if (*p == '\0') |