From 4b18d8931b0c719b52ce0e2ac39a03dbf2b0adb0 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sun, 9 Nov 2014 17:39:23 +0200 Subject: [PATCH 1/3] Downgrade RSA signature verification failure error message to info loglevel. --- src/common/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 7025f2dc5928050d4b6659d6d7341549be974094 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sun, 9 Nov 2014 17:41:18 +0200 Subject: [PATCH 2/3] Print a warning when extra info document is found incompatible with router descriptor. --- src/or/routerlist.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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; } From e395783f23f58db7f27617014b7a3b4576251ada Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sun, 9 Nov 2014 17:55:35 +0200 Subject: [PATCH 3/3] Adding changes file for 9812. --- changes/bug9812 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changes/bug9812 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. +