nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

hs_ntor_ref.py: pass only strings to subprocess.Popen

Browse Source 
Recent Python3 versions seem to require this on Windows.

Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.
This commit is contained in:
Nick Mathewson 2018-07-02 14:04:46 -04:00
parent 3c97b148a4
commit 3baf3d01cb
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug26535.032 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (testing, compatibility):
- When running the hs_ntor_ref.py test, make sure only to pass strings
(rather than "bytes" objects) to the Python subprocess module.
Python 3 on Windows seems to require this. Fixes bug 26535; bugfix on
0.3.1.1-alpha.

7
src/test/hs_ntor_ref.py
View File

@ -234,8 +234,11 @@ Utilities for communicating with the little-t-tor ntor wrapper to conduct the
integration tests
"""
PROG = b"./src/test/test-hs-ntor-cl"
enhex=lambda s: binascii.b2a_hex(s)
PROG = "./src/test/test-hs-ntor-cl"
if sys.version_info[0] >= 3:
enhex=lambda s: binascii.b2a_hex(s).decode("ascii")
else:
enhex=lambda s: binascii.b2a_hex(s)
dehex=lambda s: binascii.a2b_hex(s.strip())
def tor_client1(intro_auth_pubkey_str, intro_enc_pubkey,