From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 May 2014 16:40:33 +0000 (-0400)
Subject: have only one code path for #9635 logging
X-Git-Tag: tor-0.2.5.5-alpha~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df03e9b7376032f801e10874a97d83ac17490f68;p=thirdparty%2Ftor.git

have only one code path for #9635 logging
---

diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index b91ecbee33..ef501f69da 100644
--- a/src/or/onion_ntor.c
+++ b/src/or/onion_ntor.c
@@ -291,11 +291,8 @@ onion_skin_ntor_client_handshake(
 
   memwipe(&s, 0, sizeof(s));
 
-  if (bad & 4) {
-    log_warn(LD_PROTOCOL, "Incorrect digest from ntor circuit extension "
-             "request.");
-  } else if (bad) {
-    log_warn(LD_PROTOCOL, "Invalid result from curve25519 handshake");
+  if (bad) {
+    log_warn(LD_PROTOCOL, "Invalid result from curve25519 handshake: %d", bad);
   }
 
   return bad ? -1 : 0;