tor-commits February 2021

tor-commits@lists.torproject.org

19 participants
1772 discussions

[sbws/maint-1.1] chg: stem: Set default torrc options
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 5f5f968a5fc65ea334b96e6deeda934980b371e6 Author: juga0 <juga(a)riseup.net> Date: Thu Dec 17 15:09:39 2020 +0000 chg: stem: Set default torrc options when connecting to an external tor and they are not already set. --- sbws/util/stem.py | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 4e8f321..9fea31f 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -161,6 +161,16 @@ def parse_user_torrc_config(torrc, torrc_text): return torrc_dict +def set_torrc_starting_point(controller): + """Set the torrc starting point options.""" + for k, v in TORRC_STARTING_POINT.items(): + try: + controller.set_conf(k, v) + except (ControllerError, InvalidRequest, InvalidArguments) as e: + log.exception("Error setting option %s, %s: %s", k, v, e) + exit(1) + + def set_torrc_runtime_options(controller): """Set torrc options at runtime.""" try: @@ -228,16 +238,16 @@ def launch_tor(conf): def launch_or_connect_to_tor(conf): - # If connecting to an existing controller, there is no need to configure - # own tor. cont = init_controller(conf) if not cont: cont = launch_tor(conf) + else: + if not is_torrc_starting_point_set(cont): + set_torrc_starting_point(cont) # Set options that can fail at runtime set_torrc_options_can_fail(cont) # Set runtime options set_torrc_runtime_options(cont) - log.info('Started or connected to Tor %s.', cont.get_version()) return cont @@ -293,3 +303,25 @@ def circuit_str(controller, circ_id): return '[' +\ ' -> '.join(['{} ({})'.format(n, fp[0:8]) for fp, n in circ.path]) +\ ']' + + +def is_torrc_starting_point_set(tor_controller): + """Verify that the tor controller has the correct configuration. + + When connecting to a tor controller that has not been launched by sbws, + it should have been configured to work with sbws. + + """ + bad_options = False + torrc = TORRC_STARTING_POINT + for k, v in torrc.items(): + value_set = tor_controller.get_conf(k) + if v != value_set: + log.exception( + "Uncorrectly configured %s, should be %s, is %s", + k, v, value_set + ) + bad_options = True + if not bad_options: + log.info("Tor is correctly configured to work with sbws.") + return bad_options

1 0

[sbws/maint-1.1] fix: resultdump: Check that the error has a circuit
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit e375cd28c8e19e3e9660547b134ef7759ad21e3f Author: juga0 <juga(a)riseup.net> Date: Tue Feb 9 10:42:34 2021 +0000 fix: resultdump: Check that the error has a circuit Because if the error is not a circuit error, it does not have that attribute. --- sbws/lib/resultdump.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 6673e9a..b287242 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -794,8 +794,9 @@ class ResultDump: result.dest_url, result.msg) # The result doesn't store the exit policies, so it can't be logged # whether it was an exit. - as_exit = result.circ[1] == result.fingerprint - msg += ". As exit." if as_exit else ". As entry." + if result.circ: + as_exit = result.circ[1] == result.fingerprint + msg += ". As exit." if as_exit else ". As entry." # When the error is that there are not more functional destinations. if result.type == "error-destination": log.info("Shutting down because there are not functional "

1 0

