tor-commits July 2020

tor-commits@lists.torproject.org

17 participants
2100 discussions

[translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
by translation＠torproject.org 03 Jul '20

03 Jul '20

commit c9b3a6b601fd10712f5e82dab1dc6d2321cb9988 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:15:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 6cfb10a8d6..6d8437a204 100644 --- a/fr.po +++ b/fr.po @@ -41,7 +41,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 18:57+0000\n" +"PO-Revision-Date: 2020-07-03 11:53+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -245,7 +245,7 @@ msgstr "Mettre à niveau maintenant" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:451 msgid "Upgrade later" -msgstr "Mettre à niveau ultérieurement" +msgstr "Mettre à niveau plus tard" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:459 #, perl-brace-format @@ -348,7 +348,7 @@ msgstr "Redémarrer maintenant" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:715 msgid "Restart later" -msgstr "Redémarrer ultérieurement" +msgstr "Redémarrer plus tard" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:726 msgid "Error while restarting the system"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 03 Jul '20

03 Jul '20

commit 419ecf8895fd798ca59132322a9720022cda9a6f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:15:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 6cfb10a8d6..6d8437a204 100644 --- a/fr.po +++ b/fr.po @@ -41,7 +41,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 18:57+0000\n" +"PO-Revision-Date: 2020-07-03 11:53+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -245,7 +245,7 @@ msgstr "Mettre à niveau maintenant" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:451 msgid "Upgrade later" -msgstr "Mettre à niveau ultérieurement" +msgstr "Mettre à niveau plus tard" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:459 #, perl-brace-format @@ -348,7 +348,7 @@ msgstr "Redémarrer maintenant" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:715 msgid "Restart later" -msgstr "Redémarrer ultérieurement" +msgstr "Redémarrer plus tard" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:726 msgid "Error while restarting the system"

1 0

[translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
by translation＠torproject.org 03 Jul '20

03 Jul '20

commit f8d74d93c16f76dcd78001ef1e84f422a6e8a64f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:15:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorpropertie… --- fr/exonerator.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index b497cfeca4..5985a3bf78 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -4,10 +4,10 @@ form.timestamp.label=Date form.search.label=Chercher summary.heading=Résumé summary.serverproblem.dbnoconnect.title=Problème de serveur -summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. +summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer plus tard. Si ce problème perdure, veuillez %s. summary.serverproblem.dbnoconnect.body.link=nous en informer summary.serverproblem.dbempty.title=Problème de serveur -summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. +summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer plus tard. Si ce problème perdure, veuillez %s. summary.serverproblem.dbempty.body.link=nous en informer summary.invalidparams.notimestamp.title=Aucun paramètre de date n’a été donné summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer un paramètre de date. @@ -22,7 +22,7 @@ summary.invalidparams.invalidtimestamp.body=Désolé, %s n’est pas une date va summary.invalidparams.timestamptoorecent.title=Le paramètre de date est trop récent summary.invalidparams.timestamptoorecent.body=La base de données pourrait ne pas encore comprendre suffisamment de données pour répondre correctement à cette requête. Les dernières données acceptées datent d’avant-hier. Veuillez répéter votre recherche dans un jour. summary.serverproblem.nodata.title=Problème de serveur -summary.serverproblem.nodata.body.text=La base de données ne comprend aucune donnée pour la date demandée. Veuillez ressayer ultérieurement. Si le problème perdure, veuillez %s. +summary.serverproblem.nodata.body.text=La base de données ne comprend aucune donnée pour la date demandée. Veuillez ressayer plus tard. Si le problème perdure, veuillez %s. summary.serverproblem.nodata.body.link=nous en informer summary.negativesamenetwork.title=Le résultat est négatif summary.negativesamenetwork.body=Nous n’avons pas trouvé l’adresse IP %s, le %s ou à un jour près. Mais nous avons trouvé d’autres adresses IP de relais Tor dans le même réseau /%d aux alentours de cette date :

1 0

[translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
by translation＠torproject.org 03 Jul '20

03 Jul '20

commit 045f2a9dcef732cc3e5c91005bdb2f9686eb285f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- fr/exonerator.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/exonerator.properties b/fr/exonerator.properties index b497cfeca4..5985a3bf78 100644 --- a/fr/exonerator.properties +++ b/fr/exonerator.properties @@ -4,10 +4,10 @@ form.timestamp.label=Date form.search.label=Chercher summary.heading=Résumé summary.serverproblem.dbnoconnect.title=Problème de serveur -summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. +summary.serverproblem.dbnoconnect.body.text=Impossible de se connecter à la base de données. Veuillez ressayer plus tard. Si ce problème perdure, veuillez %s. summary.serverproblem.dbnoconnect.body.link=nous en informer summary.serverproblem.dbempty.title=Problème de serveur -summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer ultérieurement. Si ce problème perdure, veuillez %s. +summary.serverproblem.dbempty.body.text=La base de données semble être vide. Veuillez ressayer plus tard. Si ce problème perdure, veuillez %s. summary.serverproblem.dbempty.body.link=nous en informer summary.invalidparams.notimestamp.title=Aucun paramètre de date n’a été donné summary.invalidparams.notimestamp.body=Désolé, vous devez aussi indiquer un paramètre de date. @@ -22,7 +22,7 @@ summary.invalidparams.invalidtimestamp.body=Désolé, %s n’est pas une date va summary.invalidparams.timestamptoorecent.title=Le paramètre de date est trop récent summary.invalidparams.timestamptoorecent.body=La base de données pourrait ne pas encore comprendre suffisamment de données pour répondre correctement à cette requête. Les dernières données acceptées datent d’avant-hier. Veuillez répéter votre recherche dans un jour. summary.serverproblem.nodata.title=Problème de serveur -summary.serverproblem.nodata.body.text=La base de données ne comprend aucune donnée pour la date demandée. Veuillez ressayer ultérieurement. Si le problème perdure, veuillez %s. +summary.serverproblem.nodata.body.text=La base de données ne comprend aucune donnée pour la date demandée. Veuillez ressayer plus tard. Si le problème perdure, veuillez %s. summary.serverproblem.nodata.body.link=nous en informer summary.negativesamenetwork.title=Le résultat est négatif summary.negativesamenetwork.body=Nous n’avons pas trouvé l’adresse IP %s, le %s ou à un jour près. Mais nous avons trouvé d’autres adresses IP de relais Tor dans le même réseau /%d aux alentours de cette date :

1 0

[tor/master] Bug 32040: Tests
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit ce9a4e5baffdcd0a5fc2029fc614e71f54872234 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 9 02:33:16 2020 -0500 Bug 32040: Tests --- src/test/test_circuitpadding.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 3e3a59dc9..e8e2e802d 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -1732,9 +1732,9 @@ helper_create_conditional_machines(void) add->conditions.requires_vanguards = 0; add->conditions.min_hops = 2; - add->conditions.state_mask = CIRCPAD_CIRC_BUILDING| + add->conditions.apply_state_mask = CIRCPAD_CIRC_BUILDING| CIRCPAD_CIRC_NO_STREAMS|CIRCPAD_CIRC_HAS_RELAY_EARLY; - add->conditions.purpose_mask = CIRCPAD_PURPOSE_ALL; + add->conditions.apply_purpose_mask = CIRCPAD_PURPOSE_ALL; circpad_register_padding_machine(add, origin_padding_machines); add = helper_create_conditional_machine(); @@ -1751,9 +1751,9 @@ helper_create_conditional_machines(void) add->conditions.requires_vanguards = 1; add->conditions.min_hops = 3; - add->conditions.state_mask = CIRCPAD_CIRC_OPENED| + add->conditions.apply_state_mask = CIRCPAD_CIRC_OPENED| CIRCPAD_CIRC_STREAMS|CIRCPAD_CIRC_HAS_NO_RELAY_EARLY; - add->conditions.purpose_mask = CIRCPAD_PURPOSE_ALL; + add->conditions.apply_purpose_mask = CIRCPAD_PURPOSE_ALL; circpad_register_padding_machine(add, origin_padding_machines); add = helper_create_conditional_machine(); @@ -2727,8 +2727,8 @@ helper_create_ender_machine(void) circ_client_machine.states[CIRCPAD_STATE_START]. next_state[CIRCPAD_EVENT_NONPADDING_RECV] = CIRCPAD_STATE_END; - circ_client_machine.conditions.state_mask = CIRCPAD_STATE_ALL; - circ_client_machine.conditions.purpose_mask = CIRCPAD_PURPOSE_ALL; + circ_client_machine.conditions.apply_state_mask = CIRCPAD_STATE_ALL; + circ_client_machine.conditions.apply_purpose_mask = CIRCPAD_PURPOSE_ALL; } static time_t mocked_timeofday;

1 0

[tor/master] Bug 32040: Machine updates.
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit a4a0cb8d5506e967ea01700dad42bf39d69d27cc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 16 12:23:09 2020 -0500 Bug 32040: Machine updates. Does not require protover update, since this is just client-side. --- src/core/or/circuitpadding_machines.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c index 405af5061..1e6b580f5 100644 --- a/src/core/or/circuitpadding_machines.c +++ b/src/core/or/circuitpadding_machines.c @@ -102,9 +102,18 @@ circpad_machine_client_hide_intro_circuits(smartlist_t *machines_sl) * INTRO_MACHINE_MAXIMUM_PADDING cells, to match the "...(inbound data cells * continue)" portion of the trace (aka the rest of an HTTPS response body). */ + + /* Start the machine on fresh intro circs. */ client_machine->conditions.apply_purpose_mask = - circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT)| - circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_INTRODUCE_ACKED)| + circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT); + + /* If the client purpose changes back to CIRCUIT_PURPOSE_C_INTRODUCING, + * or transitions to CIRCUIT_PURPOSE_C_INTRODUCE_ACKED, keep the machine + * alive, but do not launch new machines for these purposes. Also + * keep the machine around if it is in the CIRCUIT_PADDING purpose + * (but do not try to take over other machines in that purpose). */ + client_machine->conditions.keep_purpose_mask = + circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_INTRODUCE_ACKED) | circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_CIRCUIT_PADDING); /* Keep the circuit alive even after the introduction has been finished,

1 0

[tor/master] Bug 32040: Changes files
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 954421ab7cf7eec4afbecee0a75f8cd661163a79 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 9 02:35:00 2020 -0500 Bug 32040: Changes files Not the whole story; machines still need to use this. --- changes/bug32040 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug32040 b/changes/bug32040 new file mode 100644 index 000000000..1cdc0bec9 --- /dev/null +++ b/changes/bug32040 @@ -0,0 +1,7 @@ + o Minor bugfixes (circuitpadding): + - Add the abilility to keep circuit padding machines if they match a set + of circuit state or purposes. This allows us to have machines that start + up under some conditions but don't shut down under others. We now + use this mask to avoid starting up introduction circuit padding + again after the machines have already completed. Fixes bug 32040; + bugfix on 0.4.1.1-alpha.

1 0

[tor/master] practracker FTL!
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit c047c6d5b85d4935814630c59ee7ce47a01e23cf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 16 13:44:10 2020 -0500 practracker FTL! Faster Than Light! --- scripts/maint/practracker/exceptions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 154f43ee1..352b815be 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -108,10 +108,10 @@ problem dependency-violation /src/core/or/circuitlist.h 1 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 109 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 113 problem dependency-violation /src/core/or/circuitmux_ewma.c 2 -problem file-size /src/core/or/circuitpadding.c 3101 +problem file-size /src/core/or/circuitpadding.c 3183 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 problem dependency-violation /src/core/or/circuitpadding.c 6 -problem file-size /src/core/or/circuitpadding.h 813 +problem file-size /src/core/or/circuitpadding.h 832 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 103 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112 problem dependency-violation /src/core/or/circuitpadding_machines.c 1

1 0

[tor/master] Bug 32040: Add a keep_*_mask to keep circpad machines
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit f697ac58610a74c1cbffd16b39e8e90d1592290f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 9 02:36:45 2020 -0500 Bug 32040: Add a keep_*_mask to keep circpad machines Allows us to program machines that stay around after creation if circuit state or purpose changes. --- src/core/or/circuitpadding.c | 39 ++++++++++++++++++++++++++++------- src/core/or/circuitpadding.h | 14 +++++++++++-- src/core/or/circuitpadding_machines.c | 12 +++++------ 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index b958fec4f..889ffb03f 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -2008,7 +2008,7 @@ circpad_internal_event_state_length_up(circpad_machine_runtime_t *mi) * Returns true if the circuit matches the conditions. */ static inline bool -circpad_machine_conditions_met(origin_circuit_t *circ, +circpad_machine_conditions_apply(origin_circuit_t *circ, const circpad_machine_spec_t *machine) { /* If padding is disabled, no machines should match/apply. This has @@ -2025,7 +2025,7 @@ circpad_machine_conditions_met(origin_circuit_t *circ, } if (!(circpad_circ_purpose_to_mask(TO_CIRCUIT(circ)->purpose) - & machine->conditions.purpose_mask)) + & machine->conditions.apply_purpose_mask)) return 0; if (machine->conditions.requires_vanguards) { @@ -2041,7 +2041,7 @@ circpad_machine_conditions_met(origin_circuit_t *circ, * "I want to apply to circuits with either streams or no streams"; OR * "I only want to apply to circuits with streams"; OR * "I only want to apply to circuits without streams". */ - if (!(circpad_circuit_state(circ) & machine->conditions.state_mask)) + if (!(circpad_circuit_state(circ) & machine->conditions.apply_state_mask)) return 0; if (circuit_get_cpath_opened_len(circ) < machine->conditions.min_hops) @@ -2050,6 +2050,26 @@ circpad_machine_conditions_met(origin_circuit_t *circ, return 1; } +/** + * Check to see if any of the keep conditions still apply to this circuit. + * + * These conditions keep the machines active if they match, but do not + * cause new machines to start up. + */ +static inline bool +circpad_machine_conditions_keep(origin_circuit_t *circ, + const circpad_machine_spec_t *machine) +{ + if ((circpad_circ_purpose_to_mask(TO_CIRCUIT(circ)->purpose) + & machine->conditions.keep_purpose_mask)) + return 1; + + if ((circpad_circuit_state(circ) & machine->conditions.keep_state_mask)) + return 1; + + return 0; +} + /** * Returns a minimized representation of the circuit state. * @@ -2115,7 +2135,12 @@ circpad_shutdown_old_machines(origin_circuit_t *on_circ) circuit_t *circ = TO_CIRCUIT(on_circ); FOR_EACH_ACTIVE_CIRCUIT_MACHINE_BEGIN(i, circ) { - if (!circpad_machine_conditions_met(on_circ, + /* We shut down a machine if neither the apply conditions + * nor the keep conditions match. If either set of conditions match, + * keep it around. */ + if (!circpad_machine_conditions_apply(on_circ, + circ->padding_machine[i]) && + !circpad_machine_conditions_keep(on_circ, circ->padding_machine[i])) { uint32_t machine_ctr = circ->padding_info[i]->machine_ctr; // Clear machineinfo (frees timers) @@ -2174,7 +2199,7 @@ circpad_add_matching_machines(origin_circuit_t *on_circ, * machines installed on a circuit. Make sure we only * add this machine if its target machine index is free. */ if (machine->machine_index == i && - circpad_machine_conditions_met(on_circ, machine)) { + circpad_machine_conditions_apply(on_circ, machine)) { // We can only replace this machine if the target hopnum // is the same, otherwise we'll get invalid data @@ -2587,9 +2612,9 @@ circpad_circ_client_machine_init(void) = tor_malloc_zero(sizeof(circpad_machine_spec_t)); circ_client_machine->conditions.min_hops = 2; - circ_client_machine->conditions.state_mask = + circ_client_machine->conditions.apply_state_mask = CIRCPAD_CIRC_BUILDING|CIRCPAD_CIRC_OPENED|CIRCPAD_CIRC_HAS_RELAY_EARLY; - circ_client_machine->conditions.purpose_mask = CIRCPAD_PURPOSE_ALL; + circ_client_machine->conditions.apply_purpose_mask = CIRCPAD_PURPOSE_ALL; circ_client_machine->conditions.reduced_padding_ok = 1; circ_client_machine->target_hopnum = 2; diff --git a/src/core/or/circuitpadding.h b/src/core/or/circuitpadding.h index 4fadcb742..3d2929cf7 100644 --- a/src/core/or/circuitpadding.h +++ b/src/core/or/circuitpadding.h @@ -173,11 +173,21 @@ typedef struct circpad_machine_conditions_t { /** Only apply the machine *if* the circuit's state matches any of * the bits set in this bitmask. */ - circpad_circuit_state_t state_mask; + circpad_circuit_state_t apply_state_mask; /** Only apply a machine *if* the circuit's purpose matches one * of the bits set in this bitmask */ - circpad_purpose_mask_t purpose_mask; + circpad_purpose_mask_t apply_purpose_mask; + + /** Keep a machine if any of the circuits's state machine's match + * the bits set in this bitmask, but don't apply new machines if + * they match this mask. */ + circpad_circuit_state_t keep_state_mask; + + /** Keep a machine if any of the circuits's state machine's match + * the bits set in this bitmask, but don't apply new machines if + * they match this mask. */ + circpad_purpose_mask_t keep_purpose_mask; } circpad_machine_conditions_t; diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c index 98767f9e8..405af5061 100644 --- a/src/core/or/circuitpadding_machines.c +++ b/src/core/or/circuitpadding_machines.c @@ -67,7 +67,7 @@ circpad_machine_client_hide_intro_circuits(smartlist_t *machines_sl) client_machine->name = "client_ip_circ"; - client_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; + client_machine->conditions.apply_state_mask = CIRCPAD_CIRC_OPENED; client_machine->target_hopnum = 2; /* This is a client machine */ @@ -102,7 +102,7 @@ circpad_machine_client_hide_intro_circuits(smartlist_t *machines_sl) * INTRO_MACHINE_MAXIMUM_PADDING cells, to match the "...(inbound data cells * continue)" portion of the trace (aka the rest of an HTTPS response body). */ - client_machine->conditions.purpose_mask = + client_machine->conditions.apply_purpose_mask = circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT)| circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_INTRODUCE_ACKED)| circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_CIRCUIT_PADDING); @@ -152,7 +152,7 @@ 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->conditions.apply_state_mask = CIRCPAD_CIRC_OPENED; /* This is a relay-side machine */ relay_machine->is_origin_side = 0; @@ -263,7 +263,7 @@ circpad_machine_client_hide_rend_circuits(smartlist_t *machines_sl) client_machine->name = "client_rp_circ"; /* Only pad after the circuit has been built and pad to the middle */ - client_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; + client_machine->conditions.apply_state_mask = CIRCPAD_CIRC_OPENED; client_machine->target_hopnum = 2; /* This is a client machine */ @@ -299,7 +299,7 @@ circpad_machine_client_hide_rend_circuits(smartlist_t *machines_sl) * * Hence this way we make rendezvous circuits look like general circuits up * till the end of the circuit setup. */ - client_machine->conditions.purpose_mask = + client_machine->conditions.apply_purpose_mask = circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_REND_JOINED)| circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_REND_READY)| circpad_circ_purpose_to_mask(CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED); @@ -383,7 +383,7 @@ 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->conditions.apply_state_mask = CIRCPAD_CIRC_OPENED; /* This is a relay-side machine */ relay_machine->is_origin_side = 0;

1 0

[tor/master] Merge branch 'tor-github/pr/1934'
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 3bb9b7e743c5463e4516cdd53a02c319dc825290 Merge: a73049d1a c047c6d5b Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 10:50:47 2020 +0300 Merge branch 'tor-github/pr/1934' changes/bug32040 | 7 ++++++ scripts/maint/practracker/exceptions.txt | 4 ++-- src/core/or/circuitpadding.c | 39 ++++++++++++++++++++++++++------ src/core/or/circuitpadding.h | 14 ++++++++++-- src/core/or/circuitpadding_machines.c | 25 +++++++++++++------- src/test/test_circuitpadding.c | 12 +++++----- 6 files changed, 76 insertions(+), 25 deletions(-)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2020