tor-commits April 2020

tor-commits@lists.torproject.org

25 participants
2156 discussions

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 01 Apr '20

01 Apr '20

commit 10ef1e8c3af8941bbe04ed78e99c7b7e3ae99a76 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 15:23:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+fa.po b/contents+fa.po index 4d00b8a28b..896c1411f8 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -150,7 +150,7 @@ msgstr "سوالات متداول سو استفاده" #: https//… [View More]

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.7
by sysrqb＠torproject.org 01 Apr '20

01 Apr '20

commit 2d4f7b9537650ce2176daffe4b912cbd77f7e1f3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 1 14:59:19 2020 +0000 Fold in stable changelog for 9.0.7 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2c95450..b5ec5ab 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/… [View More]

1 0

[tor-browser-build/master] Bump https-everywhere version
by sysrqb＠torproject.org 01 Apr '20

01 Apr '20

commit 3e71b0dfc3250b55ee2d09c0b3c861b222afcba9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 1 15:01:50 2020 +0000 Bump https-everywhere version --- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index c66d7fe..7e5aa51 100644 --- a/projects/https-everywhere/… [View More]

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by teor＠torproject.org 01 Apr '20

01 Apr '20

commit aa94f81add50f4afb6028d5b0c9a95950d95e252 Merge: 7d6e9d7d9 6c5c503a4 Author: teor <teor(a)torproject.org> Date: Wed Apr 1 23:03:47 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33646 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] configure: Fix enabled module variable expansion
by teor＠torproject.org 01 Apr '20

01 Apr '20

commit 6c5c503a4ca892380a7ad26b8355faae6680bd47 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 31 08:21:12 2020 -0400 configure: Fix enabled module variable expansion Fixes #33646 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33646 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket33646 b/changes/ticket33646 new file mode 100644 index 000000000..… [View More]

1 0

[tor/maint-0.4.3] configure: Fix enabled module variable expansion
by teor＠torproject.org 01 Apr '20

01 Apr '20

1 0

[tor/master] Merge branch 'maint-0.4.3'
by teor＠torproject.org 01 Apr '20

01 Apr '20

commit a8a92b94568bac8efee1f3d736569226ac82fced Merge: b5412d12f 6c5c503a4 Author: teor <teor(a)torproject.org> Date: Wed Apr 1 23:03:51 2020 +1000 Merge branch 'maint-0.4.3' changes/ticket33646 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] configure: Fix enabled module variable expansion
by teor＠torproject.org 01 Apr '20

01 Apr '20

1 0

[tor/master] Merge branch 'tor-github/pr/1844'
by dgoulet＠torproject.org 01 Apr '20

01 Apr '20

commit b5412d12f9eb4ef7ad5265ac441cd63b3f100ef3 Merge: ca8e6451f 8fda94f94 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 1 08:22:36 2020 -0400 Merge branch 'tor-github/pr/1844' src/feature/hs/hs_circuit.c | 6 +++--- src/feature/hs/hs_ob.c | 8 ++++---- src/feature/hs/hs_service.c | 14 +++++++++++--- src/feature/hs/hs_service.h | 16 ++++++++-------- src/test/test_hs_service.c | 2 +- 5 files changed, 27 insertions(+), 19 deletions(-)

1 0

[tor/master] hs-v3: Move ob_subcreds to hs_service_state_t.
by dgoulet＠torproject.org 01 Apr '20

01 Apr '20

