mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.1

Browse source
This commit is contained in:
David Goulet 2018-07-03 13:31:06 -04:00
commit 12258bbb90
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/bug26535.029 Normal file
View file

@ -0,0 +1,5 @@
o Minor bugfixes (testing, compatibility):
- When running the 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.2.5.5-alpha.

9
src/test/ntor_ref.py
View file

@ -336,13 +336,16 @@ def test_tor():
Call the test-ntor-cl command-line program to make sure we can Call the test-ntor-cl command-line program to make sure we can
interoperate with Tor's ntor program interoperate with Tor's ntor program
""" """
enhex=lambda s: binascii.b2a_hex(s) 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()) dehex=lambda s: binascii.a2b_hex(s.strip())
PROG = b"./src/test/test-ntor-cl" PROG = "./src/test/test-ntor-cl"
def tor_client1(node_id, pubkey_B): def tor_client1(node_id, pubkey_B):
" returns (msg, state) " " returns (msg, state) "
p = subprocess.Popen([PROG, b"client1", enhex(node_id), p = subprocess.Popen([PROG, "client1", enhex(node_id),
enhex(pubkey_B.serialize())], enhex(pubkey_B.serialize())],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
return map(dehex, p.stdout.readlines()) return map(dehex, p.stdout.readlines())