From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 24 Sep 2015 21:45:29 +0000 (-0400)
Subject: Make our digest-mismatch warnings a touch better
X-Git-Tag: tor-0.2.7.3-rc~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d6bb3a5595cd4b9dbc175a43b93e8d7ca332635;p=thirdparty%2Ftor.git

Make our digest-mismatch warnings a touch better
---

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. */