[tor-commits] [tor/master] Support Python 3.8 in hs_build_address.py

[nickm at torproject.org]

commit 2a06b7c3b81b7075fdab7e2aa3b3d0e388c80548
Author: Samanta Navarro <ferivoz at riseup.net>
Date:   Sat Nov 28 11:36:55 2020 +0000

    Support Python 3.8 in hs_build_address.py
    
    The Python code is such a nice addition to the documentation and the C
    code for better understanding of onion v3 address generation. Straight
    to the point and easy to understand.
    
    Unfortunately it did not work with my distribution's Python version. I
    have adjusted the code to support Python 3.8 (tested with 3.8.6) and
    to still be compatible with Python 2.
---
 src/test/hs_build_address.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/test/hs_build_address.py b/src/test/hs_build_address.py
index 91864eabcb..216b7626bf 100644
--- a/src/test/hs_build_address.py
+++ b/src/test/hs_build_address.py
@@ -10,17 +10,21 @@ import base64
 
 # Python 3.6+, the SHA3 is available in hashlib natively. Else this requires
 # the pysha3 package (pip install pysha3).
+TEST_INPUT = b"Hello World"
 if sys.version_info < (3, 6):
     import sha3
+    m = sha3.sha3_256(TEST_INPUT)
+else:
+    m = hashlib.sha3_256(TEST_INPUT)
 
 # Test vector to make sure the right sha3 version will be used. pysha3 < 1.0
 # used the old Keccak implementation. During the finalization of SHA3, NIST
 # changed the delimiter suffix from 0x01 to 0x06. The Keccak sponge function
 # stayed the same. pysha3 1.0 provides the previous Keccak hash, too.
 TEST_VALUE = "e167f68d6563d75bb25f3aa49c29ef612d41352dc00606de7cbd630bb2665f51"
-if TEST_VALUE != sha3.sha3_256(b"Hello World").hexdigest():
+if TEST_VALUE != m.hexdigest():
     print("pysha3 version is < 1.0. Please install from:")
-    print("https://github.com/tiran/pysha3https://github.com/tiran/pysha3")
+    print("https://github.com/tiran/pysha3")
     sys.exit(1)
 
 # Checksum is built like so:
@@ -28,7 +32,11 @@ if TEST_VALUE != sha3.sha3_256(b"Hello World").hexdigest():
 PREFIX = ".onion checksum".encode()
 # 32 bytes ed25519 pubkey from first test vector of
 # https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02#section-6
-PUBKEY = "d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a".decode('hex')
+PUBKEY_STRING = "d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a"
+if sys.version_info < (3, 0):
+    PUBKEY = PUBKEY_STRING.decode('hex')
+else:
+    PUBKEY = bytes.fromhex(PUBKEY_STRING)
 # Version 3 is proposal224
 VERSION = 3