commit 8fda94f944f00f6f436604038ce135ab70f4feb4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 30 23:24:33 2020 +0300 hs-v3: Move ob_subcreds to hs_service_state_t. It's more natural there since it's runtime state. --- src/feature/hs/hs_circuit.c | 6 +++--- src/feature/hs/hs_ob.c | 8 ++++---- src/feature/hs/hs_service.c | 12 ++++++------ src/feature/hs/hs_service.h | 16 ++++++++-------- src/test/test_hs_service.c | 2 +- 5 files changed, 22 … [View More]insertions(+), 22 deletions(-) diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c index fdd226ba7..dc13c7045 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -984,13 +984,13 @@ get_subcredential_for_handling_intro2_cell(const hs_service_t *service, /* This should not happen since we should have made onionbalance * subcredentials when we created our descriptors. */ - if (BUG(!service->ob_subcreds)) { + if (BUG(!service->state.ob_subcreds)) { return -1; } /* We are an onionbalance instance: */ - data->n_subcredentials = service->n_ob_subcreds; - data->subcredentials = service->ob_subcreds; + data->n_subcredentials = service->state.n_ob_subcreds; + data->subcredentials = service->state.ob_subcreds; return 0; } diff --git a/src/feature/hs/hs_ob.c b/src/feature/hs/hs_ob.c index f135ecd3f..a6a5cec26 100644 --- a/src/feature/hs/hs_ob.c +++ b/src/feature/hs/hs_ob.c @@ -392,12 +392,12 @@ hs_ob_refresh_keys(hs_service_t *service) } /* Delete old subcredentials if any */ - if (service->ob_subcreds) { - tor_free(service->ob_subcreds); + if (service->state.ob_subcreds) { + tor_free(service->state.ob_subcreds); } - service->ob_subcreds = ob_subcreds; - service->n_ob_subcreds = num_subcreds; + service->state.ob_subcreds = ob_subcreds; + service->state.n_ob_subcreds = num_subcreds; } /** Free any memory allocated by the onionblance subsystem. */ diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 367f8ca2b..ed4d1af14 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -896,11 +896,11 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) dst->next_rotation_time = src->next_rotation_time; - if (src_service->ob_subcreds) { - dst_service->ob_subcreds = src_service->ob_subcreds; - dst_service->n_ob_subcreds = src_service->n_ob_subcreds; + if (src->ob_subcreds) { + dst->ob_subcreds = src->ob_subcreds; + dst->n_ob_subcreds = src->n_ob_subcreds; - src_service->ob_subcreds = NULL; /* steal pointer reference */ + src->ob_subcreds = NULL; /* steal pointer reference */ } } @@ -4162,8 +4162,8 @@ hs_service_free_(hs_service_t *service) } /* Free onionbalance subcredentials (if any) */ - if (service->ob_subcreds) { - tor_free(service->ob_subcreds); + if (service->state.ob_subcreds) { + tor_free(service->state.ob_subcreds); } /* Wipe service keys. */ diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 3fe14878e..0f6a2c235 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -279,6 +279,14 @@ typedef struct hs_service_state_t { /** When is the next time we should rotate our descriptors. This is has to be * done at the start time of the next SRV protocol run. */ time_t next_rotation_time; + + /* If this is an onionbalance instance, this is an array of subcredentials + * that should be used when decrypting an INTRO2 cell. If this is not an + * onionbalance instance, this is NULL. + * See [ONIONBALANCE] section in rend-spec-v3.txt for more details . */ + hs_subcredential_t *ob_subcreds; + /* Number of OB subcredentials */ + size_t n_ob_subcreds; } hs_service_state_t; /** Representation of a service running on this tor instance. */ @@ -304,14 +312,6 @@ typedef struct hs_service_t { hs_service_descriptor_t *desc_current; /** Next descriptor. */ hs_service_descriptor_t *desc_next; - - /* If this is an onionbalance instance, this is an array of subcredentials - * that should be used when decrypting an INTRO2 cell. If this is not an - * onionbalance instance, this is NULL. - * See [ONIONBALANCE] section in rend-spec-v3.txt for more details . */ - hs_subcredential_t *ob_subcreds; - /* Number of OB subcredentials */ - size_t n_ob_subcreds; } hs_service_t; /** For the service global hash map, we define a specific type for it which diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 9966bd108..80383baff 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -2520,7 +2520,7 @@ test_intro2_handling(void *arg) /* Start cleaning up X */ replaycache_free(x_service.state.replay_cache_rend_cookie); smartlist_free(x_service.config.ob_master_pubkeys); - tor_free(x_service.ob_subcreds); + tor_free(x_service.state.ob_subcreds); service_descriptor_free(x_service.desc_current); service_descriptor_free(x_service.desc_next); service_intro_point_free(x_ip); [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2020