commit 8b5b7d470f4ef1957df77d343c8e87b1350351e3 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 31 20:28:42 2017 -0400 Fix the hs_ntor integration tests to work with the pysha3 module The sha3 module should still work. Fixes bug 23071; bugfix on 0.3.1.1-alpha. --- changes/bug23071 | 5 +++++ src/test/hs_ntor_ref.py | 31 ++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/changes/bug23071 b/changes/bug23071 new file mode 100644 index 000000000..4756dd625 --- /dev/null +++ b/changes/bug23071 @@ -0,0 +1,5 @@ + o Minor bugfixes (tests): + - Port the hs_ntor handshake test to work correctly with recent + versions of the pysha3 module. Fixes bug 23071; bugfix on + 0.3.1.1-alpha. + diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py index 813e79782..46e0e3fa4 100644 --- a/src/test/hs_ntor_ref.py +++ b/src/test/hs_ntor_ref.py @@ -54,11 +54,28 @@ except ImportError: import slownacl_curve25519 curve25519mod = slownacl_curve25519 +import hashlib try: import sha3 except ImportError: - # error code 77 tells automake to skip this test - sys.exit(77) + # In python 3.6, the sha3 functions are in hashlib whether we + # import sha3 or not. + pass + +try: + # Pull the sha3 functions in. + from hashlib import sha3_256, shake_256 + shake_squeeze = shake_256.digest +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 + else: + # error code 77 tells automake to skip this test + sys.exit(77) # Import Nick's ntor reference implementation in Python # We are gonna use a few of its utilities. @@ -81,7 +98,7 @@ def mac(k,m): def htonll(num): return struct.pack('!q', num) - s = sha3.SHA3256() + s = sha3_256() s.update(htonll(len(k))) s.update(k) s.update(m) @@ -107,9 +124,9 @@ def intro2_ntor_client(intro_auth_pubkey_str, intro_enc_pubkey, assert(len(secret) == INTRO_SECRET_LEN) info = M_HSEXPAND + subcredential - kdf = sha3.SHAKE256() + kdf = shake_256() kdf.update(secret + T_HSENC + info) - key_material = kdf.squeeze(64*8) + key_material = shake_squeeze(kdf, 64*8) enc_key = key_material[0:32] mac_key = key_material[32:64] @@ -139,9 +156,9 @@ def intro2_ntor_service(intro_auth_pubkey_str, client_enc_pubkey, service_enc_pr assert(len(secret) == INTRO_SECRET_LEN) info = M_HSEXPAND + subcredential - kdf = sha3.SHAKE256() + kdf = shake_256() kdf.update(secret + T_HSENC + info) - key_material = kdf.squeeze(64*8) + key_material = shake_squeeze(kdf, 64*8) enc_key = key_material[0:32] mac_key = key_material[32:64]