[sbws/maint-1.1] fix: tests: Run integration tests with chutney
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 5b8c47a1e3af95357381191106d1c9fd7d060852 Author: juga0 <juga(a)riseup.net> Date: Thu Dec 17 15:36:50 2020 +0000 fix: tests: Run integration tests with chutney and adapt the tests to pass. \o/ Closes: #40008. --- sbws/lib/relaylist.py | 5 +- tests/integration/conftest.py | 10 +- tests/integration/core/test_scanner.py | 2 + tests/integration/lib/test_circuitbuilder.py | 20 +-- tests/integration/lib/test_destination.py | 6 +- tests/integration/lib/test_relaylist.py | 16 +-- tests/integration/lib/test_relayprioritizer.py | 30 ++--- tests/integration/net/auth1/fingerprint | 1 - .../net/auth1/keys/authority_certificate | 45 ------- .../net/auth1/keys/authority_identity_key | 41 ------- .../net/auth1/keys/authority_signing_key | 27 ---- .../net/auth1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth1/keys/secret_id_key | 15 --- tests/integration/net/auth1/keys/secret_onion_key | 15 --- .../net/auth1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth1/torrc | 33 ----- tests/integration/net/auth2/fingerprint | 1 - .../net/auth2/keys/authority_certificate | 45 ------- .../net/auth2/keys/authority_identity_key | 41 ------- .../net/auth2/keys/authority_signing_key | 27 ---- .../net/auth2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth2/keys/secret_id_key | 15 --- tests/integration/net/auth2/keys/secret_onion_key | 15 --- .../net/auth2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth2/torrc | 33 ----- tests/integration/net/auth3/fingerprint | 1 - .../net/auth3/keys/authority_certificate | 45 ------- .../net/auth3/keys/authority_identity_key | 41 ------- .../net/auth3/keys/authority_signing_key | 27 ---- .../net/auth3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth3/keys/secret_id_key | 15 --- tests/integration/net/auth3/keys/secret_onion_key | 15 --- .../net/auth3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth3/torrc | 33 ----- tests/integration/net/exit1/fingerprint | 1 - .../net/exit1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit1/keys/secret_id_key | 15 --- tests/integration/net/exit1/keys/secret_onion_key | 15 --- .../net/exit1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit1/torrc | 26 ---- tests/integration/net/exit2/fingerprint | 1 - .../net/exit2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit2/keys/secret_id_key | 15 --- tests/integration/net/exit2/keys/secret_onion_key | 15 --- .../net/exit2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit2/torrc | 26 ---- tests/integration/net/exit3/fingerprint | 1 - .../net/exit3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit3/keys/secret_id_key | 15 --- tests/integration/net/exit3/keys/secret_onion_key | 15 --- .../net/exit3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit3/torrc | 26 ---- tests/integration/net/relay1/fingerprint | 1 - .../net/relay1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay1/keys/secret_id_key | 15 --- tests/integration/net/relay1/keys/secret_onion_key | 15 --- .../net/relay1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1/torrc | 23 ---- tests/integration/net/relay1mbyteMAB/fingerprint | 1 - .../keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteMAB/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../relay1mbyteMAB/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteMAB/keys/secret_id_key | 15 --- .../net/relay1mbyteMAB/keys/secret_onion_key | 15 --- .../net/relay1mbyteMAB/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1mbyteMAB/torrc | 25 ---- tests/integration/net/relay1mbyteRBR/fingerprint | 1 - .../keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteRBR/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../relay1mbyteRBR/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteRBR/keys/secret_id_key | 15 --- .../net/relay1mbyteRBR/keys/secret_onion_key | 15 --- .../net/relay1mbyteRBR/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1mbyteRBR/torrc | 25 ---- tests/integration/net/relay2/fingerprint | 1 - .../net/relay2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay2/keys/secret_id_key | 15 --- tests/integration/net/relay2/keys/secret_onion_key | 15 --- .../net/relay2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay2/torrc | 23 ---- tests/integration/net/relay3/fingerprint | 1 - .../net/relay3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay3/keys/secret_id_key | 15 --- tests/integration/net/relay3/keys/secret_onion_key | 15 --- .../net/relay3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay3/torrc | 23 ---- tests/integration/net/relay4/fingerprint | 1 - .../net/relay4/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay4/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay4/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay4/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay4/keys/secret_id_key | 15 --- tests/integration/net/relay4/keys/secret_onion_key | 15 --- .../net/relay4/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay4/torrc | 23 ---- tests/integration/net/relay5/fingerprint | 1 - .../net/relay5/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay5/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay5/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay5/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay5/keys/secret_id_key | 15 --- tests/integration/net/relay5/keys/secret_onion_key | 15 --- .../net/relay5/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay5/torrc | 23 ---- tests/integration/net/relay6/fingerprint | 1 - .../net/relay6/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay6/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay6/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay6/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay6/keys/secret_id_key | 15 --- tests/integration/net/relay6/keys/secret_onion_key | 15 --- .../net/relay6/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay6/torrc | 23 ---- tests/integration/net/relay7/fingerprint | 1 - .../net/relay7/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay7/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay7/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay7/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay7/keys/secret_id_key | 15 --- tests/integration/net/relay7/keys/secret_onion_key | 15 --- .../net/relay7/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay7/torrc | 23 ---- tests/integration/net/start.sh | 15 --- tests/integration/net/stop.sh | 4 - tests/integration/net/wait.py | 136 --------------------- tests/integration/sbws_testnet.ini | 7 +- tox.ini | 22 +--- 156 files changed, 45 insertions(+), 1420 deletions(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index ba0b176..58f12de 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -493,7 +493,10 @@ class RelayList: pos = int(len(exit_candidates)/4) self._exit_min_bw = exit_candidates[pos].consensus_bandwidth pos = int(len(non_exit_candidates)/4) - self._non_exit_min_bw = non_exit_candidates[pos].consensus_bandwidth + # when there are not non-exits in a test network + if pos: + self._non_exit_min_bw = \ + non_exit_candidates[pos].consensus_bandwidth def exit_min_bw(self): return self._exit_min_bw diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 2c0e675..40309ef 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -77,15 +77,7 @@ def conf(sbwshome_dir): # If the url would start with https but the request is not using TLS, # the request would hang. conf['destinations.foo']['url'] = 'http://127.0.0.1:28888/sbws.bin' - conf['tor']['extra_lines'] = """ # noqa: E501 -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 -""" + conf['tor']['external_control_port'] = '8015' return conf diff --git a/tests/integration/core/test_scanner.py b/tests/integration/core/test_scanner.py index 4a218f7..a6879db 100644 --- a/tests/integration/core/test_scanner.py +++ b/tests/integration/core/test_scanner.py @@ -18,6 +18,8 @@ def assert_within(value, target, radius): '{} of {}'.format(value, radius, target) +(a)pytest.mark.skip(reason=("Disabled because chutney is not creating a network" + "with relay1mbyteMAB.")) def test_measure_relay_with_maxadvertisedbandwidth( persistent_launch_tor, sbwshome_dir, args, conf, dests, cb, rl, caplog): diff --git a/tests/integration/lib/test_circuitbuilder.py b/tests/integration/lib/test_circuitbuilder.py index 0b47e0a..0b9d9e7 100644 --- a/tests/integration/lib/test_circuitbuilder.py +++ b/tests/integration/lib/test_circuitbuilder.py @@ -1,19 +1,23 @@ """Integration tests for circutibuilder.py""" +import random -def test_build_circuit(cb): +def test_build_circuit(cb, rl): # Path is empty path = [] circuit_id, _ = cb.build_circuit(path) assert not circuit_id # Valid path, not valid exit - path = ['117A456C911114076BEB4E757AC48B16CC0CCC5F', - '270A861ABED22EC2B625198BCCD7B2B9DBFFC93A'] - circuit_id, _ = cb.build_circuit(path) - assert not circuit_id + exits = rl.exits_not_bad_allowing_port(port=443) + # See https://gitlab.torproject.org/tpo/core/chutney/-/issues/40013: + # Work around to get supposed non-exits because chutney is putting Exit + # flag to all relays + non_exits = list(set(rl.exits).difference(set(exits))) + entry = random.choice(non_exits) + # Because in chutney all relays are exits, we can't test using a non-exit + # as 2nd hop. # Valid path and relays - # path with relay1mbyteMAB and exit1 - path = ['117A456C911114076BEB4E757AC48B16CC0CCC5F', - '270A861ABED22EC2B625198BCCD7B2B9DBFFC93C'] + exit_relay = random.choice(exits) + path = [entry.fingerprint, exit_relay.fingerprint] circuit_id, _ = cb.build_circuit(path) assert circuit_id diff --git a/tests/integration/lib/test_destination.py b/tests/integration/lib/test_destination.py index 98ed89f..f23e266 100644 --- a/tests/integration/lib/test_destination.py +++ b/tests/integration/lib/test_destination.py @@ -24,7 +24,7 @@ def test_connect_to_destination_over_circuit_success(persistent_launch_tor, session = requests_utils.make_session(persistent_launch_tor, 10) # Choose a relay that is not an exit relay = [r for r in rl.relays - if r.nickname == 'relay1mbyteMAB'][0] + if r.nickname == 'test005m'][0] # Choose an exit, for this test it does not matter the bandwidth helper = rl.exits_not_bad_allowing_port(destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] @@ -44,7 +44,7 @@ def test_connect_to_destination_over_circuit_fail(persistent_launch_tor, session = requests_utils.make_session(persistent_launch_tor, 10) # Choose a relay that is not an exit relay = [r for r in rl.relays - if r.nickname == 'relay1mbyteMAB'][0] + if r.nickname == 'test005m'][0] # Choose an exit, for this test it does not matter the bandwidth helper = rl.exits_not_bad_allowing_port(bad_destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] @@ -73,7 +73,7 @@ def test_functional_destinations(conf, cb, rl, persistent_launch_tor): session = requests_utils.make_session(persistent_launch_tor, 10) # Choose a relay that is not an exit relay = [r for r in rl.relays - if r.nickname == 'relay1mbyteMAB'][0] + if r.nickname == 'test005m'][0] # Choose an exit, for this test it does not matter the bandwidth helper = rl.exits_not_bad_allowing_port(bad_destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] diff --git a/tests/integration/lib/test_relaylist.py b/tests/integration/lib/test_relaylist.py index b3d97c2..26195cc 100644 --- a/tests/integration/lib/test_relaylist.py +++ b/tests/integration/lib/test_relaylist.py @@ -1,20 +1,14 @@ -from sbws.lib.relaylist import Relay -def test_relay_properties(persistent_launch_tor): - cont = persistent_launch_tor - # AA45C13025C037F056E734169891878ED0880231 is auth1 - fp = 'AA45C13025C037F056E734169891878ED0880231' - relay = Relay(fp, cont) - assert relay.nickname == 'auth1' - assert relay.fingerprint == 'AA45C13025C037F056E734169891878ED0880231' +def test_relay_properties(rl): + relay = [relay for relay in rl.relays if relay.nickname == 'test000a'][0] + # The fingerprint and the master key can't be tested cause they are + # created by chutney. assert 'Authority' in relay.flags assert not relay.exit_policy or not relay.exit_policy.is_exiting_allowed() assert relay.average_bandwidth == 1073741824 assert relay.consensus_bandwidth == 0 - assert relay.address == '127.10.0.1' - assert relay.master_key_ed25519 == \ - 'wLglSEw9/DHfpNrlrqjVRSnGLVWfnm0vYxkryH4aT6Q' + assert relay.address == '127.0.0.1' def test_relay_list_last_consensus_timestamp(rl): diff --git a/tests/integration/lib/test_relayprioritizer.py b/tests/integration/lib/test_relayprioritizer.py index 0cbc98e..c9622f1 100644 --- a/tests/integration/lib/test_relayprioritizer.py +++ b/tests/integration/lib/test_relayprioritizer.py @@ -45,25 +45,27 @@ def test_relayprioritizer_general(time_mock, sbwshome_empty, args, rd = ResultDump(args, conf) try: rp = RelayPrioritizer(args, conf, rl, rd) - results = [] results = [ _build_result_for_relay(conf, rl, ResultSuccess, - 'relay{}'.format(i), now - (i * 100)) - for i in range(1, 6) + 'test{:03d}m'.format(i), now - (i * 100)) + # In chutney the relays are from 003 to 011 + for i in range(3, 12) ] for result in results: rd.store_result(result) - best_list = [_ for _ in rp.best_priority()] - # Of the relays for which we have added results to the ResultDump, - # relay1 has the lowest priority (it has the most recent result) and - # relay5 has the highest prioirty. The relays that we didn't add - # results for will have the highest priority, but don't test the order - # of them. Skip to the end of the list and check those guys since they - # should have a defined order. - for i in range(1, 5+1): - nick = 'relay{}'.format(i) - pos = i * -1 - relay = best_list[pos] + best_list = list(rp.best_priority()) + # With chutney, the relays not measured, with higher priority, will be + # the 3 exits and authorities. + # So take the list from the first measured relay, ie. from the 6th + # position. + # The measured relays will be in inverse order to their name. + best_list_measured = best_list[6:] + for i in range(3, 12): + nick = 'test{:03d}m'.format(i) + # -1 To start by the back, - 2 because their names start by 3, + # not 1 + pos = (i - 2) * -1 + relay = best_list_measured[pos] assert relay.nickname == nick assert relay.relay_recent_priority_list_count == 1 finally: diff --git a/tests/integration/net/auth1/fingerprint b/tests/integration/net/auth1/fingerprint deleted file mode 100644 index 35f9670..0000000 --- a/tests/integration/net/auth1/fingerprint +++ /dev/null @@ -1 +0,0 @@ -auth1 AA45C13025C037F056E734169891878ED0880231 diff --git a/tests/integration/net/auth1/keys/authority_certificate b/tests/integration/net/auth1/keys/authority_certificate deleted file mode 100644 index c59fad5..0000000 --- a/tests/integration/net/auth1/keys/authority_certificate +++ /dev/null @@ -1,45 +0,0 @@ -dir-key-certificate-version 3 -fingerprint 3668D8876241ADD04B53CAB08E7442BDE6EC9A06 -dir-key-published 2020-06-08 15:17:09 -dir-key-expires 2021-06-08 15:17:09 -dir-identity-key ------BEGIN RSA PUBLIC KEY----- -MIIBigKCAYEA2Us9kIWgU5135VjC7/kLWqIaTZ4STmg7UvNlabr6naPE0ATOpEc6 -Z58HNkVDxfAxge8uk58lim/mifw18PHeWhjU3dWNF4JLzoWoHIZ3fmea22xz8IzT -9mnSrVtOb8yGjqrSQwhB78Aq/y1eHGGwkAWYe7AT+ytIIYRVU05l7J4q3TqYI/D+ -V8LIu8h1vrlUPp3vhxAxelu/iykb45b2g775AMyodLZQnA86/00FJDUMt/3C2mKc -fhXV7zlhZxo92iJ2aEkl94p+6PR2CurtHCv2yj1dA8ZS80Jc+npaveVbYbMxlyPU -QujLb3cv4lTDNGxQ4azsm6gv2uZbqErCmZSfLQrRfg3tMy6OhV5sXsxzOiDJj8rV -fDQQV++EbJhHhoWb+jrkTn7AoZWryniZOdh5CZ3SroICzjsvLif8bLF5g5kgh2ic -fMkf1U10AF8Lh4UzGAQw1OUsP6ffcolaCv7iOCD9YgAOZHTTe05Kz7rhaE+uT+em -sM4ZQhgGFj9BAgMBAAE= ------END RSA PUBLIC KEY----- -dir-signing-key ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxcZ1sPDjdapTgNm7s4pC5d9ITjE0jwjR3HULsOQpp31M904T9V/z -R/POA4IXB+GpplzoE/9vv4TR9O9RRiL7r+8jQ+D3KUSMa6OspC+ZCJ1kAZIpQQ6m -c5DDAa0HvZHxj4WNATPTmzx6DVRkGviO7To2KlXRSqUgZ5NqT2ay70tXgfxzL/dF -wGD3dd3uOj5I0D47v+Cq3Eb/uvoAQY2wTcO+Lxmvrrq+6nRucIwGEALmBE3o9uBB -010vy56JTmYRNScaf8rB1Kv+qcxidZYST+JIyI/MfNnl5Q5O9bLZPqyST+CqiOb5 -PUr4+O4ViOqGcX/FInQ+0To1IOL+Zhy0sQIDAQAB ------END RSA PUBLIC KEY----- -dir-key-crosscert ------BEGIN ID SIGNATURE----- -I4CmfExP01dupA5UeSBZhLKdLQGqAZajYb1OaIQ353Ts9+F6cx7xf7k7aEepxuqi -33a2M6M8OECbjB41U/R0b2aRI7t1n0fpMrQ4O0PcSYletAltPxSJrZjr1HPRvJmT -NzWF5IJYjvkge01QNksdsOheYmAXgDlkq8+bsSh6mny07FzNUlVPxPAoy3MAnuyV -wbSZEwCHH6Ca9O94cz8Hnou/1B+bZ3EefHMePcFCCNsYMtDDOqvxbjKTyb+yRvfm -dijqO9NmPBMxxT9T1kNEnH6Kd8ctoKTLTKOPTOdnkv4Mxp+XP4ne/q/P8+Xys+4D -pd3lA2uNrvOXgVzrUpbC0Q== ------END ID SIGNATURE----- -dir-key-certification ------BEGIN SIGNATURE----- -CPIHwIO7KiRnZnecJLzfBZxGVRlQLarC240pSxZEnJUhq+AP6MfQW4Sx3ttvjAfG -sLZEEt4LoMoOeNAmCttFDGjO4knoqV1LXlTBMdplzcj9g7yOeeQUzhvadjO7wA9/ -K01R/HW8JyvGECjLzIoxgNUTC7rLiGA+YHfExbiA8s96rZ67tV8Zts/W8aAboEcq -8bo4n6shVG3QXOTyECpBjrFSi4RwPYrMwJOtto8RbQY4HVbRwNFrOhliT0xAkvYo -4aDFKmixHpXeywXBJPKTpOWfsH0+8idzTKee9Zq9Ir1nvsjHiJo6VsKrBSOvAbAt -j+6CFPh3uwcOUFp0LZ9OkO+wKRXlyMBS4U+2AAL2oIq7ekTOd9sOo14Hl8sP78lW -nu2uG4+bUzsZolxCY9aHjcwC2xN4ZLFzPmjjnQu6CNNa/pjfP6ZdsZY58h6IO0aR -q4StS6wM8RYlQuGVY8io2K5R28T4bIt2ADPBXhNHqCkiYYlaFRv68Li1LXju/US4 ------END SIGNATURE----- diff --git a/tests/integration/net/auth1/keys/authority_identity_key b/tests/integration/net/auth1/keys/authority_identity_key deleted file mode 100644 index 5c0c5a9..0000000 --- a/tests/integration/net/auth1/keys/authority_identity_key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -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 -gWkgB314RFh5PpYVMRM= ------END ENCRYPTED PRIVATE KEY----- diff --git a/tests/integration/net/auth1/keys/authority_signing_key b/tests/integration/net/auth1/keys/authority_signing_key deleted file mode 100644 index 25c34f4..0000000 --- a/tests/integration/net/auth1/keys/authority_signing_key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEAxcZ1sPDjdapTgNm7s4pC5d9ITjE0jwjR3HULsOQpp31M904T -9V/zR/POA4IXB+GpplzoE/9vv4TR9O9RRiL7r+8jQ+D3KUSMa6OspC+ZCJ1kAZIp -QQ6mc5DDAa0HvZHxj4WNATPTmzx6DVRkGviO7To2KlXRSqUgZ5NqT2ay70tXgfxz -L/dFwGD3dd3uOj5I0D47v+Cq3Eb/uvoAQY2wTcO+Lxmvrrq+6nRucIwGEALmBE3o -9uBB010vy56JTmYRNScaf8rB1Kv+qcxidZYST+JIyI/MfNnl5Q5O9bLZPqyST+Cq -iOb5PUr4+O4ViOqGcX/FInQ+0To1IOL+Zhy0sQIDAQABAoIBAQC2mItyaITozu+3 -h87nbWBkUSi1oHJRGKiBLMM1dwIKNAJKVZjRs9ut86ehz4qp6SuzgBV42R34KY2a -4RUddxD+lv/tHJe1TyeB/aRYFeXpcT6ywJo8CWWeTunr8y+xUzw98OSFVq8opMZe -5ipiSFfVKCh4H7FShHANkKnXUw8jI76rUOTGx+SO6Zt+rOk0Am/pWbD/6Co72PqE -HuMUdvp2TQnuh3Cs4boQY/8Mi1iwm1Ya7W6U8+3ctAf1SpPjLDZ7VfdMbA10M/gM -OBZdN/9eLN3cbcjQni4V6OiQyXsLvE7fleb8+c1DeztwVQ7Vbt0BZJW0xiTQc2Jn -2D8NmKA9AoGBAP5+NeCB6yJ4krixOV+UYQf6zk2TetvK3GIzin1pVunPd8FP73Un -gpAWnCiZa6m7y9iXXn9OWEMAvFC/9R1Ovj8+Jjgi7nqta5gdICiuybydec/HnNwI -xILk4OQ5g5M35c1Fxq9xj3ZBsluLKlz5zPfDrFIs+Ek3fUUFByMtsRejAoGBAMby -RR6HqWZGDJLEfSAnVgZrG4fUS/DBKMoKxjF5YLQ8Wxurn1OppzcOYALsARoGx91+ -DAdKyfXb6EG3tJp57+HxVQanZR+Jxm0soEztua2cQQgsIqvislVy3Wdx2fzJ1TUM -lgMMz94T0xLn/UX72NdYCZVMvBskpp3AyjJpaVebAoGBAKh87LSXrxHiW9k1VDPI -a7k5vm4zzupHU0MctnqzTBx+A94TSwj4QIOexIJImLQGJj5ecOy99MdfbE3V2LUv -ldsPDYSq89J6kDpkRg9JMTzT0XrTwDEZCOlUGORgg5DrOBSANrue5ok3k5rx9vkZ -VS9P9/1r0nG+8AvK+V+793wbAoGAW9ryROVYNotzNLSaHSVsV6xOWsmPgop8vcR5 -u9AR8UXIvx7fgm5bcVUmyVKUM6Mb1s1i2l8Snny5YNZkAcr5EfYuTtMtIoGnZzLq -lHpSd7EkaZSPMZOKyV8ukJuFjWzXDxZPkPryYtP+acVJMG3WsZ7JVfDHDTU/5Khl -8x6ub68CgYEA6hi2ElgEDoTFqGiCdSuH/twpat8CQUrnpNN7ArlQl0cjWnlcLORk -dAPoYGxVD1XAmc7vPcu7//Rsj/N2i+jjjX7onjgCFSIs6WjrSOtEeXB6K+IE1wvg -ZQOAe8Sf5kCeziKiDkytmnExDdwboEQcNLTGkomyQViYkqT1rtEM+rw= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth1/keys/ed25519_master_id_public_key b/tests/integration/net/auth1/keys/ed25519_master_id_public_key deleted file mode 100644 index 6384d54..0000000 Binary files a/tests/integration/net/auth1/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/auth1/keys/ed25519_master_id_secret_key b/tests/integration/net/auth1/keys/ed25519_master_id_secret_key deleted file mode 100644 index 5e6f84f..0000000 Binary files a/tests/integration/net/auth1/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/auth1/keys/ed25519_signing_cert b/tests/integration/net/auth1/keys/ed25519_signing_cert deleted file mode 100644 index 2c9595e..0000000 Binary files a/tests/integration/net/auth1/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/auth1/keys/ed25519_signing_secret_key b/tests/integration/net/auth1/keys/ed25519_signing_secret_key deleted file mode 100644 index b8539f1..0000000 Binary files a/tests/integration/net/auth1/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/auth1/keys/secret_id_key b/tests/integration/net/auth1/keys/secret_id_key deleted file mode 100644 index 56dee40..0000000 --- a/tests/integration/net/auth1/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQCp1JWcEUli3Js4KtJxpBzJChh8JB+0eY1ijUKXVvKSxFhhM/oC -Ga3OUDnBaxQNSPxvva2I1U42y9WX4H1ps99OMZYXKrDZE5AmWdAXSgbLOKb0oi9C -wEhzRdcpGFo/WUzIUB1pXp6p2mrsUGO9IFKbXpbR7N3iPgaUM586redRsQIDAQAB -AoGBAI1ECZaiQnr7qhmUdSyWKGOKBEfu/Hhwy4x4mDWu22P98s4YIBPzLEH7Na+P -1EQgu+puypSRadfmwartzyRHvKzA0QU3M6j7IW4wKg+hX82gXg6BXkcwhlyyhrs8 -MMfTQgqdJsD1fyDr+HdIpNosDQY+3UwxTEF685uncBzOsEGpAkEA3TCQOe0DbTMT -vU87a+jdB1TzkcqR193Slq+QUPTbHlPp4ZRqiHrHfEFYUTAfMrLgiQ9wjO6+8LiF -wAyal/ItgwJBAMSO0u5IBvuV3EVJjMLCrBmKgyDYNgcJbFtS2TRJrOf3Lcx1fNIZ -5gQkZa3nMveJTz0pyIZy7u95D1kimG1uMbsCQB/iSzf+YVsRXMwSKsegVpQi+8VN -RP6v/BY6knwI/7j8cZ9RzJWF1VGk/b0eSbD+Nf2r2xaFp8J9ZtJLPtGeWE8CQQDB -9ephpoP1edFuMgEMI4wufAefvpu53+ukRqH9vgI4uSrhisJMla/sQHpx3CboLAAc -bAHr4rizaTPjEod13PqHAkEApA1cDrg+iaoOPC1oepafihiI76shg0h4C0Y+vUKM -e4NQO585teKCQYOgv0nacERL+EcANGW6hd0eaRDCPtFxwg== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth1/keys/secret_onion_key b/tests/integration/net/auth1/keys/secret_onion_key deleted file mode 100644 index 6921a65..0000000 --- a/tests/integration/net/auth1/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDPNpJm5eyFijX8GxH4tpX2YKhTxVTwZezI7n0jDpQ5zmndLV22 -zHB2OY1UFS+5LtjzPEm2w71maa2z6mPS21qDPx90Ez4GAE3fkUPnqCLmgAQUxNdG -7MeFQtlo7M7QuMTUrWZYbgQVTGDWn/HLRxik0kgpddj42VCI516Aaj6eNwIDAQAB -AoGAKHVDSIwEDl7aA4tVivY7eYuN0i1pVDbScLj//eRO1KqUyPaeoZ5xJuQ9z/kD -BGk9OuC+k8zMIj7oB4TwUK87kKKihgIkQacuBa17ERc+xVusgpEJlYKNHXCe3vFm -qPhHfl1h08K7sXDE7bB81vwCabSHqCFO4Yy4KuM/XHRqZ+ECQQDzcL6qNzsJpQRh -wUtXDpQ2oDxExUohZNQ45fkGIJy1zRnxKR9Drr1ikM58xdelte/bFEjfImvj624M -YFGIrtQVAkEA2edafRFHu9kDm7Bp2s4gn0ysdJ+pKmcX1haoJzqFBKOR/CzgFhkU -w1ptBUWR+6A2OigFOIsesS3lQBl6ROVAGwJADXrnw+stBLqzhGo8rsRq5p921uQJ -19GKguARKwqxQsvprNX3GjtZ11RnardV2qI5dusnodt5F/TYciz/Ns9fhQJBANlp -YTq6PBVsEJKNcQCUe64VhVgTWWjqVbkRABOr6r5XKbgvWiISQkor9ey1nlMuZgye -k574B9aGUV8kTH9jMRMCQBUieqme0Q/iISEY52o1TwJfs993FQIFiVg8yiS1ekN9 -HD1qnkmmusdGmEGbYYGpLjpf8nFw+5IVtCOsj+5WOjE= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth1/keys/secret_onion_key_ntor b/tests/integration/net/auth1/keys/secret_onion_key_ntor deleted file mode 100644 index 5004432..0000000 Binary files a/tests/integration/net/auth1/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/auth1/torrc b/tests/integration/net/auth1/torrc deleted file mode 100644 index 1318647..0000000 --- a/tests/integration/net/auth1/torrc +++ /dev/null @@ -1,33 +0,0 @@ - -DataDirectory auth1 -PidFile auth1/tor.pid -Log notice file auth1/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -AuthoritativeDirectory 1 -V3AuthoritativeDirectory 1 -Address 127.10.0.1 -SocksPort 127.10.0.1:2000 -ControlPort 127.10.0.1:2001 -CookieAuthentication 1 -ORPort 127.10.0.1:2002 -DirPort 127.10.0.1:2003 -Nickname auth1 -ContactInfo pastly(a)torproject.org - - -TestingV3AuthInitialVotingInterval 5 -V3AuthVotingInterval 10 -TestingV3AuthInitialVoteDelay 2 -V3AuthVoteDelay 2 -TestingV3AuthInitialDistDelay 2 -V3AuthDistDelay 2 - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/auth2/fingerprint b/tests/integration/net/auth2/fingerprint deleted file mode 100644 index 7230e47..0000000 --- a/tests/integration/net/auth2/fingerprint +++ /dev/null @@ -1 +0,0 @@ -auth2 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 diff --git a/tests/integration/net/auth2/keys/authority_certificate b/tests/integration/net/auth2/keys/authority_certificate deleted file mode 100644 index 930375b..0000000 --- a/tests/integration/net/auth2/keys/authority_certificate +++ /dev/null @@ -1,45 +0,0 @@ -dir-key-certificate-version 3 -fingerprint 100036EB705CDCFB1746B450C23B861F554A3630 -dir-key-published 2020-06-08 15:46:15 -dir-key-expires 2021-06-08 15:46:15 -dir-identity-key ------BEGIN RSA PUBLIC KEY----- -MIIBigKCAYEAsOq+19UQ03eJq8nJXLKGXHhdTwqABO5pqb1rfy7kObl6oNH1KdZD -e6x6DubGFRG287YuPn/wPs4QiDQnlkshOQ7Mro63rh9lBt02u5dcu49tGyLcWXdu -FMvzVavKuU3y58sF+5OdNP8u0RGz4o5b9jAkMWbi1UqtbUDFcufMbnEffskq5Wbf -BAxxvbVTIwkRjBPsR9JpQTVJf32YOivzcGmF0tfS8H+mtBySoCzWvSLnKisJ3yPF -fsD12ZevmQEYxvwi6RzD1hbqn9gmQZfrHTQ8sN/0kgt4enrxeC5piZKfih7z6d4n -Dkg5+78FDT6PBtX1hs99fQUqUE5lRr+pq+Y2tgd3H3TH3EQ5gUeGXZKa99Gy7lmZ -0oCn2StVS8cAf8CmHb3pz2xIeKZalctDf+oIqNEu/gAjLzGDqusQRpqe+XaEtQAl -Xl/yU2Kqar7qkqBhKiuw18hhZFZGlXm8QjqJ5RZe/nL3+MD6yB2651ZBYDkiNDCa -p2Iv2YDpZn63AgMBAAE= ------END RSA PUBLIC KEY----- -dir-signing-key ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA11aF5YyGT5NnlDcofP/qDhibwBvY5EVJavbnRRrq2C7nSX2F9hNg -DCTml92xJEDi7K5vM5V0DiqeP8YaAcoHnRAgNQwM2IasY8iRi6uFJAM1M5e4HhI6 -lMwavQshor4BuLLwcJJmlN2HpQr3QPhkYiO7ZMCgnL9DwvVds5D5pxZTbTs6FQ29 -LWG84NfOmoTPvqjboUW12E4REyEw+xjmxg+DDIAzJY5u4E14vyIfG84oF6kFog+S -yFRNnJc5xnWHL7GeZ0+OtfjfFGSMVgdLgLXFhjfXXQq8GqBayPUuO4eqyxdLJcqV -rZnO1Q6mL+hrXp4RKaLbZI+Y9btVD/1RfQIDAQAB ------END RSA PUBLIC KEY----- -dir-key-crosscert ------BEGIN ID SIGNATURE----- -qdZQ28nYxQhV/ROioYIXpYilTs9K9XKNBLCStgKTjgwkO7SjlU6SUZmwDzAHBBsa -X2Rr3Prgj+CD7VGnSr452Pd2XHvbIL8BLElgRdVETCrgfRqyapQF9nk/ivJPGqB7 -2kQelIx8Sw3zmyLfGUpL0sb3rHeGcQrZlSjOEs7N97FSt7KLujIn0cTai4UDW81g -r48R/+HFDlKOSBdHj5n7AnhdHozUxAZdNrcyyh1SmG9wX1STmNeEKRj+c0qgGJAv -cFPPFGzTi0ePrnTC/HfWDbBCxy9uOlVgfChndWw9hUFQMqAi4+NJZtpp14MPTc1h -6cW4xq5ACq0frlZmgWPmQQ== ------END ID SIGNATURE----- -dir-key-certification ------BEGIN SIGNATURE----- -psMOIdjpqEWtPmOTrqYBvh7y57KWfxarwyYFTYQ6cx+iBjWiEbT0Cx8tbs0H3Y4N -XlFqYLqgOM3SOXyPBJYVTrsunupmplofrG1XvSyJ9CssEKko4kZuKZTCZDXfeE6F -CHrjIlkpnFK5HiuAJ/guNXVkF713Ne0Obm1T76SYjcqaLqw1sMAG05bh96tWEurc -p4hrvhNPM3VWSPnXuK3abXWtAcP0SAAwFVCASO6vJD7Iczmnt5Of6eZIBnc5Ybrr -UN0wxBGw2wIz+lsFZpkAnCBVqq9M5bYG6jI7FM0jwNKza5BGgRzHLu7pcvKe0PTz -0YD14tOWZJsXzLvOf+xMi4QJKaR+7GHEnpIqABX+UMylIH7Hb+P/T43LHDQKaYvi -AtIz7+PXMv900LpGtFaH2UNEUp0Qf9deU2oygVG4RKgHPYhUiBXhoFbnvPn75e6S -a9IoZym6DvWSttNWH0gUntjDrNJoypwi9gR5/uIPW/DsYCBvm9v2IcJZQPCSmsCP ------END SIGNATURE----- diff --git a/tests/integration/net/auth2/keys/authority_identity_key b/tests/integration/net/auth2/keys/authority_identity_key deleted file mode 100644 index dcfa6fb..0000000 --- a/tests/integration/net/auth2/keys/authority_identity_key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -MIIHKjAcBgoqhkiG9w0BDAEDMA4ECC0o+si9JqA1AgIIAASCBwitMYYuY6eKl9bx -B1zTxNQREr9ngoBhHoPU3WCtfbp9M7sIpE9b+F3SHc2jCvxzWcaTrPg/RdiAw2B3 -BZ+Wu+2tGt+W4pThn0xWWZrjXtKKCUAH7OhoOjb+mqcHBMGufyorqSVdTCfj6yDE -JN7vBo0l0/dIZQG4iW+R0D2zCqI+vOkg4/u+s8gYWj5egTBAAVzLz3pU0Fstc7nT -V340Chsn3piP1/jP4iSReRAkXHqAAgwfNeqZEvsKg3QgMQ2u5pVMvESwBPuI3yeX -ihk7KGEe5UqwWXmBEsjE/hxf8l8ND4SE4bt9IIPaxNgn1cXYPnQp+3Rc94HT2RPn -crGQ4kdKbNFOthlv9HBWXshvKIs2e8J3uISz8ZqUjn9W/ZE4+XHOo1CenU0Ywi7i -HVmuKAhXPWAF4CGtNzySiwmG09AbD2k7utgjJ0YjuivyXjc4SiEn7UGBzDvP0oCJ -ixewyL06c1/HvApULXfCdBjvzDCkdOe3sVAare4ATSsRWtrBaW8CrWlGEXwYn2+t -t663pRQBAXlZ8+96HMFApanSRP7A10ZURtE+fCeFzBckqucYngrybUZJCuIgIC1D -HyLFeKFED8tyf+OehX2/q3wVxOhlSRKqakac1jMkhRwU8mejfoxPmb7iGjxy5VZ8 -/zlrCreMC2Xjy30kbKYWshiL2Z/++P5x91cDLLnphzByuDd7aUF6JLDzdfDWkM/w -lnPoizimtV+GotKL6cAnjXA94K8cDzr2Q0BwK6JXArXRfD7RM2MWwrtQFDdivzY5 -xsgYKHeJ6D/JhOI8O03yv4J9yQziwOFuymGuuuuQG1HHZir9dk9vl8mPqoVJmT8G -40sMFEq1xLv1sLDaRITAcHyeJ1n/ANw4BgEWbjqT8szOx9yIvh8Yn6EhDeSCEt8k -1opb7U0K2WxCAYutUPwu2w+J2dskfCFEO9QIhfWRMNo1jMWTfazXB1BPV2SUs6Pr -g6gELxqBsFX7QsG9wmC1dNf/DvBv8vO1OOfpeFXAR5lzcIsDuuCjvPD/YdpPBHjN -cjQZ+/Ori79d+86cmsVGe0X62Lx9wxl9RxzdvAWyR+q2mLlhRuMOcvZtVC39hlLM -xkANYi/PMEL4UH7Hx0fP1ywB3yE1RVCIF327FeX69hNicqTaAaT0KTaFQLwx3xWH -3QiLcqzX6pZ32QtN9ytC5lssF2PsEbeZWkoQAdj395fSk+jP4iZiBm4Vlfh/OTU0 -kOgFyF85jKHjXVUvpcGprGZWh0uOaStISbEhEUmFyGMIMJmGRkUm/4mowLQZT56k -SZptlrZb5RksbcpPTVB8jbG3oz24SOxqxNZBIMgXaIBc4N89YxwFzWYpA4U7P8bf -8afh2vjgmY2IZZpucxQmuB50J8oDxdj+5pPoTAn1/6UgOuHRChRu37t5a8eK8lAV -RUfXuO1ZBI70Arflv+SHmBQI+Vx2W0Itdc6bV68dY5njWuWxb5veuk+wFmv76377 -qKg+OeakoR/1jhlMcqkOJha3+jD84vDnq+kdt3BX5ZBqdPVUBWHFDGjYA1IN7oHl -7f77fSx479Gxo06AF7ZjoD1EyWtqbz3idoabNT4260yz5m8+KafpmT68ozoemzuB -I538Z2hP5P9in6fRViSL5aall3KCERi2cia6uk+l1vgytfDgh4z6xm0GzDgnu8h+ -kA3f+9OVDcDeGqBExhp+zMscjFYnL15aocVA0D8UL9SUSP9Ho+YhiGKzx6EvCbEk -vyAkHPJabrahFrzoI2lqAiS2t+DbGdCJCL+ZFpMtQdgweceWQ4liMrBqkcLnzMUZ -S5VnQF8So5d1ib3ATFgNIM/pKaGWfPovCqG6Ga7JfE73OfWtJ4nT2bWE3xylqKgO -4uts4leJkOa6a8jaWlbcdTC4DexKa5PpZhkuZxteLxQVpeS0FIUikBdhbV8Hoqpj -kbg6WZS3qXMtUOneKjO7mj0fzl6vYKf2+4IIzbzcACPZzUegjjgG/DA9VGNThvU5 -CWY2M03/8SlY2clFmZsc9whSU4epW8oH1Wwv6hu47g9nzG8ZOQnwEbPpTj4sXoHw -lJEDYxjHraNKuYWER+5qgfidOXo3JwrqjRhOhNhoCD5W+WntTGE2xJTCtWMMQAyS -aozJEVjM0YYcZakAKQ6gBbb6yjGeCzPjA9C9wunSJLwVAXSTGySEbK3DABbCB/u6 -n7IlH2wdIyJkK13FqG2lZAeLzj+ewdr786a/KaX4JlOntHQV+CH4oEBaVr7K9Q9p -DAMZhVGZeOPVF3M/bmqbt7fw97Hpp+ShuDQ2JgsR5+8Dk9Emgu2y1TDqnYCOYkyb -7yhEVk7gM962nigu6S6ikfAlz6cGpi7q7VBMpMNI+hJsq1iXLJZvKdnS2QS5rMun -7JtLaHY/M5uUoFvBcCw= ------END ENCRYPTED PRIVATE KEY----- diff --git a/tests/integration/net/auth2/keys/authority_signing_key b/tests/integration/net/auth2/keys/authority_signing_key deleted file mode 100644 index 93a3c8b..0000000 --- a/tests/integration/net/auth2/keys/authority_signing_key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEA11aF5YyGT5NnlDcofP/qDhibwBvY5EVJavbnRRrq2C7nSX2F -9hNgDCTml92xJEDi7K5vM5V0DiqeP8YaAcoHnRAgNQwM2IasY8iRi6uFJAM1M5e4 -HhI6lMwavQshor4BuLLwcJJmlN2HpQr3QPhkYiO7ZMCgnL9DwvVds5D5pxZTbTs6 -FQ29LWG84NfOmoTPvqjboUW12E4REyEw+xjmxg+DDIAzJY5u4E14vyIfG84oF6kF -og+SyFRNnJc5xnWHL7GeZ0+OtfjfFGSMVgdLgLXFhjfXXQq8GqBayPUuO4eqyxdL -JcqVrZnO1Q6mL+hrXp4RKaLbZI+Y9btVD/1RfQIDAQABAoIBAF/JPQY+2//Jselc -H8Z6j8J1b9KkkHX53A6YhYdX0d8X/gnSrCQpui+sumYTVxipREfDz/NCJ72ld38m -v6rME1bqNWljUtN+FHDOZu+Z/D9oreGlO2Ek+qn1oG825F9f5aQi9JEejkLpx8zC -c/mShBSjkFfg15DiA2JVgri9ZE/N7YzAJJuJbuqJvt2lrloq/eu3BP5+Ek81Qslw -hytFfKCxBDtgHngCV95DKWDbAPswOvC7JiU3IwSVhojMdU0VGcV6qfHJwMaJKC2H -vtPG4CMLzgvxNJ1H9kLTQflno8b4JnJRa0uMWXfEGDrTJ7GUh4eb13uPLG19Um+5 -ut4EZAECgYEA8w7nuKin+q41E0EiYP7kjVFiY58FTrUzr+fMl/AISqnrAwJQSxcY -Ha3M8C4udsuyzcPNMUWOVclkhKke1Qc9v9n8DPkycp6GqhEXVvYAQDF4kKO299q4 -GeAzGT0XHnn3luQ7Eude+rPhymD3HOwsZedLsQbiEij3nuNg16XReKUCgYEA4s3E -UbCPQeZemYqX0RY0a9Ehgn+OGFZ2HJ1AOCG3LeZZkVqEi2Rxrny7enr+mclaGs+X -D+6nYiBxO54oUom8Evlbyl2kZLroGh4jgrEwdXGyzLPcwigmEAIkJr09oTDg5AnG -4kgMTImeBiYm+DjO6NZGBOIP9fFSSXugFltIxfkCgYEAoWRrT32GFPmqOn/MkTWP -k5rPxzCneIzvpkU34Ee9ab6MU7IsmL/b/pESfQVdSvqVXvY+ARKbobEZstENrQyi -3wqiyAaMjflfl/vDULYGkpmG4hwjeU7dYikyJPcgq9b3JVWlODc0JSpeqmBalfTo -wj2kUAcvBDn5uqJnAqqTfhUCgYAjRXzSd3LP/NOZbURO7/UXD172vH+MqWWU7Z+f -Gx8xtDEZucoDI4vKZvuBAL+3iujIYqBLigHd8M2rR91deK4XBVCRGB8Iy0htR2Ke -YI/4s8Xqr84VI8lHlA2rOKLs/nz6+cpERpAjFwPMUQKed7c13pzlBYMV7IGvi9pJ -n8ihgQKBgDww644Yq1ITmgvVHABtKT9LgsC5DIn/jTs6HojTja9fg+93CUudXFUf -gm6wZDuvIj78/8dbevl+LBRtcw6W7DaektnDMntaYrE5Xhv6CQ5M97KqtZFnwSAx -MsF7oNUKTC6SBq7vETSdz16cL9xll5vTfgT+jogzjjN2P2k34wqq ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth2/keys/ed25519_master_id_public_key b/tests/integration/net/auth2/keys/ed25519_master_id_public_key deleted file mode 100644 index 2545631..0000000 Binary files a/tests/integration/net/auth2/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/auth2/keys/ed25519_master_id_secret_key b/tests/integration/net/auth2/keys/ed25519_master_id_secret_key deleted file mode 100644 index db1357d..0000000 Binary files a/tests/integration/net/auth2/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/auth2/keys/ed25519_signing_cert b/tests/integration/net/auth2/keys/ed25519_signing_cert deleted file mode 100644 index d84689f..0000000 Binary files a/tests/integration/net/auth2/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/auth2/keys/ed25519_signing_secret_key b/tests/integration/net/auth2/keys/ed25519_signing_secret_key deleted file mode 100644 index 4934e5e..0000000 Binary files a/tests/integration/net/auth2/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/auth2/keys/secret_id_key b/tests/integration/net/auth2/keys/secret_id_key deleted file mode 100644 index df0b0af..0000000 --- a/tests/integration/net/auth2/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQDFphY1WTrmNRGgRjGHP4AwDUYQ+xY85SsKKcC7kJwsgiVppPJq -SS9FCS2YJNMcs/u14IhNKIRtP8VLI/rurk9h2Qnbbb4r4FSf0DBmDW8Qhzag+UUu -aV29EWB/To6JO4cxm6hzpzz+Bl3AJsZN+Luzgmk6ZfAy7dA2jrvAml8s1QIDAQAB -AoGAASMQc6Qcw6BAhrSAqm+CFESvR3+6RAVpdviAhFOzoknpXy80ucnL/NCts3da -w4qBgy1Ue2UlRd+dCe6eDetwx3O5lEhzj6WZbnz9f+KuXOKP16nisbQSFH+UTFnn -0PMHYJIFbrPzqptEV9hlKcNljpTTua6Dl1N+bijENZVTds0CQQDuHCBKYJgOk1ma -rmZEYt3VMLiUfpAwtVdmHXYV0xPWpkWYqHbZrit6kLi1fwvqc6I4C2pebFhFF71B -m0ckFdGfAkEA1H+4ZrJkLV9uqk/Vj9bZHNF3212lK+cpdx0Og/4agdsVKbQfLF+W -1dnazZ9tIm93kMdl75Ave2PUKOMfdu71CwJASV2PMXubvnn2VOvBhPa1hTey18Y7 -ZVaqrEMNnGHiLfQjY4scu6unp+cpknqn0EB6zivuRVO6yucqoClY/Sxf3wJAI0Y8 -Vxff10RTO4RbIDB7A/Sln82QwJPz5yj0ouaIgevbPHwA/L21bTRnxOBlHmVAhNEE -09qsdyAgNNVXAMgz9wJAWB8pJffmHKXsmWaIU2Sxlc5JKZx23kMW9PkppW/EyGTR -txQaVsLG8xy0ZaSp3VuvbYCbQ0LQ/IGQtqTtsQNn2g== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth2/keys/secret_onion_key b/tests/integration/net/auth2/keys/secret_onion_key deleted file mode 100644 index 2954adb..0000000 --- a/tests/integration/net/auth2/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQC/EEbOor8Vf3UACJcpmDdvrSil/hosbD1xRQ0lRbquChuOPIT6 -IfYq3/6rncrIqvQGF8nOMIYZK61WST97VvgnPYPIVwwlcURa/SO7+PHFNhd4iDl3 -5lqTvQm1zuvX6HONwFJJqxPiQUsPHm2K0aQcMKlAojzD2pFZDu4+8+DTvwIDAQAB -AoGABoxCQPam4c+6bMPemlhTHgqrJ/UrZHZZLLaXGr3nBevmwdslG4VqcFG44pzH -xFTHhCXwjpZvIhGzIQ/lkw6J9o8l9BD6+69tySp89OiCVHZTXRjNfHIzchprUR8/ -gVBPEgKapI/5Tm/1Dy2DYcoTA5e5mPf4N9bcoumGWtSZdJECQQDguVJL20iTBu9h -I20PRrydSQXQ7KVc4nZk5KrndsI4243KclVef2LtAebedSHI8tdpnScAB4vFYH/y -VneaXC6LAkEA2aesMSQFZe/Yix49a7FORzdgO3Nu9CrNHhSug/61gfUzD49Z5j2Y -8d0zz4WY97tWPwwFZPqnqRVKY8zaY75qHQJAY7e4XfLDJILKTCdlKIcyAPU7QHcR -9cKD2MdjUuxuyL4cD/5mBVWvdw4F/SaqxDmF/tZ+TNQMYJwuikF2Nye6ewJBAJ+i -pd1o4Pix4C2w4TWSVqpPCCqycEdu+QA+BP1UnEWT1H5uEm6W8Q07wxtKjjXsVcZq -B67XVI7jyarG/co4R1UCQDOcvt35RjAPGFPpRfBfKqCrc1kBiFLrawcgPKB28BIW -TW3iKZgDyGHROyluwoOGRZIKUGhzCxsd/whQ6SXWqas= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth2/keys/secret_onion_key_ntor b/tests/integration/net/auth2/keys/secret_onion_key_ntor deleted file mode 100644 index 8f94287..0000000 Binary files a/tests/integration/net/auth2/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/auth2/torrc b/tests/integration/net/auth2/torrc deleted file mode 100644 index f3529e3..0000000 --- a/tests/integration/net/auth2/torrc +++ /dev/null @@ -1,33 +0,0 @@ - -DataDirectory auth2 -PidFile auth2/tor.pid -Log notice file auth2/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -AuthoritativeDirectory 1 -V3AuthoritativeDirectory 1 -Address 127.10.0.2 -SocksPort 127.10.0.2:2000 -ControlPort 127.10.0.2:2001 -CookieAuthentication 1 -ORPort 127.10.0.2:2002 -DirPort 127.10.0.2:2003 -Nickname auth2 -ContactInfo pastly(a)torproject.org - - -TestingV3AuthInitialVotingInterval 5 -V3AuthVotingInterval 10 -TestingV3AuthInitialVoteDelay 2 -V3AuthVoteDelay 2 -TestingV3AuthInitialDistDelay 2 -V3AuthDistDelay 2 - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/auth3/fingerprint b/tests/integration/net/auth3/fingerprint deleted file mode 100644 index 4c01635..0000000 --- a/tests/integration/net/auth3/fingerprint +++ /dev/null @@ -1 +0,0 @@ -auth3 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C diff --git a/tests/integration/net/auth3/keys/authority_certificate b/tests/integration/net/auth3/keys/authority_certificate deleted file mode 100644 index b40c537..0000000 --- a/tests/integration/net/auth3/keys/authority_certificate +++ /dev/null @@ -1,45 +0,0 @@ -dir-key-certificate-version 3 -fingerprint 4EC8AA0B0F120205EEE32C9918F1D99214ADF518 -dir-key-published 2020-06-08 15:47:39 -dir-key-expires 2021-06-08 15:47:39 -dir-identity-key ------BEGIN RSA PUBLIC KEY----- -MIIBigKCAYEAn6jQf+AHPlQq3sgNgquy/4zxYfdeB0I34Kxfishc7kY2xbKWFxNQ -d+N0VD59J/ab4LrJKS4QKEZaaC3IG0tbWmH9TY7f27I4xADrDXIM5EQwOmi0+RxR -bTdua1xWNvbKLRScD+XZGll1ZbsYCuXfEclglMDwyj1NGqBvoELqkBzRAxJ0HW5v -yh8ocuX6qxwBt7B0pJv4VSOlHOYyQ/LemVrToZPoB3TyLkgMBY4wnDCIWkxgV6ON -IT/rK32lbxJ/IqcP+9XY+IGuYjcq72rhHoH/+2Vsb+67Nvdesv7M18tAcd3A3lrz -NgduRzA+CBQ6jtBbVPtW1K1LfknhRyR3lct0nDv9uvcsQXwSlmpu37p/aKJNVkPf -K0CIpN8E2z7xxnC1Z/C9tHrwZjSImRxx1RPvwv1NAab8LMZXw8coobnrhzZESXiu -ENxvHR4mB828cfJlsDe++FWItc3ey4NIV0/LDXCNp7aQJXP3hGSuWaQ9DgXbQ+NO -mwo7dBlJTxHLAgMBAAE= ------END RSA PUBLIC KEY----- -dir-signing-key ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAoYNshRfn36fjb/cb4yUT8OhzRckLIZV2rY3jjAA7d5JFXUvomRUj -1KwoPK/G7xDXzBwu0Z6GNqPdnLD9exQWIYrtCMufVs2DReLi77SnUC7hflKCO0EW -2buRfTFlpO7KCeRfAZqG6OGh1oFA/IRvKkTwL5UpOxBjNfdmQBlWFHlkJwT4A8X2 -XGpI6+EHRtucdeZmh+op5FIgVWVINEv3t+AIKeW7v4eprAvUA18rG9kEP5wrcAxt -YDMvsy6dvRkYGZmaA2Ujhkd50ldNVUAsWRM0eIalTaLqksD6OtMOSPlfBnkLzOA3 -cliSA4ccl8wLTIb+K66UYSTRi4y+kg3hCwIDAQAB ------END RSA PUBLIC KEY----- -dir-key-crosscert ------BEGIN ID SIGNATURE----- -OTyErZT61omvfcVFe8uJ21TDNEWq01dc+cl7wgwsl4zS3hbGhPEe6vBMcTBFYAeE -kZmKWFxGh+lQ8N0N2KthtbAbvnKAR8mg7vdfr3puLCjvuN32EcYQBxORnKY/8yg4 -ELbFSdUOD8WmwR+31aQ3EiKmXl7V3gxS5RLOh9A3qKmWH6cGXg+WHzeAlH+WjBx4 -+//8KLAbjziQRHZe30dmFsIue56tFzW8zQHzLrztFacfjhBu/9xIf2rfc/morOIZ -ESEk6q4xvW37LNnRWujO8uCjH8QPOFTbMwGIVFTQw/RCSoEWWtKgRE5H4udS/C65 -uQhcWmavjHEy7oDPTPW+Ew== ------END ID SIGNATURE----- -dir-key-certification ------BEGIN SIGNATURE----- -DqjpWpppryImpfM/Gp79seyLd71dT5vAvbcGo2molSFiXCpQ9GnlMcmTOGtsdc+z -h1KAt04FmYlzTUfh71uzRmB/vZ05rmZwEC90wKpxcpZCxvzMhe7+Z6pwbdfTyLBm -gpnF3bExwiFuhlSyclhhHKoh8cel5CXkU4UX4qjOshVBuPx1H7I6Nl5WmXn1JdYY -5L+8QY8quDMK6o180U5ola0cMnxI/84JStInx5cT7sv4hTykECIcBYFdy/BwblvY -CbM0SypchDx7cBn8nFWAhQOBtr+OEpx/YX6r2uGWGjA5p/RQnrbzNCICx+vmpYG6 -CY+vTNnTjdqS5bjAJF49TguSlluuurz67nTXKd8Y9dEMCsQJo+Mqw4oT+VQq6d7s -YZdFH8xRNgUxm8je+Mq0hppuJbn6cMElqp3HBuiBfCjKI+P1zkCv1PHjXwAElLaw -y2G9g3auuQWKq9TY9QhUWsztlZDyRtYAQy0J6z7mSCH0Mqk4VRqNcC7Sn+75+fDM ------END SIGNATURE----- diff --git a/tests/integration/net/auth3/keys/authority_identity_key b/tests/integration/net/auth3/keys/authority_identity_key deleted file mode 100644 index a8ae257..0000000 --- a/tests/integration/net/auth3/keys/authority_identity_key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -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 -gjIiz/wzF3urm/zIZ1U= ------END ENCRYPTED PRIVATE KEY----- diff --git a/tests/integration/net/auth3/keys/authority_signing_key b/tests/integration/net/auth3/keys/authority_signing_key deleted file mode 100644 index 294eb8e..0000000 --- a/tests/integration/net/auth3/keys/authority_signing_key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEAoYNshRfn36fjb/cb4yUT8OhzRckLIZV2rY3jjAA7d5JFXUvo -mRUj1KwoPK/G7xDXzBwu0Z6GNqPdnLD9exQWIYrtCMufVs2DReLi77SnUC7hflKC -O0EW2buRfTFlpO7KCeRfAZqG6OGh1oFA/IRvKkTwL5UpOxBjNfdmQBlWFHlkJwT4 -A8X2XGpI6+EHRtucdeZmh+op5FIgVWVINEv3t+AIKeW7v4eprAvUA18rG9kEP5wr -cAxtYDMvsy6dvRkYGZmaA2Ujhkd50ldNVUAsWRM0eIalTaLqksD6OtMOSPlfBnkL -zOA3cliSA4ccl8wLTIb+K66UYSTRi4y+kg3hCwIDAQABAoIBAC6ID360qW/tDYBX -X+hr6TfRsEwdpKBTUDKmGzVdZ8SGFofPc76OsZj21EzPk2+SmalLQU3Q7vfU8+bN -sul/mvSk8q9DAq/eW4CJ4jmPAVj/eKWNHcn2cZ/fAwZfcdo3lWuOKLTskQuM3bRP -3qoheWljHROIVK2YhgypLwMuiXcyILT4eqD4DinG9UCKZNwVFnueBjzM8C2NNXOk -5cwrmyNtB4fJ2EgX66LzDEKl+illWcmremCTnOMf70XH7juhx9PNNVWVfP8Wf43/ -kwboizmql4aUmyPw3zm4q0/Sb8W13Ryan10HhcSPs9+jzwIDNIn+BkBkfVL784et -jCc22hECgYEAzdE1euEiTF4KDfj3vy6AleOFZo1H8QjslDv8RNUCONfqmvgikX6L -1cSh5K1jHYOplS7LXPn80bt1OWOjG79M5rUADtWmSQKC6KcIdJv6NsDn3OL8Slrc -BJN6c6q0SQusZFaWEUT2q7NKXzdT6m6N2MeX9DuVY4AcVUn5THKm3LMCgYEAyOTW -cyZtK5NUPnscuykZ5WJjXHACFOuKK0QFKWBFumLyMz9UVgkQti9thmxrvOb0LiWV -dbgox694JL0+rz4NOjK7En8Siv/PDX6tmACAoCim+v13IgkUp56apIxF4QTf7gfR -Wlc5kk66x64XM8NxK5MYR+GpeM0OvhMcDQ9gRkkCgYAfMb9GUYsOQg6KEZsTKewp -S6OzaGRn/u9EhFb248YDcY5IUKWEocZ17uiOrUzhc0wnpUEDZYxRCXV57kURdowk -R3irxuv+EthehLp+WgmxdMlvrCOK7Xx9YRDlKRFMJO3LA2iZU3eDjJgQGGWqmXj8 -SzwXs1QwEYG5141mbdYmiwKBgB3tUTEYQV0jdoJUTsRm7A+q54hmuziomg219Vrj -l5+bi98siQDEGvQ4/oTu8+HROgEB4lEGHTUaI7i9ZHAwu0G3Ov0XZwjD8PFetLeX -I5I4XB+50JyGY8hQrVLj/qj10/IewgZGRjJQfiyu94/jhqFqKUzUBi4TxiV0rVIY -v0vZAoGAXA1hBZ2JxN/9QvMRYIR0UxdvkbpElXwL5pyJtV7tdYwJkVGUx+Na7YIY -tFBZK0V401woQqosv0ZLQcxQ66/8n0w/CrVcxzYJ8f5CpjyePO8g0gaXywULrB6q -GjVH5wFO/hNp/IgJWNaBXwKNoD9oJnSnQI6RVVLHYhfDJHOoHc0= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth3/keys/ed25519_master_id_public_key b/tests/integration/net/auth3/keys/ed25519_master_id_public_key deleted file mode 100644 index 391c8b6..0000000 Binary files a/tests/integration/net/auth3/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/auth3/keys/ed25519_master_id_secret_key b/tests/integration/net/auth3/keys/ed25519_master_id_secret_key deleted file mode 100644 index 637ec08..0000000 Binary files a/tests/integration/net/auth3/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/auth3/keys/ed25519_signing_cert b/tests/integration/net/auth3/keys/ed25519_signing_cert deleted file mode 100644 index 279699b..0000000 Binary files a/tests/integration/net/auth3/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/auth3/keys/ed25519_signing_secret_key b/tests/integration/net/auth3/keys/ed25519_signing_secret_key deleted file mode 100644 index bd83e4c..0000000 Binary files a/tests/integration/net/auth3/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/auth3/keys/secret_id_key b/tests/integration/net/auth3/keys/secret_id_key deleted file mode 100644 index d972060..0000000 --- a/tests/integration/net/auth3/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQCd8vrObZhXfmw1GbShdxi2OCkYH/NC9CapI1rNjVzrVkqE6EC9 -HNsQmdgRD7NFleFukJof4xnJcm33D1TuPDV1CIHKnGhtIVIxv+UlPQ0aViGwqANK -0dqKvWV2VOrXhKM0w1SrEqkDOrmrzeHC9RQjeB/cB+rw8A9RgeFkLjOZvwIDAQAB -AoGAdOhv83LzG2+bsAICzLBWPil7YTvk1l3Yb8CXaSWE7TvFlHJD2LYO/06fuqEg -VBUH8spdCdUSNSTZd9CFUICIH5oqBhNlnh2QBs0b6BtP+GnSC+k0VPPtijMJBcAo -DqawDrzhedMMNpfpADBxsYLwXM3LIAvcmvmgglVuobyhVuECQQDKYWAbEaumGasZ -ssK+zJfYCzKYDJP7KLQ2V5pxcWPhxTMgUW0sgQ9YSBmT8of6bizms9015oehuLmb -X/IdvrBFAkEAx8wEbmeoJ1xjym2iRTZrrzKaCXXpRNVFNC5CLld9/JdYDkrKRvn8 -2wlEPRdOzEfw4Mun5SOuaHmda8R5VHpMMwJAdJtwpYgj77uAc3klbowxvWCOUT+G -EEPeuiT1rwGXfGGEWM2x6t+d+M7qNe2bXbcXlgHypnjik1L9VsIMngjeRQJANltV -IUxmPT8vjxVAvp/NsD6OFeDUc/up9kZXjxASoLP0Kv9CBQliN51PyWcb8wvnhuEh -bn/EpXvgzj8H22nibQJAQ3ZAHYTwp7ikpRmsi0pwD8ATZPL9hb00qUlZtC0w1UFV -DWSKVtbALl2AwY1Z6L4SDsFJSEh3+ys3lNVY5CRZIA== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth3/keys/secret_onion_key b/tests/integration/net/auth3/keys/secret_onion_key deleted file mode 100644 index 90aa50a..0000000 --- a/tests/integration/net/auth3/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQC3Atj3fFj1uwoUa8LtmxSLXHsoTuOPZ5z/Jxtk1XMotvY6IJHG -xPRxUPOdFvehBk6+MhvhPRZgelN8RmUdE50Hf+++o87RwSo0DkjeQAn10yxh9nO4 -MvYyijDsseQWDS7AGaxirWOasMpyNYu3LxstvotSKnznqWnI4jYE4JH67wIDAQAB -AoGAEYXZRmEGl4iwH2JuCJgXsHxLYoGjMkDmfFu/OLljTFuwWcJyksia6xqoKLth -PG7BLV7Y4okZ0mUEB1sqJU2SdFLNJMfcX8XDDcYxJWdw9MmIfkqs9oimR4r6b5lk -a367jDBG926sdzPpZk5zJGlMt1cuy/qPu6xL0Fxq1W7xfyECQQDqBKQ7dqT9f1cu -1MP5EggkhLR+5McMSc5gPyVX3NnqJDO7GGjpNJDVCxkLMBymi7VUYxMkN3ywsBpu -Y4ez+ce/AkEAyDOoLSRWSjjvq5Av9QilVFw17OufshVvacrVwoyFz0iafgaq1tUB -RpHZ2EGfKo8zEHB9oguO9AOJpO8DFBQY0QI/V8Fl1Oao+GbISsd+tegNJaSeCve/ -rNwAiBcl6czn6uWogICm1szfgwSmX4urMskxNnPwuaQVHizrvHmWaedBAkEAi4ZE -zMEoSi4ICn9AjPrrjjF9e5JzB3+c2BP+icm5b87frLkk0vg8HVyEgAyrytNl+S0M -waRginr0sLfKY3HmIQJAd7bHercNGGAziFZI6xx9oZbFpyx1DleaH0VSJtTwN0Uh -OTfmDEvp7mpzYwAIqbrSpUvqqA/Ygtov+7tEgPk7RA== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth3/keys/secret_onion_key_ntor b/tests/integration/net/auth3/keys/secret_onion_key_ntor deleted file mode 100644 index 5297135..0000000 Binary files a/tests/integration/net/auth3/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/auth3/torrc b/tests/integration/net/auth3/torrc deleted file mode 100644 index 70ddf2e..0000000 --- a/tests/integration/net/auth3/torrc +++ /dev/null @@ -1,33 +0,0 @@ - -DataDirectory auth3 -PidFile auth3/tor.pid -Log notice file auth3/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -AuthoritativeDirectory 1 -V3AuthoritativeDirectory 1 -Address 127.10.0.3 -SocksPort 127.10.0.3:2000 -ControlPort 127.10.0.3:2001 -CookieAuthentication 1 -ORPort 127.10.0.3:2002 -DirPort 127.10.0.3:2003 -Nickname auth3 -ContactInfo pastly(a)torproject.org - - -TestingV3AuthInitialVotingInterval 5 -V3AuthVotingInterval 10 -TestingV3AuthInitialVoteDelay 2 -V3AuthVoteDelay 2 -TestingV3AuthInitialDistDelay 2 -V3AuthDistDelay 2 - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/exit1/fingerprint b/tests/integration/net/exit1/fingerprint deleted file mode 100644 index e7a1987..0000000 --- a/tests/integration/net/exit1/fingerprint +++ /dev/null @@ -1 +0,0 @@ -exit1 270A861ABED22EC2B625198BCCD7B2B9DBFFC93C diff --git a/tests/integration/net/exit1/keys/ed25519_master_id_public_key b/tests/integration/net/exit1/keys/ed25519_master_id_public_key deleted file mode 100644 index ce17e1d..0000000 Binary files a/tests/integration/net/exit1/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/exit1/keys/ed25519_master_id_secret_key b/tests/integration/net/exit1/keys/ed25519_master_id_secret_key deleted file mode 100644 index 5617382..0000000 Binary files a/tests/integration/net/exit1/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/exit1/keys/ed25519_signing_cert b/tests/integration/net/exit1/keys/ed25519_signing_cert deleted file mode 100644 index 23251eb..0000000 Binary files a/tests/integration/net/exit1/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/exit1/keys/ed25519_signing_secret_key b/tests/integration/net/exit1/keys/ed25519_signing_secret_key deleted file mode 100644 index d0b9d81..0000000 Binary files a/tests/integration/net/exit1/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/exit1/keys/secret_id_key b/tests/integration/net/exit1/keys/secret_id_key deleted file mode 100644 index 453a434..0000000 --- a/tests/integration/net/exit1/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQDUhrtgD+6NyBn7JEvPsWHNjGNLzeoA/Wwah6j+BMnWZDyU8LDE -yf/jmvmZa074MHNXR3ZSVblTq3JeWZ87JdV+2A+uiwtVPi6qOQAADEvxDBiCTnze -mWqCwuR1BudeKdqdkArZMw5352xo6m1p3XJQSyWde2qYRFBEX/EEGsEEGQIDAQAB -AoGAEGb9myJfpO2mo61fdH4aMET/fOA9iSoF595EeqZf9X3y9wPEgMueRjC1xtNz -WtBSdo/7X8th7EU1JHcCRQxcd7OstR7fiy81n0UMC6GrHASpVYYJXC4M4MGt2yzM -Wzadp2Qa4a1Wwpud0bXH0CB699MmEcdpNgw4RGUxKeHuEWkCQQDvpU/93Up2APZX -7whjUT4IfHUOUVaRUCJnMUJxajtM3AvtYgDEmHXSAbs0Wtl0v4qh5xfvKJ2YgfI6 -M/eBhR0fAkEA4weiSvHPUwT8Uq0f3Hc5DHLx2a9Q/qKvytCcbtgjOA3Anclzf4vG -PXsCjwYETDLOqg8zyKOwgF04dqPkDYt/xwJADKX6AdkjK/VDC0MXez53erUu7HGI -kyTam/2ylw/XT2gxzPamOboeRdZHjizZW1scswzia4IGR11cbov9nT1sWwJAfAtP -wWMdxF6U/xdYsTzzDro/KpF/z6FUK5yP3IB7vcTF2XCYirf0OONdIohHENsxz/k+ -cgH+DiThFPG3SS9PQQJAJZ2IBMIyO31Q+e2GW0NKxFyCsqHAcqBUMU9XDH2POm+K -3CDVyHvc/GsZhWYayQzD65VUERjAbxyALDotSIODGQ== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/exit1/keys/secret_onion_key b/tests/integration/net/exit1/keys/secret_onion_key deleted file mode 100644 index d2987ef..0000000 --- a/tests/integration/net/exit1/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDHYG2e/zXbe3IVjx/kJ5cqVmc4p11otnJUMdmGA2hP+Oi7QbEJ -2EMHO9mLKsWyX42ekPCjXLeYF4NG7QGEhKbs9yzneIIS37uucMGgfwv5QLX5KDWJ -5tPLOtZmIjm4kJsodj6+OFv95Um3+QNbCoBTMAL4UfhXSyvSP8NY03obBQIDAQAB -AoGBAKYzlC4+wT69oVSngwZGmpUIgfOQUSXBMX1OMO6uWH6SGDBBiruSNA4LrkV8 -2mDflsbgPDlySPnYX+74E5PMoPjgAcZq/+dvwTfCeZZhbACqYttdLwdTZxZWKAOi -K8ffrD81pjIJKB8tpP7swUC6zrI70VuxJKfsU7KfBJDSElcBAkEA6tQJDjaCpFvx -TRQjHI7vanUVJ65TigPGwZqb+iQgXYDymc3p8BnHtd0bTuYnl35x421dFTCfF6V7 -/4ceOlmDvQJBANlaJpfZl0f3c6WtTF/3Mwr7P/7UfWOuHvPTCsY1QvmdfuosV3P1 -Zhq2NyQYttw8j7cbLPA6zNojacTeZjO/ROkCQBUmuhYUpNnHCkoGCU+WNExjdV9Y -nV+uDWX81hXG0T960N83o92jhNCFtOL7ag+ELR/uBtdUxM+tcSjH89oPnAUCQQCX -j1BoBJeD3F4tAhnGtTZHiwmF5aAF2Q3GUbwqmEs6igNMwVy+BDmNmM/8gKtKCYTh -VrbQUQA1gAop+DbmEJK5AkA+13WiKrj/JM1/CiEWwcX0VxOL/1FsaKgKJVnFEi5+ -kVmt9mFD09UXukpxJOIVLUNGCBBIdnm+7s3WZNRDg/b9 ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/exit1/keys/secret_onion_key_ntor b/tests/integration/net/exit1/keys/secret_onion_key_ntor deleted file mode 100644 index 07ebd85..0000000 Binary files a/tests/integration/net/exit1/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/exit1/torrc b/tests/integration/net/exit1/torrc deleted file mode 100644 index 10b22bd..0000000 --- a/tests/integration/net/exit1/torrc +++ /dev/null @@ -1,26 +0,0 @@ - -DataDirectory exit1 -PidFile exit1/tor.pid -Log notice file exit1/notice.log -ShutdownWaitLength 2 -ExitRelay 1 -IPv6Exit 1 -ExitPolicy accept *:* -ExitPolicy reject *:* -Address 127.10.0.11 -SocksPort 127.10.0.11:2000 -ControlPort 127.10.0.11:2001 -CookieAuthentication 1 -ORPort 127.10.0.11:2002 -DirPort 127.10.0.11:2003 -Nickname exit1 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/exit2/fingerprint b/tests/integration/net/exit2/fingerprint deleted file mode 100644 index 82a21ce..0000000 --- a/tests/integration/net/exit2/fingerprint +++ /dev/null @@ -1 +0,0 @@ -exit2 C0606B414423F9A2BBA2679B440056E3B07FEC85 diff --git a/tests/integration/net/exit2/keys/ed25519_master_id_public_key b/tests/integration/net/exit2/keys/ed25519_master_id_public_key deleted file mode 100644 index b0b6473..0000000 Binary files a/tests/integration/net/exit2/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/exit2/keys/ed25519_master_id_secret_key b/tests/integration/net/exit2/keys/ed25519_master_id_secret_key deleted file mode 100644 index 5dc1f0d..0000000 Binary files a/tests/integration/net/exit2/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/exit2/keys/ed25519_signing_cert b/tests/integration/net/exit2/keys/ed25519_signing_cert deleted file mode 100644 index 018238c..0000000 Binary files a/tests/integration/net/exit2/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/exit2/keys/ed25519_signing_secret_key b/tests/integration/net/exit2/keys/ed25519_signing_secret_key deleted file mode 100644 index d407ec2..0000000 Binary files a/tests/integration/net/exit2/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/exit2/keys/secret_id_key b/tests/integration/net/exit2/keys/secret_id_key deleted file mode 100644 index 2b0eb1e..0000000 --- a/tests/integration/net/exit2/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDPSSR++AXcN9GK8J65iaQmPPEJVp895tsGD2nC9IC2ye5MwRBr -W68grl7Jq0lK2hBNP49V+JpGn9/zvouxZ/BC0iXPPOYn9UfN80a0BIlb6L5h9C5+ -YSJ18J4sTk4Nl/j2Cm5NYDHt67YQ02aBWta7hE2hsL4okytCpu4b8WjRIwIDAQAB -AoGBAJILx8IJwB9D2Mia9kplVxl18KISvQnhQMpJS8wHdzTSm6rKkGYD6CUPlkti -+rXZZIj40mXRTematTDIPSZWxCkbcKG6E3pAlJgmwONry7R28uB+PX8G258+7SCB -yeWMtha0OajMslHj+8nV5pW9b9qyJ00vCPZIFdSMXi598MLhAkEA8UCJMa1zAfyW -JB5q+3gUaIE4sJgn+Nyh10RLyEtZo3OaRjjHgV3doDI+YG4GEAyEkLWra/kaXVUi -V3H+l48C8wJBANv1DR+4+VH4wZQsVksNkDP1//iA0yjFtW/dducehYDLe9qmUWpc -vV6r8ibyfvZVO5016YmWkmHKJbtGdC6xpRECQECFCOvvPj2+xoycUfI02Ahm3rlj -x/TnVKUUj8veUvfCt/SlxL1VVCs+pK33Xsm1/1IQM+spcKKbXRbT1snDpn8CQQCU -mpG8Tec7x1lZdz7xw/8Z6+h9BuQilriHFFPBv/AoXNGXnmhA+NkD/h1CzPCUEm+N -PiBC0ZSiNsWZKfdSmLhRAkBIwXvHkNJWMLMqr+U7C1AcFyFTojpmzQ9zhmKsnIYk -FnGysw3OT0vx/qqJzML+ZbTAG7BkFwOJSWM+EbHO3f+6 ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/exit2/keys/secret_onion_key b/tests/integration/net/exit2/keys/secret_onion_key deleted file mode 100644 index b8869a1..0000000 --- a/tests/integration/net/exit2/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDRGbi8jXaEdXAKgS63kx7qlPJpW1GVL2HHVJ/xIBrsDPJ+STKV -E31isk48cg/FhcW91myJVa+uPg5CyRnA2upEz5kCf8W7KPyifV7faVelBYO/rKgz -dUqXRjcMC1sF3RpNLgRFbB9JEMoLEGqF+T1JVHyvsHaXhCGkosvRtm9azQIDAQAB -AoGBAKzVT+c6Ho5Z66QjJxRBnLpVJxGCk6p2IaH7BsDtwpL+GKndotup4mfj7dr0 -hKjFa68AP3I8yxuA25TEWG8aA6whJQ9WJJ3dqteqMI6Vv6BNLoso35aXpo+raYh+ -FeeB93gZ+Ree9gnhfLyI1ukUFcO0pq8Gc7VWI/+Kh0EcqOlBAkEA+nkTtEKzPik0 -bKhu26JgBe0eRoZ7MEfBoTQx6Aqi/3mITsU183An3CzeT7YmOY8cdxyXUUpdxG9d -Lv2TwyOJiQJBANW27mlFVHwARad+t9PbmJXsbn6lXbAVj8cM8m5BPxdwiVtvtdv+ -t/27/MJGtL5Quh5rmXev452uyv1TEZzcKiUCQQDJN4V91eu7L0z/UZylc1+iwygE -TjsewTars4u4NvtVM6Qua7340IwlFCKQdOtmaDLc+aoSUyTbDwAUJQCUzrLJAkEA -h/TkHpw4btpNdYyrrV9Z5qaOdIsG2uocmWinIXToiiTRfRXH/7g/nG9nEMCiYyBA -BvI0o2uFxd5YzGd4IO3+8QJAFDg7lcMO8IHcajS/n1OG2J1ORt+hRJ6Hsq76H69E -LIgcBsN/hjV6jVrMsjvO8r5cTw+aAVWB5Hb8sgpqpUSulQ== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/exit2/keys/secret_onion_key_ntor b/tests/integration/net/exit2/keys/secret_onion_key_ntor deleted file mode 100644 index 8b8a6cc..0000000 Binary files a/tests/integration/net/exit2/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/exit2/torrc b/tests/integration/net/exit2/torrc deleted file mode 100644 index 244b632..0000000 --- a/tests/integration/net/exit2/torrc +++ /dev/null @@ -1,26 +0,0 @@ - -DataDirectory exit2 -PidFile exit2/tor.pid -Log notice file exit2/notice.log -ShutdownWaitLength 2 -ExitRelay 1 -IPv6Exit 1 -ExitPolicy accept *:* -ExitPolicy reject *:* -Address 127.10.0.12 -SocksPort 127.10.0.12:2000 -ControlPort 127.10.0.12:2001 -CookieAuthentication 1 -ORPort 127.10.0.12:2002 -DirPort 127.10.0.12:2003 -Nickname exit2 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/exit3/fingerprint b/tests/integration/net/exit3/fingerprint deleted file mode 100644 index 05796b5..0000000 --- a/tests/integration/net/exit3/fingerprint +++ /dev/null @@ -1 +0,0 @@ -exit3 FC264325EA99D597FF94DA88379DABB64304DD9D diff --git a/tests/integration/net/exit3/keys/ed25519_master_id_public_key b/tests/integration/net/exit3/keys/ed25519_master_id_public_key deleted file mode 100644 index 3e07d44..0000000 Binary files a/tests/integration/net/exit3/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/exit3/keys/ed25519_master_id_secret_key b/tests/integration/net/exit3/keys/ed25519_master_id_secret_key deleted file mode 100644 index dad17de..0000000 Binary files a/tests/integration/net/exit3/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/exit3/keys/ed25519_signing_cert b/tests/integration/net/exit3/keys/ed25519_signing_cert deleted file mode 100644 index 61bc40a..0000000 Binary files a/tests/integration/net/exit3/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/exit3/keys/ed25519_signing_secret_key b/tests/integration/net/exit3/keys/ed25519_signing_secret_key deleted file mode 100644 index 68d8da0..0000000 Binary files a/tests/integration/net/exit3/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/exit3/keys/secret_id_key b/tests/integration/net/exit3/keys/secret_id_key deleted file mode 100644 index b7e583e..0000000 --- a/tests/integration/net/exit3/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQCskSKJ8IEBm3uhXifX8y6rak0vK53tT/CAU9FruMjBgd/aTS+m -927TYngFTyWXYL3mo7xD5Cs8Gpsoe932iq/KAPp+/HCb71OHFwN5/hgtG/Yfpj/c -xtlId4V+3KEnnr6opO6B3j7JNwTJJeRmpgeQyfS6Unh0vL+PycSgcPCsywIDAQAB -AoGBAJwQAYFoLPNMLwmnwjbNaaaCU11Wf9OvmNwlcV6PVZeTIeQmK/M/EE5BXjPG -+UMmrXcZGtj3T5ZipXF+XCVsFT8IGjX2xVHCa6Uf4lL4jEJb4pVIMEQEEd989g3T -RTS2ou9HRl9URrMUdakeysKqFu+tPh4f+Jjyi0bZ4HfkyxoxAkEA5GRnvu28R1ac -J3KF+kE1MdJhHnqET4MQOyhW/485aa2/Ym6uFaQhiXatNwQUHsF+j+p+jYXEHy8S -fBtqgPeyuQJBAMFtN5DgagsF8VN5SdXk+e1BC6yCJkUugpEyXHH4ArCmrtPXMxg2 -fBvMJzjGh6kgLvMAYkecrz7jkKLGiQxMaaMCQGx5v8iwM4eSfFJEE5w70l8ac+Q8 -/pChSFlAnKl+xh8KVecTeH1w2jjm8/g4aLH+5vTFxFvFV9QT0Gy/vMMKYokCQGAz -hMZehv9ShlMg6NMkHhWdG0RCOux/lFrItGfOlO/tBti/mF77gkCFCiDXxNMd+ZvM -XhUF3bcmkWIT4kemnYcCQD2TT1a9CA6yRK76+P6ODnqCG+d+swJrDMAXG6mfEmPn -cBmcurapsowrmj8oKHdW8o45k9gKiWPIvG9Fmbwg1Fg= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/exit3/keys/secret_onion_key b/tests/integration/net/exit3/keys/secret_onion_key deleted file mode 100644 index d64d5ac..0000000 --- a/tests/integration/net/exit3/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQC7cz4JfpL3t7AQWDadHv25xsNBt9QCVMLNpTPdi4FMxd4ZIGac -qZnjHVNEb89vNReK59Mufai4XnWMg+/pBMAhwNtQcn3dvVqbil+q/ixR2fhWmR4i -Ams7VfubqHhMsgxGa+o0o608MhmrV+eHLBJlMC8OiGuRzHAXRmYt0Jy7CQIDAQAB -AoGBAJbOFyniR/C9OgtcPMvZY/0y+GGFuC4L7REvCHQDSQnv4kfKtmLxW5nJPPVB -EtyAFSmuakrr03JIpD9g4gFQzhS3JcbvCXa81Qg2PUFo30Cuqr5W+6nAYJB9Z6n1 -dYECnIXuAYzcmJSAKiYWRFcG/MqpHOxsAJ2P8xzO6BRyiZURAkEA8+Uj7WSxL2+R -dEfJIFjbnBqbUUWQF9fjkHzsCqpsDMHAOywnFc1lOtmyOZ5+3OePKpmk8a1oXQt3 -6HrSjCKIVQJBAMTA7ezcW0uyWkRKO/tVdQm1IrxP33Oi99bHfturUwh1rljA1fHe -aqc4aD8K31fB4373IRfvRDW2c5I8lJoIq+UCQB6TY2Wnce8YdYu2VCiR+zYev8n4 -ho/2qLi8cHsF0nXm9Ep2xo+dKEuwbv96Nz1KalBU4rDJpIPFpEqo2yxmR+ECQQDB -NszvO34UGfN2+Idqy4MBo3WXA8Dlp/ZGXuZ/BgGmXxp1Yfk3ajnGOSh2MFEftvGX -L0y6WmbbcG6R/xfXJAjZAkEAv/3H2vrkiE4jhDvj7p+A4ohL2vZ2gpwtkzUFmK6W -Ha9KAR+ITrWi31ENnQ38Nc/dy4Piub23r0RS9AZnjjmRmQ== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/exit3/keys/secret_onion_key_ntor b/tests/integration/net/exit3/keys/secret_onion_key_ntor deleted file mode 100644 index 8a5417e..0000000 Binary files a/tests/integration/net/exit3/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/exit3/torrc b/tests/integration/net/exit3/torrc deleted file mode 100644 index ddfbcfe..0000000 --- a/tests/integration/net/exit3/torrc +++ /dev/null @@ -1,26 +0,0 @@ - -DataDirectory exit3 -PidFile exit3/tor.pid -Log notice file exit3/notice.log -ShutdownWaitLength 2 -ExitRelay 1 -IPv6Exit 1 -ExitPolicy accept *:* -ExitPolicy reject *:* -Address 127.10.0.13 -SocksPort 127.10.0.13:2000 -ControlPort 127.10.0.13:2001 -CookieAuthentication 1 -ORPort 127.10.0.13:2002 -DirPort 127.10.0.13:2003 -Nickname exit3 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/relay1/fingerprint b/tests/integration/net/relay1/fingerprint deleted file mode 100644 index 01a9266..0000000 --- a/tests/integration/net/relay1/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay1 2ABFBACE61167A1019A56CB35B2E3362B97D8570 diff --git a/tests/integration/net/relay1/keys/ed25519_master_id_public_key b/tests/integration/net/relay1/keys/ed25519_master_id_public_key deleted file mode 100644 index ae389f0..0000000 Binary files a/tests/integration/net/relay1/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay1/keys/ed25519_master_id_secret_key b/tests/integration/net/relay1/keys/ed25519_master_id_secret_key deleted file mode 100644 index 4aa8039..0000000 Binary files a/tests/integration/net/relay1/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay1/keys/ed25519_signing_cert b/tests/integration/net/relay1/keys/ed25519_signing_cert deleted file mode 100644 index 1c4b1d3..0000000 Binary files a/tests/integration/net/relay1/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay1/keys/ed25519_signing_secret_key b/tests/integration/net/relay1/keys/ed25519_signing_secret_key deleted file mode 100644 index 6c9d0b9..0000000 Binary files a/tests/integration/net/relay1/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay1/keys/secret_id_key b/tests/integration/net/relay1/keys/secret_id_key deleted file mode 100644 index f8f6cff..0000000 --- a/tests/integration/net/relay1/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDS3gAMLc0Qf2ICiU8e8jcZORk6Erv5rK8J0HpoGwZd7DsPYv6O -M1G8MVuwHQ8wiFz2ntk6n59YuH262xeMYgLmr0oBvpp2VrSgvRHhyecGR2Og9031 -5YlP2xkb9kFVTbV6395abIl+LGN8F3u7egeQtbUwB5TnXN9Xcm+rk4e4VwIDAQAB -AoGAI8NJCMe/zrt7+Ogmxh3YYGvBroq83MR/z09PY1aqBsXo4lwsxhtIEn3gigbz -q4yFD8KzHvExik+H62f7H3EEAqLN84wvCjy4vxl1/0ilgo5MYUkAemnhNtVuUHyu -YniSVHCR2To2xYhhg8dg5EGfCik5p7Lin868kEj0mCjj6DECQQD7EDvsnM/WVzzA -YiI+eZVv9X2JS4p9Kr2QOQKPvT7kbaA/2ScxOPeWw/4bTxrifRjOzmabDCqrzwgy -RxLznlx5AkEA1wNuqhAcwL1MuFNTsbv/gXn8hR2uB+Wu88+t6RZEi5RvWDkeaM16 -1ax6fJXA5Nov2hmY1k/4bZ4d4Zebg/jnTwJBALRfWW4IyxkG29KrrkaMO1yQVnyJ -FRoP1tkC3GBAairax8KXVJz8fISIkssz7fDCR0xs5TKHbzC4MP9OKMN2BqECQQCm -Lpvwy0U93tGWQakVXQWNMBhxVlA1AFvpS2HSHojaDN7GJFeRjwdacNW2xxPwjYag -nloXgnWzW5siykfDh7RXAkEA3D0LTZ6YHAQIuWayxvjoj+f3am5GduHPUu3RJfpY -faEgP/WrvaRT0pw6rJmcumsG4h0Cp0W48FQFMQ8JSB+c0g== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay1/keys/secret_onion_key b/tests/integration/net/relay1/keys/secret_onion_key deleted file mode 100644 index 10a1ab2..0000000 --- a/tests/integration/net/relay1/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQC+l6cIfMBVPArIvlMSwV/9i4ZcsjCbegOysvQ4b9eXenwwluE0 -zgkqp4RyPjAZwcGIPzLduWzygFZVwchupF9Yzmg+67DyVs2rNHba7/dALC52+p9r -n+Xi/ge1gxDQr8biucE+fccRfwWX24nQGAOTqqF5tuj09ohH/KGNajvvKwIDAQAB -AoGBAKKygLMdE25vT+FnnzDOhGvDFFLDBf1jHg8I9rPKvaagt60ez2atT2PrFoQT -lCoYnWX6VSizZk5owcp5HulcRcrmp9YXRPpEIBepJWPOFLd1/TwjmqlhHnTOtDTi -cbep2HpT8k09Sm4xII7BoML1gktBc5oqDo59P6RsWxzB14uhAkEA6vvBHaAH6HBK -BZU08jsywMYqCKXZSRGiAMdYumPLqvalNB9WXwubkG3ICo7iBMVTKjPiCk+aeXYP -jOO/HbExkQJBAM+jgkebWm99IgecUsohJ6scOH8D0Ahjr76BnMZy/xTNEq9SH+lc -NxfHCADUCC34UIvIF55a/9vVVtyfgOpv9vsCQA5RInYEnxa5aLkoWx57Ht+B82Ot -fyylh2JWwwAwPmN/PZeMZT3LPkIxfiOuivTRdPy4RohsSzQlTlM+ORG9DxECQAgE -BemBw9H+AKxOipunAAMJCd1NZmCMiKJQGp9GnTZOXGRMRVMa7j2Kv3JYvSAZL/LV -fKPuW2Y/LCVEOxPR0rUCQEXgCY7yWfkwmC10zoe0IWHiV9jOSEGdFEWUElo1zHUH -qWpoxcdU01k4+sYNDTNE87pnxvbFxBluLGyNQozf0vs= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay1/keys/secret_onion_key_ntor b/tests/integration/net/relay1/keys/secret_onion_key_ntor deleted file mode 100644 index 7532786..0000000 Binary files a/tests/integration/net/relay1/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay1/torrc b/tests/integration/net/relay1/torrc deleted file mode 100644 index bde5f91..0000000 --- a/tests/integration/net/relay1/torrc +++ /dev/null @@ -1,23 +0,0 @@ - -DataDirectory relay1 -PidFile relay1/tor.pid -Log notice file relay1/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.4 -SocksPort 127.10.0.4:2000 -ControlPort 127.10.0.4:2001 -CookieAuthentication 1 -ORPort 127.10.0.4:2002 -DirPort 127.10.0.4:2003 -Nickname relay1 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/relay1mbyteMAB/fingerprint b/tests/integration/net/relay1mbyteMAB/fingerprint deleted file mode 100644 index dbc1462..0000000 --- a/tests/integration/net/relay1mbyteMAB/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay1mbyteMAB 117A456C911114076BEB4E757AC48B16CC0CCC5F diff --git a/tests/integration/net/relay1mbyteMAB/keys/ed25519_master_id_public_key b/tests/integration/net/relay1mbyteMAB/keys/ed25519_master_id_public_key deleted file mode 100644 index 204fb62..0000000 Binary files a/tests/integration/net/relay1mbyteMAB/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay1mbyteMAB/keys/ed25519_master_id_secret_key b/tests/integration/net/relay1mbyteMAB/keys/ed25519_master_id_secret_key deleted file mode 100644 index 9054bb4..0000000 Binary files a/tests/integration/net/relay1mbyteMAB/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay1mbyteMAB/keys/ed25519_signing_cert b/tests/integration/net/relay1mbyteMAB/keys/ed25519_signing_cert deleted file mode 100644 index 768021c..0000000 Binary files a/tests/integration/net/relay1mbyteMAB/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay1mbyteMAB/keys/ed25519_signing_secret_key b/tests/integration/net/relay1mbyteMAB/keys/ed25519_signing_secret_key deleted file mode 100644 index 0c23b54..0000000 Binary files a/tests/integration/net/relay1mbyteMAB/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay1mbyteMAB/keys/secret_id_key b/tests/integration/net/relay1mbyteMAB/keys/secret_id_key deleted file mode 100644 index 41b43ac..0000000 --- a/tests/integration/net/relay1mbyteMAB/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQC7CSfsxnVxSgYTlL9ItQvjEnwehGUVu8zr8TZ3T6DV+UJedFCP -LWhfqJvo3ourzskXrPYUWSt7U4k/fC0113+t+QHe4lmRlvxfqMC0WxHuXbXI2fgF -X5YByYH9GmEnSDuqpxjpmYc/LJp2NVHB/w8KwaOkYCJdFLjGzPKCcgLj8QIDAQAB -AoGBAKS3J4YKMRuYSUmtUdhCOTm86bomdq9xOMMBJypj4g0O+zgbz2aIYsb7wnKO -qwqfjdFf7Ud2UCjIJLLYNSiZpEKbFSUl1eA0VqlGSa1RmiB8CytS2tMW9yFph58k -YcMoRu/a5uYJL0viKYI7kHjctKgN7708TfDsVQW8Q6htRCaRAkEA8dMa6X2/8sOS -Gke23dMiRfL/v6TSkeaUgWNL+6pgLinDbNkooMMxE0Li/vpkwHrse8+JVVHh36RC -LSOl+twxOwJBAMX/30ykFQQWUrBLKgrvjU/TyQXb3+MN+PrLo2xQTT2LdBLQYf+J -kpKIJqli7h7rh6qxZ+aNpDwP171y5q5F7MMCQQCOHNOp9/5/ujL4QsDSp6tylBV8 -GG6u02TejO4wXbXcKyrvosbfgxYqDZq84YWoIBUtxY8dlts4xJ0nTdXTEOfVAkBJ -nT46Um713A7WOLvi4PmbClSc9wigdFtzcy7JYHm3PhfjvtIQned+z1wAciWyHUON -dPP6RgMfyYwehY+6j4jdAkAAgGtpdYmYybJKRj9JO2JKHHV8fPKZwDVtU4nR5yw7 -il8Ir9dtwMWy+Mevk8aH8OZzeHrvzCCnvdAvCxgRfRfO ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay1mbyteMAB/keys/secret_onion_key b/tests/integration/net/relay1mbyteMAB/keys/secret_onion_key deleted file mode 100644 index c41070d..0000000 --- a/tests/integration/net/relay1mbyteMAB/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDBs+qzCuXuOvN4dddarTnh1+NIpEpeSWqpSmU0V7e/dCgJ03TS -GWuUY+rEFOnzOrfvYy0ow7+eS2vCmvDLmLSp8zhJxaxGOitGn1iYtUgh9VLHWu1v -a/dWvTqkmV3OxgSmKdAGuWEfXbuL57/uGRxWOQxtHcSkySbFCTbqJXYzEwIDAQAB -AoGAGgn/oPX0FuRh2m2s94mV4GBPM3KydJ5V8lAH7tNj5h7NSxTb/WphZd9Qre9J -y+K22z1v0q0N00+8OrrtZ9EtZ/cFpCtRtHzaCnXKmsZ+HhOCREF1VbjNt6VOrRfZ -EEcJcIiXw0fXqU5/cQDN1tPZtOgBiDfFPVCsT6LlByJOPBECQQD4/xdtVK3FgRPd -GTAwraxwzY0aayCAjCUS4aCTCfv+fzjvH9pGZ7kwROGAgxPHvXs+qzP6O71d6zdM -WueOhQDNAkEAxyauZPT6ifpcJF/SBjvUfVy6Sf5oxvA1PSOJnh8M80pkvk/SQ9Cg -Z6x+zy6u6hVRIsHr3XaCAmcSya8HFXqDXwJBAIMJ7JBTMihw571CFkRoAgpTguDW -ZAKCvrgTGeiIJqAm4BWoU70dtS4b8fkqAmzp4UR34SDd86jLswxyAs7UXDkCQQCu -b9c5XstEqCKlSbjw9N7+n4Yc4dZsymIXl1UnRxNU1si/WbNW6xpVNOYuGznil6Fl -zG4IoZDnAdmXBtQxoAoJAkEAoNdrVYjgScUvlcsGtDVQG2q3OY5wt//XbPSUvC5x -LJWz91UWR2JWmKX29hLeHRwltdY8MknyRy7qIVfaaGU2vw== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay1mbyteMAB/keys/secret_onion_key_ntor b/tests/integration/net/relay1mbyteMAB/keys/secret_onion_key_ntor deleted file mode 100644 index 2d321e5..0000000 Binary files a/tests/integration/net/relay1mbyteMAB/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay1mbyteMAB/torrc b/tests/integration/net/relay1mbyteMAB/torrc deleted file mode 100644 index ed45e10..0000000 --- a/tests/integration/net/relay1mbyteMAB/torrc +++ /dev/null @@ -1,25 +0,0 @@ - -DataDirectory relay1mbyteMAB -PidFile relay1mbyteMAB/tor.pid -Log notice file relay1mbyteMAB/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.14 -SocksPort 127.10.0.14:2000 -ControlPort 127.10.0.14:2001 -CookieAuthentication 1 -ORPort 127.10.0.14:2002 -DirPort 127.10.0.14:2003 -Nickname relay1mbyteMAB -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 - -MaxAdvertisedBandwidth 1 MByte diff --git a/tests/integration/net/relay1mbyteRBR/fingerprint b/tests/integration/net/relay1mbyteRBR/fingerprint deleted file mode 100644 index fd43f33..0000000 --- a/tests/integration/net/relay1mbyteRBR/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay1mbyteRBR 934E06F38A391CB71DF83ECDE05DFF5CDE3AC49D diff --git a/tests/integration/net/relay1mbyteRBR/keys/ed25519_master_id_public_key b/tests/integration/net/relay1mbyteRBR/keys/ed25519_master_id_public_key deleted file mode 100644 index 689bdb0..0000000 Binary files a/tests/integration/net/relay1mbyteRBR/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay1mbyteRBR/keys/ed25519_master_id_secret_key b/tests/integration/net/relay1mbyteRBR/keys/ed25519_master_id_secret_key deleted file mode 100644 index 1235af2..0000000 Binary files a/tests/integration/net/relay1mbyteRBR/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay1mbyteRBR/keys/ed25519_signing_cert b/tests/integration/net/relay1mbyteRBR/keys/ed25519_signing_cert deleted file mode 100644 index 3dae7a8..0000000 Binary files a/tests/integration/net/relay1mbyteRBR/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay1mbyteRBR/keys/ed25519_signing_secret_key b/tests/integration/net/relay1mbyteRBR/keys/ed25519_signing_secret_key deleted file mode 100644 index 7f61973..0000000 Binary files a/tests/integration/net/relay1mbyteRBR/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay1mbyteRBR/keys/secret_id_key b/tests/integration/net/relay1mbyteRBR/keys/secret_id_key deleted file mode 100644 index 8f3fb36..0000000 --- a/tests/integration/net/relay1mbyteRBR/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQCk3FyIv7JJ33Il3PJmnEu1h5k+7LnF79Bw1isjJln1zRtKMDFt -09NzAiM0gGaMwOhqIgi9/MlSUFIEfWi/6SFfidbDtWb5ltEYZZQJ55FTElItLPyP -z7DJpU6TTGB/jbeGt3nMQcxAUWJkBfA31N/azi39D+2tfKaeiIWxc9IUewIDAQAB -AoGATMd8KQvuQs1X4h5mnjdIY0DFtDKXyoGHuCVmbbZcy0c84G5VduriXXuvXbI3 -EHJ/S36SR7lFIZrat9CYSliO+6pZsDV89VukFdO7wh/+Ox0Hz4Pu+ZvbOzvXX1PY -VCNVy8uQaXzXmi0qJ6ga/rJf8ZbwlTY2BpFQWKtDQZdxB7ECQQDRFzzb6akAxC1N -b8JPrSS1Z5yomdNk0TN0dVNfUqptbHne/SEIndMgQN2YaucNDHxtXsEOPtwOhKCT -RTvtP8flAkEAydjaHBenCdFjmxsfL1kO+8hSljaSY8D69vh1MUesEHVUdmt7jkEB -I5uSUacCZbRegURr+c4dAZNSlw/fRJ/k3wJANV2/+8UUjIyFn4kRyDJB90b9tg6k -5Mt8XZIAeIjp1MnmBSMIRmG53DaSGG/Yjv0L2QJhNdiXY+E39r6p//DSfQJAQfo+ -IRyiHxVwh4yv/twPh8GNLUidRToZTo0cUYVp+t8/Qo4TjwY0hx0dEM+UewYgNgTV -fowe8xrizjoD8vyI5QJAGvWUZ7KdNjoogB7ZRV5S7BaKwOK4DxrQRkonqqhCzmgd -5Fi6B/I6oTCb4t7dEyGAf1808MveFlPDILy9oo8XIA== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay1mbyteRBR/keys/secret_onion_key b/tests/integration/net/relay1mbyteRBR/keys/secret_onion_key deleted file mode 100644 index bb1d926..0000000 --- a/tests/integration/net/relay1mbyteRBR/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQCmT+ACA5QDRPqy/1O/h/dEDbQPGrZO7NADg66Nv3SoQg9fJcM/ -WTdqCgZEKrop/YJS2qv+3DTMca7ceAyADZUnyHh6G4rBSIeHjpn/3OWvrNYuch7U -wWm+ZP2EH9465uEBMIU5xFKbV3DTwXYb+ckF7aYp/kR7YUnOFduE2s95PwIDAQAB -AoGAJi/g95VqvvVvuvn1eNz3YaDj3zP6+FRXzvbFdbaoSpogfXBmTH1nw+lZVv2Y -kVusOOoM5BAb73WK+QR3mk+EF6d4XAuAR0BBfs6oDySHoIkGGUvt/78/y4PjQJiq -QlbXyuM/IeIcoueGXzjrFbJS6giUoRuSfMuZu/+44JHuVMECQQDbdwc/zfkkV9To -wqTEemCEzU6SbxWjVOcmzFBVhu7J/LlMtrFJ4U6Q+POOGkEaMcRawtoc4+wSPpUf -j+WOmQDrAkEAwf+enb1HhRNE80zYf9/b3tZXvc9lEUvG/BHS0nVS5iTl2QVLE7bC -s4dpiQ+p7Bn41o0iJejJl1Y4HufbipBz/QJAMYYxr5dGYoojdIb/8YqAH1fJJEhH -BL2TD/FJK5OwbQpHsmUDqt1aAmL7axTHniae3bBc0eopCpDuy9mH/t7OEwJBALcU -3wNscweSpNqb5iHgCOcnD40RIgeNpQ+UXorBsGeD4OrLxQuoydyV6bIw9yLba+xH -Kzftlfpdov7/vz/ojZ0CQQDTzLKgAQ7C8HaLNPuX+w8SVlu7+Hf/rdlaTmppAAFa -CbZIc6BnSeDJeoI5aPyy3w/2ZwFMYbVDnCSbgO3jO33N ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay1mbyteRBR/keys/secret_onion_key_ntor b/tests/integration/net/relay1mbyteRBR/keys/secret_onion_key_ntor deleted file mode 100644 index 3b8b3d1..0000000 Binary files a/tests/integration/net/relay1mbyteRBR/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay1mbyteRBR/torrc b/tests/integration/net/relay1mbyteRBR/torrc deleted file mode 100644 index bf27cc0..0000000 --- a/tests/integration/net/relay1mbyteRBR/torrc +++ /dev/null @@ -1,25 +0,0 @@ - -DataDirectory relay1mbyteRBR -PidFile relay1mbyteRBR/tor.pid -Log notice file relay1mbyteRBR/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.15 -SocksPort 127.10.0.15:2000 -ControlPort 127.10.0.15:2001 -CookieAuthentication 1 -ORPort 127.10.0.15:2002 -DirPort 127.10.0.15:2003 -Nickname relay1mbyteRBR -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 - -RelayBandwidthRate 1 MByte diff --git a/tests/integration/net/relay2/fingerprint b/tests/integration/net/relay2/fingerprint deleted file mode 100644 index f799926..0000000 --- a/tests/integration/net/relay2/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay2 8E687E91DCAB967F6E4EE8E46E66F6AD05C7C625 diff --git a/tests/integration/net/relay2/keys/ed25519_master_id_public_key b/tests/integration/net/relay2/keys/ed25519_master_id_public_key deleted file mode 100644 index 0932a16..0000000 Binary files a/tests/integration/net/relay2/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay2/keys/ed25519_master_id_secret_key b/tests/integration/net/relay2/keys/ed25519_master_id_secret_key deleted file mode 100644 index 2de3459..0000000 Binary files a/tests/integration/net/relay2/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay2/keys/ed25519_signing_cert b/tests/integration/net/relay2/keys/ed25519_signing_cert deleted file mode 100644 index fac1d53..0000000 Binary files a/tests/integration/net/relay2/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay2/keys/ed25519_signing_secret_key b/tests/integration/net/relay2/keys/ed25519_signing_secret_key deleted file mode 100644 index 1b15330..0000000 Binary files a/tests/integration/net/relay2/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay2/keys/secret_id_key b/tests/integration/net/relay2/keys/secret_id_key deleted file mode 100644 index fba3d49..0000000 --- a/tests/integration/net/relay2/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDxUgdr63thXzLDAycLvU4Ly4CAOH9r13DlTaWH3ggHFGkBD85K -kFYlhWnuq29aq6U+Yk4A5mw9KmW0ekE2pEACUsvcHXTS5EDqEkDXc1l6QX0l69RM -YfkfVwKy6WLxr7Y0RPNqckpwP8e+g2mgsYs+bYmUjsvcIVsV9AjMCNU9cQIDAQAB -AoGAOIHOvxSK9YgHKObqE7OmPNjQJDYWkDgIdYkzA5eYJaA/3kHHOmqF4Y9V+M8n -6gFbVjpKradHHSN6YUJnVtYrLmuvlDg22zwJYJK7seZIjn/kF2QSMX6zuVj3m4iK -WvAlbVUGwmv1WGMzZjps3rLuQbF7p81MGMwGEJ8bgy00s6kCQQD7mZ9Jeoayhwz3 -P14IJ/0PPaxUbzoKKBysvJ1NUerVznAjcQXpjRDdiDDfTioYpkG79Ad6kXfnSqHD -de9upU7LAkEA9Ypi3bxAEXyH7Q81qEZUDSM6VL2xaAtUU/qsi3QGk29ddo1P1i5N -l4AWmiWFNsF6R3cJAmnd1ezgmjN4VQ9BMwJAE0G2x1DxbkiX3XSkJcupurjlr7Cz -qINZbn8hKwHSD3s1agEEitOZLtt1oiHBZxGShmgvClqH6tPzfZpRMQ7F8QJAHqHV -E7SYiZXvnzN2jje35Kuwa0H/D+vZ6WAshnlDGMGb915Jx36fT3c7Wp+zrtEUYDYJ -ebObaUTUAGjLalEs4QJBAMah3/xBAplHAbVQnXXQHpn+0qsY0ktLyOjRIft8jfrY -/qPQm5C6A5S+KIjmv2AGp0TD6Fas0Bx8MONCv5oVRSE= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay2/keys/secret_onion_key b/tests/integration/net/relay2/keys/secret_onion_key deleted file mode 100644 index ab4954d..0000000 --- a/tests/integration/net/relay2/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQD6gT1tnd4Sei+DNvTlGy+oH9CQMnKCNvTm2ebPjN3FgOta8bTD -nvw+OPDfyzZbTyx309fRabg1GgrtSNq748sB2JotNRXq5yZpASrEq90gayGtPinY -unyypb7LzUenXH75tpypbdTrJi4+vkvn8sP1bbMG/lEPlEOE/UjRFWXNsQIDAQAB -AoGAfVai/LDLh2U5Vqbtu6BxpOZePXfwUXTb7pHCacCqygJqQDPF5UcsIJnu85rC -1Mb1kfMd/fqun2srYnRcdTxRutpR+21v+RKTF+GGo0rgQ3Ub6FU6CWg4cgC26iDR -r63QKLpwqYEkhurWFBtKOZfrIdzcsXrQ/08D2Wp/hcGM0+0CQQD+In/pTZTu2/Jk -pRXOkD2G02goqtoTw80UaVpnyN/NUWZklJAwbQ/Hg1CHRSv7JHwCB0cQCdtWZZxa -fWEvjLkLAkEA/FfrgcPVwjvYU7m54Es8hXSVUM+Y5n27wIcgyINbvY2Q/UCNNPVP -1QOsYh5T9gZPYTyDPCpBMYPP9oiDajIhswJBAJPdlvc0QNfJ+fs9YrbRjjsIfq5K -2qBtaMHbmtKQOkfIeP9EwbCrhGbdrNlIEhMKY2z6twpJ8ekPLi4ojYeRJYkCQQCk -SuXVZdiNjoMo99oSM0njJeV1aMQHBUOxdQkeI5AeWMZWbKnDGhhw+uRIObC2lKMo -Dsru6B/sCgLjYzwUbzFLAkEA2k3qUR7Tz3puN+pOKGBW9M+wn2m+HnOxiZohbyyj -5T9GeTo0Sb6gK5FBrWA109yhKJwC7LCm0pZbyE1NUCVahQ== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay2/keys/secret_onion_key_ntor b/tests/integration/net/relay2/keys/secret_onion_key_ntor deleted file mode 100644 index 5a6c64d..0000000 Binary files a/tests/integration/net/relay2/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay2/torrc b/tests/integration/net/relay2/torrc deleted file mode 100644 index a3d49f1..0000000 --- a/tests/integration/net/relay2/torrc +++ /dev/null @@ -1,23 +0,0 @@ - -DataDirectory relay2 -PidFile relay2/tor.pid -Log notice file relay2/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.5 -SocksPort 127.10.0.5:2000 -ControlPort 127.10.0.5:2001 -CookieAuthentication 1 -ORPort 127.10.0.5:2002 -DirPort 127.10.0.5:2003 -Nickname relay2 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/relay3/fingerprint b/tests/integration/net/relay3/fingerprint deleted file mode 100644 index 5de4060..0000000 --- a/tests/integration/net/relay3/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay3 693F73187624BE760AAD2A12C5ED89DB1DE044F5 diff --git a/tests/integration/net/relay3/keys/ed25519_master_id_public_key b/tests/integration/net/relay3/keys/ed25519_master_id_public_key deleted file mode 100644 index b5323a8..0000000 Binary files a/tests/integration/net/relay3/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay3/keys/ed25519_master_id_secret_key b/tests/integration/net/relay3/keys/ed25519_master_id_secret_key deleted file mode 100644 index ee4d449..0000000 Binary files a/tests/integration/net/relay3/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay3/keys/ed25519_signing_cert b/tests/integration/net/relay3/keys/ed25519_signing_cert deleted file mode 100644 index 4ad6d28..0000000 Binary files a/tests/integration/net/relay3/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay3/keys/ed25519_signing_secret_key b/tests/integration/net/relay3/keys/ed25519_signing_secret_key deleted file mode 100644 index e48d828..0000000 Binary files a/tests/integration/net/relay3/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay3/keys/secret_id_key b/tests/integration/net/relay3/keys/secret_id_key deleted file mode 100644 index 0231906..0000000 --- a/tests/integration/net/relay3/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDaG0RNhIhKg/eqOrvQvYbpSGTLkEGCJ944su9uFA6Dp+e9gn+l -KaMmB0AEJg4reTGxogE2Ot0h8Kv33R9yZB4J44Toykpg/DjziSl0FwI47fTzo5aU -CkwsSMH+qk+hGsbQaYymEmped4jHwNa1iLdhPltnp2pqDcDqolQbEQxecQIDAQAB -AoGBAJhfPjuNoI22Xlrtx3KQReVKLyjLsghVA/nGgGD94Bn4Pnz142kmipUxsXZ0 -g6e5do8rp/8T5pMkiW+TarnG2fgxo7W3tjaXylLBoKL+/jOfpgOF2vpse9II+Ov2 -rT6X0JO63QJcTD4E6+9LS0gYVCho0/AlE4p0y/FrI3gnBwpVAkEA/WmjQd+mk21l -BKJ9E/1z4QN8TfeC5kvrEbOk6bYoR6VWCKVhwASkJI0O4EzDMEQSNp3JBaGooApe -SILbf1EgUwJBANxVWNOGogUVxfNbVQQB142dCSnISOrYR37MhiOD0hzYoBKtHwUu -265lg9HKjuIV8LFrY0eaYi8A/BUVYgU4PasCQQCOf/nLEC4GlyyIF6tIM20XKjOb -UESupiBQuvlQZxttdn7Tq9Q0+ycmWp/z55aXLKAlUEL7RLWjEVGFavhtNrx7AkEA -lkbTxbnO6b72+0twycHj3d+cb1X+fcazxMUEPFbdSPVrADH5tVRHW0Q7yyvnlkY2 -mxvOY/jlPH/kbxDdgQfh7wJAH9Pa+pvJn6NxjscbVR0Y0h17/nYm9uQedRd9ukyV -8XbjKgmnKnzIlQ6ySpqRMDRIcqE/AgQ1n5nFQKZ1QS9u/Q== ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay3/keys/secret_onion_key b/tests/integration/net/relay3/keys/secret_onion_key deleted file mode 100644 index b0fcdaa..0000000 --- a/tests/integration/net/relay3/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDDnoSWxs6xwfjKvNT2w5COtXqI+t6ZE5s7W5aI/M4dJ8cjWj2l -3ajC0gXT5OCesoHXs7gdsRtHT9OaYzf+8NDNK7oHpXOJCn3mpOlh0iihCFICwuNX -/LBr89Hje0NogMIJjb7+52FQzMWsk/PpKidSTNLTAyVEG6u0r1AAiJz7twIDAQAB -AoGBAJ98Ao9GwMdt5F+t+lbA9H9U9/Try0W0FXAcaKuAqK5eet2YugAbqnZDcprh -1DuuP2vTyzzx4tKOA2+wirugLCpctNz2SysegQt6NXUWbnZTlBaTBEgrTKV6pTjC -d8z9S9MdUOQj6LJXRLsL/9z/2uzHAeiaw1ruMlBWg9L3oFVhAkEA6tjZtHmKfW6c -YwTI2DkUMluzBVY/k2kft93rflzPq2xdfbNAOeJbd8h/26d7AjISZYmMsRfBrmr4 -55OIpfIj8QJBANU9JNKm+Yu2bWKswlqXX6KaXzX3BhAXOUOrFmFQBpccpR1eyL/1 -EggW5bNr6J3LNVgLYPJqUSayM5mbAkSroicCQGkdwuQq+rgGCG2xuIw/kDCyJsEe -x7oddZsA8+VNeY6LJJWc5ASEstg8oC4bGs3yx5U3KggiUAjXzK0qtiFA7qECQQDS -N1T11mZstYtgm69+X3yIcGcsbDot4rcxXpjRlnLoxfSA39BIbPE5yFjqaJcJ+Cq+ -gXkxgl4+J6923rl9uTZBAkBZUdXXduTh3emRMr3Q+FUD5z0x85qNJb9wNg75gVo9 -stZN4CYEVN5rHPkJsZC8YL+ydxKI8N1Yx49h/n6UGcwg ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay3/keys/secret_onion_key_ntor b/tests/integration/net/relay3/keys/secret_onion_key_ntor deleted file mode 100644 index e721c18..0000000 Binary files a/tests/integration/net/relay3/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay3/torrc b/tests/integration/net/relay3/torrc deleted file mode 100644 index 04d6a9f..0000000 --- a/tests/integration/net/relay3/torrc +++ /dev/null @@ -1,23 +0,0 @@ - -DataDirectory relay3 -PidFile relay3/tor.pid -Log notice file relay3/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.6 -SocksPort 127.10.0.6:2000 -ControlPort 127.10.0.6:2001 -CookieAuthentication 1 -ORPort 127.10.0.6:2002 -DirPort 127.10.0.6:2003 -Nickname relay3 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/relay4/fingerprint b/tests/integration/net/relay4/fingerprint deleted file mode 100644 index 9a077bf..0000000 --- a/tests/integration/net/relay4/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay4 4D664E247E530CA5CD5176B8C1A6DABC9531F0B0 diff --git a/tests/integration/net/relay4/keys/ed25519_master_id_public_key b/tests/integration/net/relay4/keys/ed25519_master_id_public_key deleted file mode 100644 index 518a497..0000000 Binary files a/tests/integration/net/relay4/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay4/keys/ed25519_master_id_secret_key b/tests/integration/net/relay4/keys/ed25519_master_id_secret_key deleted file mode 100644 index 2c15189..0000000 Binary files a/tests/integration/net/relay4/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay4/keys/ed25519_signing_cert b/tests/integration/net/relay4/keys/ed25519_signing_cert deleted file mode 100644 index 753bcc5..0000000 Binary files a/tests/integration/net/relay4/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay4/keys/ed25519_signing_secret_key b/tests/integration/net/relay4/keys/ed25519_signing_secret_key deleted file mode 100644 index b05a3e7..0000000 Binary files a/tests/integration/net/relay4/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay4/keys/secret_id_key b/tests/integration/net/relay4/keys/secret_id_key deleted file mode 100644 index 7d27444..0000000 --- a/tests/integration/net/relay4/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDEAaKU5cOPUZf0Vk3XUxQf7JQ29u6I0U4/pHP2sKTl5q2Bkx2o -pBdEZ0HA6V43oZEAC6gswC+cAkq3YYUkUlt4Es1yWsZzYECYPsXbLEJOL4qRwKC0 -IRjpnPSha+K9VX3DZ9m+V6X5dlNA+u1k9ksBFZzFEfDhqGXcrW/VYddTEwIDAQAB -AoGAGaelIhwYxq+FViPduGtVXQBYPgGAI0RSG55o10czrivNVgJthV9E9F0XjCp/ -fISXOAxOjNzy3lamdO48wQ5OjmQiaH7kUH2m/v/xn0i4WCVe8OarYDV9f5+Iy4GS -jADSQu/AWBxVqGYXbVSeBFw++yjx6I5innASZ6liVU4/YxECQQDrFIBXy4DSHVW6 -UlByGmaLoz5dA9YU4/kBrTDDncZvyJke4yk/We5AKTecAnodzhgvc/KlchsKo447 -eNBS6g/dAkEA1XL5BBcUKQrUAfSrTm5Pcgg0mhlovFqCgwiO2SblAodkXFLNxyD8 -twjtYEAP9qZZxT1ej7xKBxUZ3eFVJEY3rwJAX1/Q9k21NQn7xv0wcCqv4gVX/urY -h186nmiCuUqgwKd1ICfviylUVSmjyyLiIoeEHnR/RIp32CglQ5Gvi4Q07QJANPlQ -1fQIW9tFHKslbNSxwOJKc8hElyJ7a5vPIBOoGIWTodonGfmU3rRHfXDIxXUpqGr/ -sfqQAMv63HdVEyieHwJBAIk46ICdBT3Sc/sN9JSB/WWczUNa/uaLElFIMjtd9OJz -QokMFlWLk9gRnm4wx5UaFu3B7TwAfKjBA3DJPIFjbEg= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay4/keys/secret_onion_key b/tests/integration/net/relay4/keys/secret_onion_key deleted file mode 100644 index e64cf65..0000000 --- a/tests/integration/net/relay4/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDc/Y7E5UsEz+t7YRL9r2OWVuTvZgc33mfLbKsGRo9oqbBD2XZb -1fwHMI6cTRDzlUiQjpAvdtiZEvIWkK27o0U2tjxMyLgB5zQSggTeoK/A5003xmwS -jxpgR5k0xAVfxDkuPF74DaTdK4VuHX+pQwxoLPjNmGRZu9gMX7dpYJGaCQIDAQAB -AoGAFK/ryITKdAXevmsE8xiTEwTJY5vCezlnsARZMjoyvJJ9/KwDx28Nq8Kg5wLT -3mmQJHAkET1n41SBsxkSGmmbVeowUuTzvak5R/kh2ghLZmpM/hU6A09OLnh8Zcoq -Ce1i4G80dsvPLoAhhIP+tQ00Upi6rF+NB3RUcSoUZ1GGewECQQD+vfqv5n9GsGJu -NgyWxdolRwl1xDcr3DjuGpsBwu3jAvO8S4RfW5Q6yCOvnodqbk0g/rYZCrRgNv6B -T4WW33zpAkEA3hTprrhH9Y7c1YP+49cCxQ2iWdTxPWALyAl1jrDvq9mkXDxts8uW -f9LA6i1d8BhATrrpYP9OFxMeCZIErB6AIQJASlS++GKmksbXAdetlrUGsUfoH7/w -ZVDuH7QNtNbfORVcb34NkxGS0BAkMZNtagXjZZRNKENyXHzPiIXesiZmOQJBALj5 -3EZeUfmTfBcP8W9e+HyfRZnjRuhjJo0Aa/1lHMwb5M26u3klWv6u0WZ8USEZYf7x -qk/Tdvy7PKqmB+RBJ2ECQQCFVN54qO+U2UtNbDUlD2ULX7iBuekAs8HCsUV6KHi3 -99VjxHPqdf2aY9TUAHelBDUzYGkAZYY5omdmdaU21OXn ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay4/keys/secret_onion_key_ntor b/tests/integration/net/relay4/keys/secret_onion_key_ntor deleted file mode 100644 index 9dc7689..0000000 Binary files a/tests/integration/net/relay4/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay4/torrc b/tests/integration/net/relay4/torrc deleted file mode 100644 index 8d7ffa2..0000000 --- a/tests/integration/net/relay4/torrc +++ /dev/null @@ -1,23 +0,0 @@ - -DataDirectory relay4 -PidFile relay4/tor.pid -Log notice file relay4/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.7 -SocksPort 127.10.0.7:2000 -ControlPort 127.10.0.7:2001 -CookieAuthentication 1 -ORPort 127.10.0.7:2002 -DirPort 127.10.0.7:2003 -Nickname relay4 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/relay5/fingerprint b/tests/integration/net/relay5/fingerprint deleted file mode 100644 index 96a995b..0000000 --- a/tests/integration/net/relay5/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay5 32B7178F7201F76411A99D3552F340D3597D5629 diff --git a/tests/integration/net/relay5/keys/ed25519_master_id_public_key b/tests/integration/net/relay5/keys/ed25519_master_id_public_key deleted file mode 100644 index 24e888b..0000000 Binary files a/tests/integration/net/relay5/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay5/keys/ed25519_master_id_secret_key b/tests/integration/net/relay5/keys/ed25519_master_id_secret_key deleted file mode 100644 index 11b9225..0000000 Binary files a/tests/integration/net/relay5/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay5/keys/ed25519_signing_cert b/tests/integration/net/relay5/keys/ed25519_signing_cert deleted file mode 100644 index 4a34020..0000000 Binary files a/tests/integration/net/relay5/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay5/keys/ed25519_signing_secret_key b/tests/integration/net/relay5/keys/ed25519_signing_secret_key deleted file mode 100644 index 213799f..0000000 Binary files a/tests/integration/net/relay5/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay5/keys/secret_id_key b/tests/integration/net/relay5/keys/secret_id_key deleted file mode 100644 index db91965..0000000 --- a/tests/integration/net/relay5/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDGsbYyn7+9tDq8dNb77bHzrNZIlVyb9731qDhPg1UyzNOXVQ4k -fd731TAWExXhjYJaxg2GzCIaOr5Y60pYiuHiBc5b8CFx8p46llVqMSVkLdRVLeDw -XcEeY7GAUoFZqDCPlG/y8LIzur6fWHSrwgpBd3slf8F5cwmC2Htk0nsdtwIDAQAB -AoGBALFkkiVKaLamxVXh/tp3kcvbQIkXCNKa8fb0FCoxOAydwD85CeJcmoerxz2+ -FmgEniAK+KKjd8LxNWZP01WP0TAVe2ub0XP1N5NUaV0NPvNwAPR4mRNscEgvprC3 -jHdfN+0EH5j6Wqdgr/VEEIDq6nxX4jtJNSgVrFZOm/G++VkRAkEA8lNdIzOyOK2C -m6XpsfAuiU/cRK/wjyGLjQQ8qXxArWMYlmy9YLdrdRVIFPK6MWQu/Vzny91hiSIU -e68djyrgCQJBANHoDEQ3Exx38AfTZPlUZuz06f7WdTOTHVHcxgLJOQIEHW9j1Or2 -5xOkZ+KZ7cUVkv1PzZXJkKUcNbQLK8Tt/78CQHK9BDGhzbZGebwnH/MvzWkY1ivz -voyXDpOTuQFrIti2PjMjg7vivU+v5vR8RasTS6iNr/d4eDFNYLN7pBxg6bkCQEg7 -Kb1vlkv9mcOXou+Jc8Gmpb7j3YDZ5wT8i8b5p3xiHh7uo54XSH0h3f3EKmXffq1c -gMpCilvG0VQbY/xoSdECQAlywnXV372n7j4n+rV1WQ0+QZmkxrUu0JnjJX8N4WKa -KpBB8hMhcu2BczYp3sA4KSz0R241F3VD5rheZqHnTK0= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay5/keys/secret_onion_key b/tests/integration/net/relay5/keys/secret_onion_key deleted file mode 100644 index aa7f882..0000000 --- a/tests/integration/net/relay5/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDxY2DbqbMW/2I8GRO4U9Fzt/FO4XoTaV74ZyDfpI/VAJrgl4lr -h2lDlt9oM/MR9Wp3xtsdx/9OA0lwfO7qugNTB91jUkNmoOhN7sNCM1H/iskw+ka0 -KHI+wLSFJwec9GIiox8K8sOLzwlrpYHxruXR6551bayVW8OsNwKOg9gF/QIDAQAB -AoGATZVrZC6+6P1cTYSh2fTWtSLB5GCEJAkSBTTgVAFIWWXAYb9S48S6CIdNduh7 -j6IZfjXj50aIwEI+MHF3OOpgdoeaYTm4UlhG/mIw2WiGRTsXnLMOHMKnCWBwKXQ8 -xgXmVMy7o4mzylctIrGlKO32eMY0ONSTEQNXZTBZ124mYOECQQD7Jw0kySDTyHda -rYWLEBYnEytz/PpJHMOWpqr+l3RHcjjFEBIjM7DLPGVVjNiiiHSdhCM9SHgrDlZa -6bx2bz9vAkEA9gwUynsyDorOAg78CGtbnYClbm7ehJMTCj308HTlQ68gkbrFBVY/ -ajATpba+ZPI8MN+0YQ3/8bMwn+zHdGZbUwJBAKywD0OJ375/CkIZKceSigjYD3qz -KUz4MCv38X8YmGU/znUBNddqhVdY8bw/Gf23oadk4e4TVD0WoJ3mNSWiHJUCQGqw -vms2lHQd2EqoOL1l4Coh2JpUVQTjyYPNbeK+rZN14weOF1TDG2huRHa9ET4wk80V -k9/p9CvYaaNPRwXARKUCQDUBe+5cxrMzq1ednHAtiQIASKs1h5GZlCJB778hMod3 -OggdXyCTDBGDXLBd+SXBbKrTMivKe0BIlqIpONugTjU= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay5/keys/secret_onion_key_ntor b/tests/integration/net/relay5/keys/secret_onion_key_ntor deleted file mode 100644 index 4c66dcf..0000000 Binary files a/tests/integration/net/relay5/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay5/torrc b/tests/integration/net/relay5/torrc deleted file mode 100644 index 82d995d..0000000 --- a/tests/integration/net/relay5/torrc +++ /dev/null @@ -1,23 +0,0 @@ - -DataDirectory relay5 -PidFile relay5/tor.pid -Log notice file relay5/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.8 -SocksPort 127.10.0.8:2000 -ControlPort 127.10.0.8:2001 -CookieAuthentication 1 -ORPort 127.10.0.8:2002 -DirPort 127.10.0.8:2003 -Nickname relay5 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/relay6/fingerprint b/tests/integration/net/relay6/fingerprint deleted file mode 100644 index c016a8b..0000000 --- a/tests/integration/net/relay6/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay6 C7C5094677013F5BC124183C71A482D0156CDCFE diff --git a/tests/integration/net/relay6/keys/ed25519_master_id_public_key b/tests/integration/net/relay6/keys/ed25519_master_id_public_key deleted file mode 100644 index d7a5607..0000000 Binary files a/tests/integration/net/relay6/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay6/keys/ed25519_master_id_secret_key b/tests/integration/net/relay6/keys/ed25519_master_id_secret_key deleted file mode 100644 index 49b828b..0000000 Binary files a/tests/integration/net/relay6/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay6/keys/ed25519_signing_cert b/tests/integration/net/relay6/keys/ed25519_signing_cert deleted file mode 100644 index 3923225..0000000 Binary files a/tests/integration/net/relay6/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay6/keys/ed25519_signing_secret_key b/tests/integration/net/relay6/keys/ed25519_signing_secret_key deleted file mode 100644 index d713c37..0000000 Binary files a/tests/integration/net/relay6/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay6/keys/secret_id_key b/tests/integration/net/relay6/keys/secret_id_key deleted file mode 100644 index 2c2493f..0000000 --- a/tests/integration/net/relay6/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDM4WCrKcd06PX34O6NScFAoUhvLw36vE4kvDPcbjaCUtg4f/YM -uxNqRYiRyF6CrnK8QQ0+BILSY3fvleayq+oMIOOp0/6iXZN2DJuyUT5zfwRgaxfn -REAnn4b3lOV5ROE9OeAj5QSlf786Dz6r1bSr5anDO1lmp7zlrJaRX/uo9QIDAQAB -AoGBAL8mc8OeKjqYc4x+rvLhYk2DbIpXc4qBD8NUWGqL5Y1378XfFVhRXk7jawTg -1dTFH8UmSE2ZddkG9spwqBoBLU3R3bc+zORHUKxmzKTSzQxv7IqWjFk8R1wLztPD -McjRxjtbDlt5reRzAayTNo9Jr/2KXu+uVDAzZGs3WXBfrqYBAkEA7lZrcH8EUyW+ -uNfuo83r2/tgv6a59/Z68VAPrzF2vS4gPYV/a5ICMC/m+xn7V65Fi/sNpkZvTvVy -19Z9FzzPdQJBANwQOwH+BQ88NXF6XzOYxJNNJhdfgnq4g4HTrmRUZ6rikurfDzQQ -KQ/NoBpn+iHgkkbBmp5QmO/ZAm8cDAXtw4ECQDN5Qpb3N63ldv1g1U9XR9sovUpm -7b8Z4o9/ZQPHQQe2kIv46v4GeKaDkfUlNV1IbAjBXb9Ncviwle77ieSc44kCQA3O -tuUZGxgpnvDPzMlf/HWBkbJFu9oXWaj7ryV8ZkTCkpVKCZoqqWjkbfc6LueRP5xQ -6XKle/MQmqZ+DAMTOAECQDKLWLO/6vng8CrJsDv5e/3kjFAFSIN5fl25TVZn5Yje -ImUI3OIWKth4bSogQvVj1M9zU+0D0U4z1/03wMZnEWo= ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay6/keys/secret_onion_key b/tests/integration/net/relay6/keys/secret_onion_key deleted file mode 100644 index b00908b..0000000 --- a/tests/integration/net/relay6/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDWLnWvQkwURtn3LBgL63OPC2ZQ4kTpMqtRxcHgxz37rFPmweUX -aVipkt2v2YDKlbLYO2gaEYexegta3obDO5g8+w6DTZ2DzZScPyh4LbA3O48VS31T -/MN/CYYQtBpIJvKZuV61TJZf/Eb34KkIsvngyPWvvIlj/L+2S5veTh45yQIDAQAB -AoGAT0Y49tqCEEs9J9hhOiA20G42u59UREAl2wloPktgrMNW9qUzpxut3m3mscy+ -d706ygALAwMUB2OVylds59wp91IwntCPtxc7kGe6nBXPipxUOxpnS74PaSjVo3P0 -1Z/tq+5Nx/DQzGyEJdyeGWLZDILjZCdA1CWBYHflC4nqFMUCQQD/jVKHwSq1/Tg2 -GdaI0WpYGeuDDGHOrOaJQnPER45bzeYDzolyCdTVRgnFgnaaAMuEPNmK6gOtXg0E -RibDUgrbAkEA1o6Sj6bNbPaplLP01YQbvHlhT0KKQSLQhGnw3R55SBMMFfaaPRda -bvEd4oqRCD2oLQ0bcKuX1wLz+XxUBYplKwJBAL/gJWJmqCIC4YzFc65Axn8l3w4D -YwCiE2pl6bQrIflOLHEZR1vHg/UqZDXXEiPpiuVcJt7FfENUhaN65Kns1NcCQE+c -66k+Ha+2/0ncVJb9xET1TTRZ3m84+eKIZQXHjv09hBiKPsU4aygLdClhfVtvdX3y -BSKTqW3w/JKwnYTIy60CQQCryzKc4d+/OFjBQev5Qy8KkeINTwCEcS9/PqBN546W -9US8JP4WbYFaJZLnSUHod+CBj7axtEru+mFK3sY8D9Wd ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay6/keys/secret_onion_key_ntor b/tests/integration/net/relay6/keys/secret_onion_key_ntor deleted file mode 100644 index f3df10d..0000000 Binary files a/tests/integration/net/relay6/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay6/torrc b/tests/integration/net/relay6/torrc deleted file mode 100644 index f33d71a..0000000 --- a/tests/integration/net/relay6/torrc +++ /dev/null @@ -1,23 +0,0 @@ - -DataDirectory relay6 -PidFile relay6/tor.pid -Log notice file relay6/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.9 -SocksPort 127.10.0.9:2000 -ControlPort 127.10.0.9:2001 -CookieAuthentication 1 -ORPort 127.10.0.9:2002 -DirPort 127.10.0.9:2003 -Nickname relay6 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/relay7/fingerprint b/tests/integration/net/relay7/fingerprint deleted file mode 100644 index f88bb90..0000000 --- a/tests/integration/net/relay7/fingerprint +++ /dev/null @@ -1 +0,0 @@ -relay7 E894C65997F8EC96558B554176EEEA39C6A43EF6 diff --git a/tests/integration/net/relay7/keys/ed25519_master_id_public_key b/tests/integration/net/relay7/keys/ed25519_master_id_public_key deleted file mode 100644 index a3cada5..0000000 Binary files a/tests/integration/net/relay7/keys/ed25519_master_id_public_key and /dev/null differ diff --git a/tests/integration/net/relay7/keys/ed25519_master_id_secret_key b/tests/integration/net/relay7/keys/ed25519_master_id_secret_key deleted file mode 100644 index caf0bd2..0000000 Binary files a/tests/integration/net/relay7/keys/ed25519_master_id_secret_key and /dev/null differ diff --git a/tests/integration/net/relay7/keys/ed25519_signing_cert b/tests/integration/net/relay7/keys/ed25519_signing_cert deleted file mode 100644 index ae1edc8..0000000 Binary files a/tests/integration/net/relay7/keys/ed25519_signing_cert and /dev/null differ diff --git a/tests/integration/net/relay7/keys/ed25519_signing_secret_key b/tests/integration/net/relay7/keys/ed25519_signing_secret_key deleted file mode 100644 index ed0d5e3..0000000 Binary files a/tests/integration/net/relay7/keys/ed25519_signing_secret_key and /dev/null differ diff --git a/tests/integration/net/relay7/keys/secret_id_key b/tests/integration/net/relay7/keys/secret_id_key deleted file mode 100644 index b8c17dd..0000000 --- a/tests/integration/net/relay7/keys/secret_id_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQC8w+hoJy7Y5LTtIKXet4k7iFLAHix9h/0U+QrUJxpLWAJ2quEb -antK/7yFu+/XUZtK70bSpqCWOzvVvjVjzaCK0hmAbnk8Gt8CinwOJ+KQ1W6tq2D8 -j9HUf6UHRt6lqgTt3aA9LOZk8AFNihpbVy9pI5V6PX0fR1phSVXHrLsXlwIDAQAB -AoGAMIVzIgKgaiQv1ZxExsEKx4C9NKEM8p+YEGILxIjgm2leCL7X6kIuuxKNlRrA -Ber2Lgbff5pRQQyszr573tGmaFboyMdEE1NCYz46BLCSN7L1eQQZgkAZLM/j3OP0 -nLfa9XjL/oux/WAuRm5eL/m7/WYj0smioQe0DrET/oz+/+ECQQD2JDHgeCxWR/dq -agZj1kxH/L4D/KNLDkzL/EnsLdoFAzfMZ+t7ioHeszDAMHvjfbieozUj/cXgXGeF -bbR2KAh5AkEAxFNognEciwez25Nt/7IOraTQeijF7fCWynlYXHYBV4Jvh2VfGc+6 -jRnbjj4luL9ZYXWNr62RG4pLQw9wiPI8jwJBAOSqc3upqObvLLc7kHwnle46qvxh -NAKCYm4PD03OuwB1IN1Qnb/DySrvJZcmc7HAFkeqL7AkDjSFI9cdN82dG2ECQBWS -WJxkk09PdFq/E0oSJXy87E9P5ZekZN0wgh3+tV0JLvoAkHeElKnmWnKBr6FiHQ8R -XJUeDCCrjGN88c+KVk8CQQCFYcWCA4Pz/g/VfEyQHDdhhizotJHACJZe9Kr+7vNJ -9Pf/pWbjQnQMpbJl9wTev8lDxYbgKshOh8iqhq2ynCAY ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay7/keys/secret_onion_key b/tests/integration/net/relay7/keys/secret_onion_key deleted file mode 100644 index 9c542d7..0000000 --- a/tests/integration/net/relay7/keys/secret_onion_key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDet1J5F17VC0u9mV5X8xkTdQeTdykQ/v3Zxt+gcQOgF9GFwgpS -7HUnp6BSGEjZZzt9tYZR0it2WvdO4gxLXLWb2jqo6zK0RX9bpH9UF6AmwHfQz8CB -JFRuWw6Ao27uZWpZZmx/075FqAXtEboXwpgASJFW43HVQgHuggHGFR1gxQIDAQAB -AoGBAMduRwaxu7RwKgF8XXPJ9pFqwT72fCqA+1VQdR1ZNdLcoTzyNYZtwLairrf0 -kP9EJox5yO5pkYupBz12w2WUffWGuushqrDn+3CcRuQw+gGkZRE8lpUnQwPPynWP -428854TfojqgEelzUa128HDJkear7Dtfsz31D+Yt4cOcGQfBAkEA8WccQMfhiSRO -DKLazpXMq0Dufrh6cov+turi04vvoC/6lgc+Hreh62CJVVhp+UDzP0QWRU/5LrKu -AlLMc2BFFQJBAOwu8a4oEbYBzqAB/L40s9bZJi10FK47OGOz6z2q7SU2UH32EeZR -OTWM3aeDSpad7HkFHvVtaU+5K9cJy6ZQ+PECQGQnOUuPIf05+L+5WTpYX/+1Ar3E -X9jiSB0vuke2SQaWoUpZWuZ3nVAATzn/Yogs8D6RSwQat/Et5I/GNliv2jkCQFXb -et/kkQuo/IQONOKwJfAkYEyFtj7gKE+WSB3S1QKCDCC+IyOmwzVEUA9lGuhF4IDd -67MsYuwoVFeHqBB9vwECQQCALP4WoHri8nbRVwjlHBSDjrBB5Cn5KF3CQ9Yfcr+u -Xt0zOoEE+1CuT6HWSn4zXvjsAdj0SNWiZaNP/dvfdWB0 ------END RSA PRIVATE KEY----- diff --git a/tests/integration/net/relay7/keys/secret_onion_key_ntor b/tests/integration/net/relay7/keys/secret_onion_key_ntor deleted file mode 100644 index 8dcca5d..0000000 Binary files a/tests/integration/net/relay7/keys/secret_onion_key_ntor and /dev/null differ diff --git a/tests/integration/net/relay7/torrc b/tests/integration/net/relay7/torrc deleted file mode 100644 index d7a4842..0000000 --- a/tests/integration/net/relay7/torrc +++ /dev/null @@ -1,23 +0,0 @@ - -DataDirectory relay7 -PidFile relay7/tor.pid -Log notice file relay7/notice.log -ShutdownWaitLength 2 -ExitRelay 0 -Address 127.10.0.10 -SocksPort 127.10.0.10:2000 -ControlPort 127.10.0.10:2001 -CookieAuthentication 1 -ORPort 127.10.0.10:2002 -DirPort 127.10.0.10:2003 -Nickname relay7 -ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - -TestingTorNetwork 1 -NumCPUs 1 -LogTimeGranularity 1 -SafeLogging 0 diff --git a/tests/integration/net/start.sh b/tests/integration/net/start.sh deleted file mode 100755 index f96cf9d..0000000 --- a/tests/integration/net/start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -e -function cleanup { - #kill -INT $(cat {auth,relay,exit}*/tor.pid) - #kill -INT $(jobs -p) - echo -n '' -} -trap cleanup EXIT - - -cd $(dirname $0) -for A in {auth,relay,exit}* -do - tor -f $A/torrc --quiet & -done diff --git a/tests/integration/net/stop.sh b/tests/integration/net/stop.sh deleted file mode 100755 index 026c8c9..0000000 --- a/tests/integration/net/stop.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -cd $(dirname $0) -kill -INT $(cat {auth,relay,exit}*/tor.pid) diff --git a/tests/integration/net/wait.py b/tests/integration/net/wait.py deleted file mode 100755 index 8c8512a..0000000 --- a/tests/integration/net/wait.py +++ /dev/null @@ -1,136 +0,0 @@ -#!/usr/bin/env python3 -from argparse import RawTextHelpFormatter, ArgumentParser -from stem.control import Controller -import time -import os -import logging - -logger = logging.getLogger(__name__) - - -def get_controller(addr, port): - cont = Controller.from_port(addr, port) - cont.authenticate() - return cont - - -def get_is_bootstrapped(cont, timeout=60): - start_time = time.time() - while start_time + timeout > time.time(): - line = cont.get_info('status/bootstrap-phase') - state, _, progress, *_ = line.split() - progress = int(progress.split('=')[1]) - if state == 'NOTICE' and progress == 100: - logger.debug('Tor is bootstrapped') - return True - time.sleep(1) - logger.debug("Tor didn't bootstrap before timeout. Last line: %s", line) - return False - - -def get_has_full_consensus(cont, network_size, timeout=60): - start_time = time.time() - while start_time + timeout > time.time(): - relays = [r for r in cont.get_network_statuses()] - if len(relays) == network_size: - logger.debug('Tor has correct network size %d', - network_size) - return True - elif len(relays) > network_size: - logger.warning('Tor has more relays than expected. %d vs %d', - len(relays), network_size) - return True - time.sleep(1) - logger.debug('Tor didn\'t reach expected network size %d before ' - 'timeout', network_size) - return False - - -def is_tor_ready(addr, port, network_size): - name = '{}:{}'.format(addr, port) - with get_controller(addr, port) as cont: - if not get_is_bootstrapped(cont): - logger.warning('%s not bootstrapped, Tor not ready', name) - return False - if not get_has_full_consensus(cont, network_size): - logger.warning('%s doesn\'t have full consensus, Tor not ready', - name) - return False - logger.info('%s is ready', name) - return True - - -def extract_control_port_info(torrc_fname): - with open(torrc_fname, 'rt') as fd: - for line in fd: - if 'ControlPort' not in line: - continue - line = line.strip() - info = line.split()[1] - addr, port = info.split(':') - return addr, int(port) - - -def main(args): - for datadir in args.datadir: - logger.info('Checking if %s is ready', datadir) - addr, port = extract_control_port_info(os.path.join(datadir, 'torrc')) - if not is_tor_ready(addr, port, network_size=args.size): - return 1 - # If we got to this point, it seems like every relay is completely ready. - # Do one more check to make sure that's still the case. - for datadir in args.datadir: - logger.info('Verifying %s is still ready', datadir) - addr, port = extract_control_port_info(os.path.join(datadir, 'torrc')) - if not is_tor_ready(addr, port, network_size=args.size): - return 1 - return 0 - - -if __name__ == '__main__': - desc = ''' -Given the data directories for a local tor network, connect to the control -socket in each directory and verify that the tor on the other end of the socket -is fully bootstrapped and has the right size of consensus. - -The "right size of consensus" is determined based on the number of data -directories given to check. If that is not okay to assume (for example, there -are some Tor client [non-relay] data directories given to check), then specify -the size manually with --size. - -Waits up to 60 seconds for each check for each tor. - -- In the worst case, this script will take a long time to run (if every tor - suddenly passes each check after 59 seconds). -- In the normal failure case, this script will take about 60 seconds to run - (the first tor is not ready and fails its checks). -- In the normal case, it will run very quickly (every tor is bootstrapped and - ready). - -Exits with 0 if everything is good. Otherwise exits with a postive integer. -''' - parser = ArgumentParser( - formatter_class=RawTextHelpFormatter, description=desc) - parser.add_argument('-s', '--size', type=int, help='If given, don\'t ' - 'assume the network size based on the number of ' - 'datadirs, but use this size instead.') - parser.add_argument('-d', '--debug', action='store_true') - parser.add_argument('datadir', nargs='+', type=str) - args = parser.parse_args() - - if args.debug: - logger.setLevel(logging.DEBUG) - else: - logger.setLevel(logging.WARNING) - ch = logging.StreamHandler() - formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') - ch.setFormatter(formatter) - logger.addHandler(ch) - - if not args.size: - args.size = len(args.datadir) - - try: - exit(main(args)) - except KeyboardInterrupt: - pass diff --git a/tests/integration/sbws_testnet.ini b/tests/integration/sbws_testnet.ini index ecae641..7853981 100644 --- a/tests/integration/sbws_testnet.ini +++ b/tests/integration/sbws_testnet.ini @@ -18,12 +18,7 @@ verify = False country = ZZ [tor] -extra_lines = - DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 - DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 - DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 +external_control_port = 8015 [logging] level = debug diff --git a/tox.ini b/tox.ini index f0aadaf..acd31aa 100644 --- a/tox.ini +++ b/tox.ini @@ -42,31 +42,11 @@ commands = ignore_errors = True deps = .[test] whitelist_externals = - cp bash - sleep - wget - mkdir - rm commands = # For some reason .[test] is not copying config.* files pip install . - cp -af {toxinidir}/tests/integration/net {envtmpdir} - bash {envtmpdir}/net/start.sh - bash -c "time python3 {envtmpdir}/net/wait.py {envtmpdir}/net/{auth,relay,exit}*" - bash -c "python3 {toxinidir}/scripts/tools/sbws-http-server.py --port 28888 &>/dev/null &" - sleep 1 - wget -O/dev/null http://127.0.0.1:28888/sbws.bin - ; Run actually the scanner - mkdir -p /tmp/.sbws - ; This add around 3min more to the tests - sbws -c {toxinidir}/tests/integration/sbws_testnet.ini scanner - sbws -c {toxinidir}/tests/integration/sbws_testnet.ini generate - coverage run -a --rcfile={toxinidir}/.coveragerc --source=sbws -m pytest -s {toxinidir}/tests/integration -vv - sbws -c {toxinidir}/tests/integration/sbws_testnet.ini cleanup - bash {envtmpdir}/net/stop.sh - # no need to remove .tox/net directory. - rm -rf /tmp/.sbws + bash -c tests/integration/run.sh {envtmpdir}/chutney [testenv:lint] skip_install = True

