aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-09 11:57:55 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-09 11:57:55 -0400
commitf9327848babe8fd3b08eabb187d32b945f7567fc (patch)
treee5ece15df1c59e97298ca560335d191e8e1ae9e6
parentc759ed2c62f27a490dc78a07e62d87705dd785a9 (diff)
downloadtor-f9327848babe8fd3b08eabb187d32b945f7567fc.tar.gz
tor-f9327848babe8fd3b08eabb187d32b945f7567fc.zip
Collect badness values in ntor_ref.py; don't just clobber.
Fixes bug 15591; patch from joelanders
-rw-r--r--changes/bug155914
-rwxr-xr-xsrc/test/ntor_ref.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug15591 b/changes/bug15591
new file mode 100644
index 0000000000..1398a027d7
--- /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 e37637d92a..767da57a9c 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