[tor-commits] [tor/master] Make our digest-mismatch warnings a touch better

[nickm at torproject.org]

commit 8d6bb3a5595cd4b9dbc175a43b93e8d7ca332635
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 24 17:45:29 2015 -0400

    Make our digest-mismatch warnings a touch better
---
 src/or/routerlist.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 8bd8039..03729bd 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. */