1 0

[sbws/maint-1.1] fix: test: Add chutney configuration
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 212047f4c4601d263078cde4338060704d026d78 Author: juga0 <juga(a)riseup.net> Date: Thu Dec 17 15:30:11 2020 +0000 fix: test: Add chutney configuration and scripts to run the integration tests with chutney. It does not replace yet the way integration tests are run. --- .gitignore | 1 + tests/integration/chutney_data/bwscanner | 15 +++++++++++++ .../integration/chutney_data/client_bwscanner.tmpl | 23 +++++++++++++++++++ tests/integration/chutney_data/non-exit.tmpl | 4 ++++ tests/integration/chutney_data/relay-MAB.tmpl | 4 ++++ tests/integration/chutney_data/relay-MBR.tmpl | 4 ++++ tests/integration/run.sh | 14 ++++++++++++ tests/integration/start_chutney.sh | 26 ++++++++++++++++++++++ tests/integration/stop_chutney.sh | 10 +++++++++ 9 files changed, 101 insertions(+) diff --git a/.gitignore b/.gitignore index 9903d5d..744436b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ htmlcov dist build *.lockfile +chutney diff --git a/tests/integration/chutney_data/bwscanner b/tests/integration/chutney_data/bwscanner new file mode 100644 index 0000000..6506bc3 --- /dev/null +++ b/tests/integration/chutney_data/bwscanner @@ -0,0 +1,15 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +NonExitRelay = Node(tag="m", relay=1, exit=0, torrc="non-exit.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", client=1, torrc="client_bwscanner.tmpl") +RelayMAB = Node(tag="relay1mbyteMAB", relay=1, torrc="relay-MAB.tmpl") +RelayMBR = Node(tag="relay1mbyteMBR", relay=1, torrc="relay-MBR.tmpl") + +NODES = Authority.getN(3) + \ + NonExitRelay.getN(9) + \ + ExitRelay.getN(3) + Client.getN(1) + +# RelayMBR.getN(1) + RelayMAB.getN(1) + \ + +ConfigureNodes(NODES) diff --git a/tests/integration/chutney_data/client_bwscanner.tmpl b/tests/integration/chutney_data/client_bwscanner.tmpl new file mode 100644 index 0000000..dc6d0d8 --- /dev/null +++ b/tests/integration/chutney_data/client_bwscanner.tmpl @@ -0,0 +1,23 @@ +${include:common.i} +SocksPort $socksport + +#NOTE: Setting TestingClientConsensusDownloadSchedule doesn't +# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS +# at boostrap time. +# Try to download after: +# the minimum initial consensus time to start with, +# a few eager fetches, +# then half the minimum testing consensus interval +#TestingClientDownloadSchedule 0, 5 +#TestingClientConsensusDownloadSchedule 0, 5 +#ControlPort 8015 +UseEntryGuards 0 +UseMicroDescriptors 0 +FetchDirInfoEarly 1 +FetchDirInfoExtraEarly 1 +FetchUselessDescriptors 1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +ConnectionPadding 0 +__DisablePredictedCircuits 1 +__LeaveStreamsUnattached 1 diff --git a/tests/integration/chutney_data/non-exit.tmpl b/tests/integration/chutney_data/non-exit.tmpl new file mode 100644 index 0000000..25d8806 --- /dev/null +++ b/tests/integration/chutney_data/non-exit.tmpl @@ -0,0 +1,4 @@ +${include:relay-non-exit.tmpl} + +ExitRelay 0 +ExitPolicy reject *:* diff --git a/tests/integration/chutney_data/relay-MAB.tmpl b/tests/integration/chutney_data/relay-MAB.tmpl new file mode 100644 index 0000000..28bc6a7 --- /dev/null +++ b/tests/integration/chutney_data/relay-MAB.tmpl @@ -0,0 +1,4 @@ +${include:non-exit.tmpl} + +Nickname relay1mbyteMAB +MaxAdvertisedBandwidth 1 MBytes diff --git a/tests/integration/chutney_data/relay-MBR.tmpl b/tests/integration/chutney_data/relay-MBR.tmpl new file mode 100644 index 0000000..946600b --- /dev/null +++ b/tests/integration/chutney_data/relay-MBR.tmpl @@ -0,0 +1,4 @@ +${include:non-exit.tmpl} + +Nickname relay1mbyteMBR +RelayBandwidthRate 1 MBytes diff --git a/tests/integration/run.sh b/tests/integration/run.sh new file mode 100755 index 0000000..e870b50 --- /dev/null +++ b/tests/integration/run.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -x + +tests/integration/start_chutney.sh +python3 scripts/tools/sbws-http-server.py --port 28888 &>/dev/null & +sleep 1 +wget -O/dev/null http://127.0.0.1:28888/sbws.bin +# Run actually the scanner +sbws -c tests/integration/sbws_testnet.ini scanner +sbws -c tests/integration/sbws_testnet.ini generate +# Run integration tests +coverage run -a --rcfile=.coveragerc --source=sbws -m pytest -s tests/integration -vv +sbws -c tests/integration/sbws_testnet.ini cleanup +tests/integration/stop_chutney.sh diff --git a/tests/integration/start_chutney.sh b/tests/integration/start_chutney.sh new file mode 100755 index 0000000..04f9641 --- /dev/null +++ b/tests/integration/start_chutney.sh @@ -0,0 +1,26 @@ +#!/bin/bash +set -x + +CURRENT_DIR=`pwd` +CHUTNEY_DIR=${1:-./chutney} + +# If chutney dir already exists, this will fail but it doesn't matter. +git clone https://git.torproject.org/chutney.git $CHUTNEY_DIR + +cp tests/integration/chutney_data/bwscanner $CHUTNEY_DIR/networks +cp tests/integration/chutney_data/*.tmpl $CHUTNEY_DIR/torrc_templates + +cd $CHUTNEY_DIR +# In case it wasn't cloned recently, pull. +# Since this is run only for the tests, it's ok if the tests fail with a newer +# chutney version, so that we can detect it early. +git pull + +# Stop chutney network if it is already running +./chutney stop networks/bwscanner +./chutney configure networks/bwscanner +./chutney start networks/bwscanner +./chutney status networks/bwscanner +./chutney wait_for_bootstrap networks/bwscanner + +cd $CURRENT_DIR diff --git a/tests/integration/stop_chutney.sh b/tests/integration/stop_chutney.sh new file mode 100755 index 0000000..6008453 --- /dev/null +++ b/tests/integration/stop_chutney.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -x + +CURRENT_DIR=`pwd` +CHUTNEY_DIR=${1:-./chutney} +cd $CHUTNEY_DIR +# Stop chutney network if it is already running +./chutney stop networks/bwscanner +cd $CURRENT_DIR

