aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-11-16 22:42:22 -0500
committerNick Mathewson <nickm@torproject.org>2020-11-16 22:42:22 -0500
commit90017323942dc56b23d98c34894542e30856aeac (patch)
tree820cdb039cc978f63c136f9564b3617a35e92e0b /src/test
parent3f1544bbd9e24e2a469c97568bcc6c1feb7e8f05 (diff)
parent7c0778ef7e05e859c62346a795952f127972b35e (diff)
downloadtor-90017323942dc56b23d98c34894542e30856aeac.tar.gz
tor-90017323942dc56b23d98c34894542e30856aeac.zip
Merge branch 'maint-0.4.3' into maint-0.4.4
Diffstat (limited to 'src/test')
-rw-r--r--src/test/hs_ntor_ref.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py
index f107cc36ca..98025dd584 100644
--- a/src/test/hs_ntor_ref.py
+++ b/src/test/hs_ntor_ref.py
@@ -70,14 +70,16 @@ except ImportError:
try:
# Pull the sha3 functions in.
from hashlib import sha3_256, shake_256
- shake_squeeze = shake_256.digest
+ def shake_squeeze(obj, n):
+ return obj.digest(n)
except ImportError:
if hasattr(sha3, "SHA3256"):
# If this happens, then we have the old "sha3" module which
# hashlib and pysha3 superseded.
sha3_256 = sha3.SHA3256
shake_256 = sha3.SHAKE256
- shake_squeeze = shake_256.squeeze
+ def shake_squeeze(obj, n):
+ return obj.squeeze(n)
else:
# error code 77 tells automake to skip this test
sys.exit(77)