nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug1956'

Browse Source
This commit is contained in:
Nick Mathewson 2010-09-21 00:07:45 -04:00
commit 5a55662a6b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug1956 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes
- Do not double-report signatures from unrecognized authorities both
as "from unknown authority" and "not present". Fixes bug 1956,
bugfix on 0.2.2.16-alpha.

8
src/or/networkstatus.c
View File

@ -482,6 +482,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
voter) {
int good_here = 0;
int bad_here = 0;
int unknown_here = 0;
int missing_key_here = 0, dl_failed_key_here = 0;
SMARTLIST_FOREACH_BEGIN(voter->sigs, document_signature_t *, sig) {
if (!sig->good_signature && !sig->bad_signature &&
@ -497,7 +498,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
if (!is_v3_auth) {
smartlist_add(unrecognized, voter);
++n_unknown;
++unknown_here;
continue;
} else if (!cert || cert->expires < now) {
smartlist_add(need_certs_from, voter);
@ -527,8 +528,11 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
++n_missing_key;
if (dl_failed_key_here)
++n_dl_failed_key;
} else
} else if (unknown_here) {
++n_unknown;
} else {
++n_no_signature;
}
} SMARTLIST_FOREACH_END(voter);
/* Now see whether we're missing any voters entirely. */