1 0

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/61' into maint-1.1
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 3e4ccb90ea64b391d0003bb72f17d513845680ae Merge: e375cd2 d0a0202 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 22 17:12:18 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/61' into maint-1.1 docs/source/activity_measure.puml | 30 +++++++ docs/source/how_works.rst | 12 ++- docs/source/images/activity_measure.svg | 42 +++++++++ sbws/core/scanner.py | 145 ++++++++++++++++++++++---------- sbws/lib/relaylist.py | 35 +++++--- 5 files changed, 204 insertions(+), 60 deletions(-)

1 0

[sbws/maint-1.1] fix: relaylist: rename is_exit_not_bad_allowing_port
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 33a5909f57271a67ef0d9d88c1d7799d341d5ece Author: juga0 <juga(a)riseup.net> Date: Tue Feb 2 11:38:12 2021 +0000 fix: relaylist: rename is_exit_not_bad_allowing_port see previous commit --- sbws/core/scanner.py | 2 +- sbws/lib/relaylist.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 312993a..20f1b83 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -294,7 +294,7 @@ def measure_relay(args, conf, destinations, cb, rl, relay): # exit, then pick a non-exit. Otherwise pick an exit. helper = None circ_fps = None - if relay.is_exit_not_bad_allowing_port(dest.port): + if relay.is_exit_not_bad_allowing_port_all_ips(dest.port): helper = _pick_ideal_second_hop( relay, dest, rl, cb.controller, is_exit=False) if helper: diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 5eef4aa..86e0d7b 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -219,7 +219,7 @@ class Relay: return False return False - def is_exit_not_bad_allowing_port(self, port): + def is_exit_not_bad_allowing_port_all_ips(self, port): return (Flag.BADEXIT not in self.flags and Flag.EXIT in self.flags and self.can_exit_to_port_all_ips(port)) @@ -455,7 +455,7 @@ class RelayList: def exits_not_bad_allowing_port(self, port): return [r for r in self.exits - if r.is_exit_not_bad_allowing_port(port)] + if r.is_exit_not_bad_allowing_port_all_ips(port)] def increment_recent_measurement_attempt(self): """

