diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-12 10:27:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-12 10:27:12 -0500 |
| commit | 99e2a325f67c4c4ca904c76fe5345e35befabb9d (patch) | |
| tree | 78fd000a87ab3f79d5d1573fcd64281a30ca8b58 | |
| parent | a87c697fb157f243bc48bba868a69a5182042822 (diff) | |
| parent | e395783f23f58db7f27617014b7a3b4576251ada (diff) | |
| download | tor-99e2a325f67c4c4ca904c76fe5345e35befabb9d.tar.gz tor-99e2a325f67c4c4ca904c76fe5345e35befabb9d.zip | |
Merge remote-tracking branch 'rl1987/bug9812'
| -rw-r--r-- | changes/bug9812 | 6 | ||||
| -rw-r--r-- | src/common/crypto.c | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/changes/bug9812 b/changes/bug9812 new file mode 100644 index 0000000000..308af8c18f --- /dev/null +++ b/changes/bug9812 @@ -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. + diff --git a/src/common/crypto.c b/src/common/crypto.c index 90a16fab1a..7138ba003e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1012,7 +1012,7 @@ crypto_pk_public_checksig(crypto_pk_t *env, char *to, env->key, RSA_PKCS1_PADDING); if (r<0) { - crypto_log_errors(LOG_WARN, "checking RSA signature"); + crypto_log_errors(LOG_INFO, "checking RSA signature"); return -1; } return r; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d81dae4676..fb39b6ea64 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2945,6 +2945,7 @@ MOCK_IMPL(STATIC was_router_added_t, extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) { was_router_added_t r; + const char *compatibility_error_msg; routerinfo_t *ri = rimap_get(rl->identity_map, ei->cache_info.identity_digest); signed_descriptor_t *sd = @@ -2961,9 +2962,14 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) r = ROUTER_NOT_IN_CONSENSUS; 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) ? ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS; + + log_warn(LD_DIR,"router info incompatible with extra info (reason: %s)", + compatibility_error_msg); + goto done; } |