[tor-commits] [tor/master] have only one code path for #9635 logging

[nickm at torproject.org]

commit df03e9b7376032f801e10874a97d83ac17490f68
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 1 12:40:33 2014 -0400

    have only one code path for #9635 logging
---
 src/or/onion_ntor.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index b91ecbe..ef501f6 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;