1 0

[sbws/maint-1.1] fix: resultdump: Log if relay was measured as exit
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit beaf6de889bc75d53a6b0b90d12ab85aa0db56a0 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 3 13:15:45 2021 +0000 fix: resultdump: Log if relay was measured as exit or entry. Closes #40048 --- sbws/lib/resultdump.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 542837e..6673e9a 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -792,6 +792,10 @@ class ResultDump: "destination {}: {}".format( result.fingerprint, result.nickname, result.circ, result.dest_url, result.msg) + # The result doesn't store the exit policies, so it can't be logged + # whether it was an exit. + as_exit = result.circ[1] == result.fingerprint + msg += ". As exit." if as_exit else ". As entry." # When the error is that there are not more functional destinations. if result.type == "error-destination": log.info("Shutting down because there are not functional "

1 0

[sbws/maint-1.1] fix: relaylist: rename can_exit_to_port
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 1014bac294d03790c15bec1bff21e9ca9802acdb Author: juga0 <juga(a)riseup.net> Date: Tue Feb 2 11:15:02 2021 +0000 fix: relaylist: rename can_exit_to_port to can_exit_to_port_all_ips, because it's using `strict`, which means that it allows to exit to all IPs. It seems more convenient to try first with exits that allow to exit to some IPs and only try a second time if that fails, because there are more. --- sbws/lib/relaylist.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index ba0b176..5eef4aa 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -178,7 +178,7 @@ class Relay: """Number of times the relay was in a conensus.""" return len(self.relay_in_recent_consensus) - def can_exit_to_port(self, port): + def can_exit_to_port_all_ips(self, port): """ Returns True if the relay has an exit policy and the policy accepts exiting to the given portself or False otherwise. @@ -192,7 +192,7 @@ class Relay: # When the attribute is gotten in getattr(self._desc, "exit_policy"), # is possible that stem's _input_rules is None and raises an exception # (#29899): - # File "/usr/lib/python3/dist-packages/sbws/lib/relaylist.py", line 117, in can_exit_to_port # noqa + # File "/usr/lib/python3/dist-packages/sbws/lib/relaylist.py", line 117, in can_exit_to_port_all_ips # noqa # if not self.exit_policy: # File "/usr/lib/python3/dist-packages/stem/exit_policy.py", line 512, in __len__ # noqa # return len(self._get_rules()) @@ -222,7 +222,7 @@ class Relay: def is_exit_not_bad_allowing_port(self, port): return (Flag.BADEXIT not in self.flags and Flag.EXIT in self.flags and - self.can_exit_to_port(port)) + self.can_exit_to_port_all_ips(port)) def increment_relay_recent_measurement_attempt(self): """

