]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
have only one code path for #9635 logging
authorNick Mathewson <nickm@torproject.org>
Thu, 1 May 2014 16:40:33 +0000 (12:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 May 2014 16:40:33 +0000 (12:40 -0400)
src/or/onion_ntor.c

index b91ecbee330bd66f47dd7ecfafd0fc38177d08be..ef501f69da2ea4ecfe248ec0da7b4b3a1b387405 100644 (file)
@@ -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;