diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-14 10:59:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-14 10:59:30 -0400 |
| commit | 2b33e8037e7ae5e947ce3186a06c90478de6c7e2 (patch) | |
| tree | 45e365d81b5be942fb4364755ad1b6247a2e9d46 /src/feature/dirparse | |
| parent | 1d554e4bafcff076c0ebba34b8292dea44c6dd06 (diff) | |
| parent | 268d01ada5f4a11c5d8e63215288eb593dbfb9ed (diff) | |
| download | tor-2b33e8037e7ae5e947ce3186a06c90478de6c7e2.tar.gz tor-2b33e8037e7ae5e947ce3186a06c90478de6c7e2.zip | |
Merge branch 'ticket40033_045_01_squashed'
Diffstat (limited to 'src/feature/dirparse')
| -rw-r--r-- | src/feature/dirparse/ns_parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 761d6b8c97..d4bcdae973 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -1354,8 +1354,8 @@ networkstatus_parse_vote_from_string(const char *s, goto err; } if (ns->type != NS_TYPE_CONSENSUS) { - if (authority_cert_is_blacklisted(ns->cert)) { - log_warn(LD_DIR, "Rejecting vote signature made with blacklisted " + if (authority_cert_is_denylisted(ns->cert)) { + log_warn(LD_DIR, "Rejecting vote signature made with denylisted " "signing key %s", hex_str(ns->cert->signing_key_digest, DIGEST_LEN)); goto err; |