1 0

[sbws/maint-1.1] fix: relaylist: Add methods to obtain exits that
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 55b76a84b9da3d13f2d2616cb83a29e4726b8a67 Author: juga0 <juga(a)riseup.net> Date: Tue Feb 2 11:46:21 2021 +0000 fix: relaylist: Add methods to obtain exits that can exit to some IPs. To use them in the cases it will be more convenient. --- sbws/lib/relaylist.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 863689e..3ff1f73 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -219,11 +219,34 @@ class Relay: return False return False + def can_exit_to_port_some_ips(self, port): + """ + Returns True if the relay has an exit policy and the policy accepts + exiting to the given port and some public IPs or False otherwise. + """ + assert isinstance(port, int) + try: + if self.exit_policy: + # Not using argument `strict`, to know whether it can exit + # some public IPs, though not all. + return ( + self.exit_policy.strip_private() + .can_exit_to(port=port) + ) + except TypeError: + return False + return False + def is_exit_not_bad_allowing_port_all_ips(self, port): return (Flag.BADEXIT not in self.flags and Flag.EXIT in self.flags and self.can_exit_to_port_all_ips(port)) + def is_exit_not_bad_allowing_port_some_ips(self, port): + return (Flag.BADEXIT not in self.flags and + Flag.EXIT in self.flags and + self.can_exit_to_port_some_ips(port)) + def increment_relay_recent_measurement_attempt(self): """ Increment The number of times that a relay has been queued @@ -457,6 +480,10 @@ class RelayList: return [r for r in self.exits if r.is_exit_not_bad_allowing_port_all_ips(port)] + def exits_not_bad_allowing_port_some_ips(self, port): + return [r for r in self.exits + if r.is_exit_not_bad_allowing_port_some_ips(port)] + def increment_recent_measurement_attempt(self): """ Increment the number of times that any relay has been queued to be

