nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rl1987/bug9812'

Browse Source
This commit is contained in:
Nick Mathewson 2014-11-12 10:27:12 -05:00
commit 99e2a325f6
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug9812 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (logging):
- Downgrade warnings about RSA signature failures to info log
level. Emit a warning when extra info document is found
incompatible with a corresponding router descriptor. Fixes bug
9812.

2
src/common/crypto.c
View File

@ -1012,7 +1012,7 @@ crypto_pk_public_checksig(crypto_pk_t *env, char *to,
env->key, RSA_PKCS1_PADDING); env->key, RSA_PKCS1_PADDING);
if (r<0) { if (r<0) {
crypto_log_errors(LOG_WARN, "checking RSA signature"); crypto_log_errors(LOG_INFO, "checking RSA signature");
return -1; return -1;
} }
return r; return r;

8
src/or/routerlist.c
View File

@ -2945,6 +2945,7 @@ MOCK_IMPL(STATIC was_router_added_t,
extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei))
{ {
was_router_added_t r; was_router_added_t r;
const char *compatibility_error_msg;
routerinfo_t *ri = rimap_get(rl->identity_map, routerinfo_t *ri = rimap_get(rl->identity_map,
ei->cache_info.identity_digest); ei->cache_info.identity_digest);
signed_descriptor_t *sd = signed_descriptor_t *sd =
@ -2961,9 +2962,14 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei))
r = ROUTER_NOT_IN_CONSENSUS; r = ROUTER_NOT_IN_CONSENSUS;
goto done; goto done;
} }
if (routerinfo_incompatible_with_extrainfo(ri, ei, sd, NULL)) { if (routerinfo_incompatible_with_extrainfo(ri, ei, sd,
&compatibility_error_msg)) {
r = (ri->cache_info.extrainfo_is_bogus) ? r = (ri->cache_info.extrainfo_is_bogus) ?
ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS; ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS;
log_warn(LD_DIR,"router info incompatible with extra info (reason: %s)",
compatibility_error_msg);
goto done; goto done;
} }