torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ticket40033_045_01_squashed'

Browse Source
This commit is contained in:
Nick Mathewson
2020-07-14 10:59:30 -04:00
parent 1d554e4baf 268d01ada5
commit 2b33e8037e
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/feature/dirparse/ns_parse.c
+2 -2
View File
@@ -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;