1 0

[sbws/maint-1.1] fix: relaylist: rename exits_not_bad_allowing_port
by juga＠torproject.org 23 Feb '21

23 Feb '21

commit 3e2e6c7e77a041fb0dd31b993945ef7da766ea9c Author: juga0 <juga(a)riseup.net> Date: Tue Feb 2 11:40:04 2021 +0000 fix: relaylist: rename exits_not_bad_allowing_port see previous commit --- sbws/core/scanner.py | 2 +- sbws/lib/relaylist.py | 2 +- tests/integration/lib/test_destination.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 20f1b83..2736059 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -209,7 +209,7 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, is_exit): destination **dest**, pick a second relay that is or is not an exit according to **is_exit**. ''' - candidates = rl.exits_not_bad_allowing_port(dest.port) if is_exit \ + candidates = rl.exits_not_bad_allowing_port_all_ips(dest.port) if is_exit \ else rl.non_exits if not len(candidates): return None diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index 86e0d7b..863689e 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -453,7 +453,7 @@ class RelayList: """Number of times a new consensus was obtained.""" return len(self._recent_consensus) - def exits_not_bad_allowing_port(self, port): + def exits_not_bad_allowing_port_all_ips(self, port): return [r for r in self.exits if r.is_exit_not_bad_allowing_port_all_ips(port)] diff --git a/tests/integration/lib/test_destination.py b/tests/integration/lib/test_destination.py index 98ed89f..19f6617 100644 --- a/tests/integration/lib/test_destination.py +++ b/tests/integration/lib/test_destination.py @@ -26,7 +26,7 @@ def test_connect_to_destination_over_circuit_success(persistent_launch_tor, relay = [r for r in rl.relays if r.nickname == 'relay1mbyteMAB'][0] # Choose an exit, for this test it does not matter the bandwidth - helper = rl.exits_not_bad_allowing_port(destination.port)[0] + helper = rl.exits_not_bad_allowing_port_all_ips(destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] # build a circuit circuit_id, _ = cb.build_circuit(circuit_path) @@ -46,7 +46,7 @@ def test_connect_to_destination_over_circuit_fail(persistent_launch_tor, relay = [r for r in rl.relays if r.nickname == 'relay1mbyteMAB'][0] # Choose an exit, for this test it does not matter the bandwidth - helper = rl.exits_not_bad_allowing_port(bad_destination.port)[0] + helper = rl.exits_not_bad_allowing_port_all_ips(bad_destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] # Build a circuit. circuit_id, _ = cb.build_circuit(circuit_path) @@ -75,7 +75,7 @@ def test_functional_destinations(conf, cb, rl, persistent_launch_tor): relay = [r for r in rl.relays if r.nickname == 'relay1mbyteMAB'][0] # Choose an exit, for this test it does not matter the bandwidth - helper = rl.exits_not_bad_allowing_port(bad_destination.port)[0] + helper = rl.exits_not_bad_allowing_port_all_ips(bad_destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] # Build a circuit. circuit_id, _ = cb.build_circuit(circuit_path)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2021