summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-24 17:45:29 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-24 17:45:33 -0400
commit8d6bb3a5595cd4b9dbc175a43b93e8d7ca332635 (patch)
tree2d1491ed9e2ae5aff821c0e8b3393bafdac8dcfe
parent9febbf0451ecd60fb78c1b4e5632d09bf3403fcc (diff)
downloadtor-8d6bb3a5595cd4b9dbc175a43b93e8d7ca332635.tar.gz
tor-8d6bb3a5595cd4b9dbc175a43b93e8d7ca332635.zip
Make our digest-mismatch warnings a touch better
-rw-r--r--src/or/routerlist.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 8bd80391bc..03729bda5c 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4964,6 +4964,12 @@ routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri,
goto err;
}
+ if (!digest256_matches && !digest_matches) {
+ if (msg) *msg = "Neither digest256 or digest matched "
+ "digest from routerdesc";
+ goto err;
+ }
+
if (!digest256_matches) {
if (msg) *msg = "Extrainfo digest did not match digest256 from routerdesc";
goto err; /* Digest doesn't match declared value. */