[tor-commits] [tor/master] Collect badness values in ntor_ref.py; don't just clobber.

[nickm at torproject.org]

commit f9327848babe8fd3b08eabb187d32b945f7567fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 9 11:57:55 2015 -0400

    Collect badness values in ntor_ref.py; don't just clobber.
    
    Fixes bug 15591; patch from joelanders
---
 changes/bug15591     |    4 ++++
 src/test/ntor_ref.py |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug15591 b/changes/bug15591
new file mode 100644
index 0000000..1398a02
--- /dev/null
+++ b/changes/bug15591
@@ -0,0 +1,4 @@
+  o Testing:
+    - Check for matching value in server response in ntor_ref.py.
+      Fixes bug 15591; bugfix on 0.2.4.8-alpha. Reported and fixed
+      by "joelanders".
diff --git a/src/test/ntor_ref.py b/src/test/ntor_ref.py
index e37637d..767da57 100755
--- a/src/test/ntor_ref.py
+++ b/src/test/ntor_ref.py
@@ -283,7 +283,7 @@ def client_part2(seckey_x, msg, node_id, pubkey_B, keyBytes=72):
     my_auth = H_mac(auth_input)
 
     badness = my_auth != their_auth
-    badness = bad_result(yx) + bad_result(bx)
+    badness |= bad_result(yx) + bad_result(bx)
 
     if badness:
         return None