July 2019 - tor-commits - lists.torproject.org

[tor/master] Add a test for disallowing single-hop introductions.
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit df12ff3deaa7ad4a5eb2098f4ed9d12ee4084d6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 12:42:33 2019 -0400 Add a test for disallowing single-hop introductions. Code from dgoulet. --- src/test/test_hs_intropoint.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 732836fb5..0cdb1fef2 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -16,6 +16,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "core/or/or.h" +#include "core/or/channel.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "ht.h" @@ -693,6 +694,17 @@ test_introduce1_suitable_circuit(void *arg) tt_int_op(ret, OP_EQ, 0); } + /* Single hop circuit should not be allowed. */ + { + circ = or_circuit_new(0, NULL); + circ->p_chan = tor_malloc_zero(sizeof(channel_t)); + circ->p_chan->is_client = 1; + ret = circuit_is_suitable_for_introduce1(circ); + tor_free(circ->p_chan); + circuit_free_(TO_CIRCUIT(circ)); + tt_int_op(ret, OP_EQ, 0); + } + done: ; } @@ -927,4 +939,3 @@ struct testcase_t hs_intropoint_tests[] = { END_OF_TESTCASES }; -

1 0

[tor/master] Merge branch 'ticket24963_042_02'
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit ab1f82ea2a3ef9f9bc920885e40e7b477b3dfb93 Merge: ab1f39322 df12ff3de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 14:03:30 2019 -0400 Merge branch 'ticket24963_042_02' changes/ticket24963 | 5 +++++ src/feature/hs/hs_intropoint.c | 9 +++++++++ src/test/test_hs_intropoint.c | 13 ++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-)

1 0

[snowflake/master] Make tabs uniform in manifest.json.
by dcf＠torproject.org 23 Jul '19

23 Jul '19

commit f795fb5a3366c80a7ea24c11128366ab39b179f7 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 23 11:06:53 2019 -0600 Make tabs uniform in manifest.json. --- proxy/webext/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 6c41839..71b5eb7 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -14,5 +14,5 @@ "default_title": "Snowflake", "default_popup": "popup.html" }, - "permissions": ["storage"] + "permissions": ["storage"] }

1 0

[snowflake/master] Make the "Turn On/Off" text a label for the slider.
by dcf＠torproject.org 23 Jul '19

23 Jul '19

commit 74d3895ee9ef359e686809e4403cb012fd52041f Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 23 10:51:47 2019 -0600 Make the "Turn On/Off" text a label for the slider. So that you can click on the text as well as the slider. --- proxy/webext/popup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/webext/popup.html b/proxy/webext/popup.html index 2c8943e..e3ba2f5 100644 --- a/proxy/webext/popup.html +++ b/proxy/webext/popup.html @@ -12,7 +12,7 @@ <p></p> </div> <div class="b button"> - <label id="toggle">Turn On</label> + <label id="toggle" for="enabled">Turn On</label> <label class="switch"> <input id="enabled" type="checkbox" checked/> <span class="slider round"></span>

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1185'
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit ab1f39322c22c3801ffd3a7e6842352230fff113 Merge: f6db290e5 aed82bf41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 12:32:14 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1185' changes/bug31112 | 3 +++ src/core/or/circuitpadding_machines.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] Add changes file for #31112 and #31098.
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit aed82bf4109126a3088752d7bec45bab4f5e1537 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 23 11:46:07 2019 +0300 Add changes file for #31112 and #31098. --- changes/bug31112 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug31112 b/changes/bug31112 new file mode 100644 index 000000000..882efaad5 --- /dev/null +++ b/changes/bug31112 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Various simplifications and minor improvements to the circuit padding + machines. Patch by Tobias Pulls. Closes tickets 31112 and 31098.

1 0

[tor/master] remove specified target_hopnum from relay-side machines (only for origin-side machines)
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit 5f95b37f6c76d0f8772cb00db5bc7b7f97d942fa Author: pulls <tobias.pulls(a)kau.se> Date: Mon Jul 8 18:09:14 2019 +0200 remove specified target_hopnum from relay-side machines (only for origin-side machines) --- src/core/or/circuitpadding_machines.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c index 75d2614ac..97828553a 100644 --- a/src/core/or/circuitpadding_machines.c +++ b/src/core/or/circuitpadding_machines.c @@ -155,7 +155,6 @@ circpad_machine_relay_hide_intro_circuits(smartlist_t *machines_sl) relay_machine->name = "relay_ip_circ"; relay_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; - relay_machine->target_hopnum = 2; /* This is a relay-side machine */ relay_machine->is_origin_side = 0; @@ -387,7 +386,6 @@ circpad_machine_relay_hide_rend_circuits(smartlist_t *machines_sl) /* Only pad after the circuit has been built and pad to the middle */ relay_machine->conditions.min_hops = 2; relay_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; - relay_machine->target_hopnum = 2; /* This is a relay-side machine */ relay_machine->is_origin_side = 0;

1 0

[tor/master] transition when we send our first padding packet, not on received
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit fd1f28518903924c4cd1a6494411128672b2689d Author: pulls <tobias.pulls(a)kau.se> Date: Mon Jul 8 15:51:57 2019 +0200 transition when we send our first padding packet, not on received --- src/core/or/circuitpadding_machines.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c index 97828553a..7220d657f 100644 --- a/src/core/or/circuitpadding_machines.c +++ b/src/core/or/circuitpadding_machines.c @@ -406,7 +406,7 @@ circpad_machine_relay_hide_rend_circuits(smartlist_t *machines_sl) /* OBFUSCATE_CIRC_SETUP -> END transition when we send our first * padding packet and/or hit the state length (the state length is 1). */ relay_machine->states[CIRCPAD_STATE_OBFUSCATE_CIRC_SETUP]. - next_state[CIRCPAD_EVENT_PADDING_RECV] = CIRCPAD_STATE_END; + next_state[CIRCPAD_EVENT_PADDING_SENT] = CIRCPAD_STATE_END; relay_machine->states[CIRCPAD_STATE_OBFUSCATE_CIRC_SETUP]. next_state[CIRCPAD_EVENT_LENGTH_COUNT] = CIRCPAD_STATE_END;

1 0

[tor/master] Changes file for #31113.
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit fdfee3d06f05973f54cd7550450096ef2f8b5f55 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 23 12:40:33 2019 +0300 Changes file for #31113. --- changes/bug31113 | 3 +++ scripts/maint/practracker/exceptions.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug31113 b/changes/bug31113 new file mode 100644 index 000000000..f48328f0f --- /dev/null +++ b/changes/bug31113 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Improve documentation in circuit padding subsystem. Patch by Tobias + Pulls. Closes ticket 31113. diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index f28392537..66e9f7a0c 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -87,6 +87,7 @@ problem function-size /src/core/or/circuitlist.c:circuit_about_to_free() 120 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 +problem file-size /src/core/or/circuitpadding.c 3001 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 104 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1186'
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit f6db290e5a7268ebe9dc504af53d50294766ac22 Merge: ef2dd1ba9 fdfee3d06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 12:30:19 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1186' changes/bug31113 | 3 +++ scripts/maint/practracker/exceptions.txt | 1 + src/core/or/circuitpadding.c | 40 +++++++++++++++++++------------- src/core/or/circuitpadding.h | 21 +++++++++-------- 4 files changed, 39 insertions(+), 26 deletions(-)

1 0