January 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'pastly2/ticket24531_033_01'
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit 943134e886d9cef2be6efa861578f45f1ef2542e Merge: b56ce79e6 d4c7bd98a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 11:56:35 2018 -0500 Merge remote-tracking branch 'pastly2/ticket24531_033_01' changes/ticket24531 | 3 ++ src/or/scheduler.c | 72 +++++++++++++++++++++++++--------------------- src/or/scheduler.h | 3 ++ src/or/scheduler_kist.c | 24 ++++++---------- src/or/scheduler_vanilla.c | 32 ++++----------------- 5 files changed, 61 insertions(+), 73 deletions(-)

1 0

[tor/master] In networkstatus_consensus_has_ipv6 test, use approx_time()
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit b56ce79e6310d779762478410831a594a135c0bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 10:57:44 2018 -0500 In networkstatus_consensus_has_ipv6 test, use approx_time() This may (or may not) fix up some reliability issues we've been seeing with this test on windows. --- src/test/test_dir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6092a5a4d..f2223ee17 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -6256,13 +6256,13 @@ test_dir_networkstatus_consensus_has_ipv6(void *arg) MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS; /* Reasonably live */ - mock_networkstatus->valid_until = time(NULL) - 60; + mock_networkstatus->valid_until = approx_time() - 60; has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); tt_assert(has_ipv6); /* Not reasonably live */ - mock_networkstatus->valid_after = time(NULL) - 24*60*60 - 3600; - mock_networkstatus->valid_until = time(NULL) - 24*60*60 - 60; + mock_networkstatus->valid_after = approx_time() - 24*60*60 - 3600; + mock_networkstatus->valid_until = approx_time() - 24*60*60 - 60; has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); tt_assert(!has_ipv6); @@ -6343,7 +6343,7 @@ struct testcase_t dir_tests[] = { DIR(assumed_flags, 0), DIR(networkstatus_compute_bw_weights_v10, 0), DIR(platform_str, 0), - DIR(networkstatus_consensus_has_ipv6, 0), + DIR(networkstatus_consensus_has_ipv6, TT_FORK), END_OF_TESTCASES };

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 03 Jan '18

03 Jan '18

commit 65e9645fda70e8f88c977d60152cd620494496c8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 3 15:45:50 2018 +0000 Update translations for https_everywhere_completed --- es/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 337692a15..9f8223632 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -11,8 +11,8 @@ <!ENTITY https-everywhere.menu.showCounter "Mostrar contador"> <!ENTITY https-everywhere.menu.viewAllRules "Ver todas las reglas"> -<!ENTITY https-everywhere.options.generalSettings "Opciones generales"> -<!ENTITY https-everywhere.options.importSettings "Importar configuración"> +<!ENTITY https-everywhere.options.generalSettings "Configuración general"> +<!ENTITY https-everywhere.options.importSettings "Importar configuraciones"> <!ENTITY https-everywhere.options.import "Importar"> <!ENTITY https-everywhere.options.imported "Se ha importado tu configuración">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Jan '18

03 Jan '18

commit 75f7b1cda38683bea233626e7ce27c5d7ba86c86 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 3 15:45:39 2018 +0000 Update translations for https_everywhere --- es/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 337692a15..9f8223632 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -11,8 +11,8 @@ <!ENTITY https-everywhere.menu.showCounter "Mostrar contador"> <!ENTITY https-everywhere.menu.viewAllRules "Ver todas las reglas"> -<!ENTITY https-everywhere.options.generalSettings "Opciones generales"> -<!ENTITY https-everywhere.options.importSettings "Importar configuración"> +<!ENTITY https-everywhere.options.generalSettings "Configuración general"> +<!ENTITY https-everywhere.options.importSettings "Importar configuraciones"> <!ENTITY https-everywhere.options.import "Importar"> <!ENTITY https-everywhere.options.imported "Se ha importado tu configuración">

1 0

[tor/release-0.3.2] Merge branch 'bug24634' into maint-0.3.2
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit 9ef97a268b06fed7b07908823600911a2a6eadc1 Merge: 451c852a0 1bc95633f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 10:08:36 2018 -0500 Merge branch 'bug24634' into maint-0.3.2 changes/bug24634 | 3 +++ src/or/hs_common.c | 14 +++++++------- src/or/hs_service.c | 12 ++++++------ src/test/test_hs_common.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-)

1 0

[tor/release-0.3.2] Fix some shadowed-global warnings.
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit 1bc95633fbd9c27db87d81593242e85d08afe116 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 09:13:00 2018 -0500 Fix some shadowed-global warnings. These are all about local variables shadowing global functions. That isn't normally a problem, but at least one compiler we care about seems to treat this as a case of -Wshadow violation, so let's fix it. Fixes bug 24634; bugfix on 0.3.2.1-alpha. --- changes/bug24634 | 3 +++ src/or/hs_common.c | 14 +++++++------- src/or/hs_service.c | 12 ++++++------ src/test/test_hs_common.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/changes/bug24634 b/changes/bug24634 new file mode 100644 index 000000000..ac82b94fb --- /dev/null +++ b/changes/bug24634 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Resolve a few shadowed-variable warnings in the onion service code. + Fixes bug 24634; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index ad783a36f..a5cfaf03a 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -984,18 +984,18 @@ hs_build_address(const ed25519_public_key_t *key, uint8_t version, link_specifier_t * hs_link_specifier_dup(const link_specifier_t *lspec) { - link_specifier_t *dup = link_specifier_new(); - memcpy(dup, lspec, sizeof(*dup)); + link_specifier_t *result = link_specifier_new(); + memcpy(result, lspec, sizeof(*result)); /* The unrecognized field is a dynamic array so make sure to copy its * content and not the pointer. */ link_specifier_setlen_un_unrecognized( - dup, link_specifier_getlen_un_unrecognized(lspec)); - if (link_specifier_getlen_un_unrecognized(dup)) { - memcpy(link_specifier_getarray_un_unrecognized(dup), + result, link_specifier_getlen_un_unrecognized(lspec)); + if (link_specifier_getlen_un_unrecognized(result)) { + memcpy(link_specifier_getarray_un_unrecognized(result), link_specifier_getconstarray_un_unrecognized(lspec), - link_specifier_getlen_un_unrecognized(dup)); + link_specifier_getlen_un_unrecognized(result)); } - return dup; + return result; } /* From a given ed25519 public key pk and an optional secret, compute a diff --git a/src/or/hs_service.c b/src/or/hs_service.c index dd836bf84..45810c5c5 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1190,9 +1190,9 @@ setup_desc_intro_point(const ed25519_keypair_t *signing_kp, /* Copy link specifier(s). */ SMARTLIST_FOREACH_BEGIN(ip->base.link_specifiers, const hs_desc_link_specifier_t *, ls) { - hs_desc_link_specifier_t *dup = tor_malloc_zero(sizeof(*dup)); - link_specifier_copy(dup, ls); - smartlist_add(desc_ip->link_specifiers, dup); + hs_desc_link_specifier_t *copy = tor_malloc_zero(sizeof(*copy)); + link_specifier_copy(copy, ls); + smartlist_add(desc_ip->link_specifiers, copy); } SMARTLIST_FOREACH_END(ls); /* For a legacy intro point, we'll use an RSA/ed cross certificate. */ @@ -2276,15 +2276,15 @@ upload_descriptor_to_hsdir(const hs_service_t *service, /* Logging so we know where it was sent. */ { int is_next_desc = (service->desc_next == desc); - const uint8_t *index = (is_next_desc) ? hsdir->hsdir_index->store_second: - hsdir->hsdir_index->store_first; + const uint8_t *idx = (is_next_desc) ? hsdir->hsdir_index->store_second: + hsdir->hsdir_index->store_first; log_info(LD_REND, "Service %s %s descriptor of revision %" PRIu64 " initiated upload request to %s with index %s", safe_str_client(service->onion_address), (is_next_desc) ? "next" : "current", desc->desc->plaintext_data.revision_counter, safe_str_client(node_describe(hsdir)), - safe_str_client(hex_str((const char *) index, 32))); + safe_str_client(hex_str((const char *) idx, 32))); } /* XXX: Inform control port of the upload event (#20699). */ diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b9b76d15b..21daa58ab 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -971,12 +971,12 @@ helper_init_service(time_t now) /* Helper function to set the RFC 1123 time string into t. */ static void -set_consensus_times(const char *time, time_t *t) +set_consensus_times(const char *timestr, time_t *t) { - tt_assert(time); + tt_assert(timestr); tt_assert(t); - int ret = parse_rfc1123_time(time, t); + int ret = parse_rfc1123_time(timestr, t); tt_int_op(ret, OP_EQ, 0); done:

1 0

[tor/master] Merge branch 'bug24634' into maint-0.3.2
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit 9ef97a268b06fed7b07908823600911a2a6eadc1 Merge: 451c852a0 1bc95633f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 10:08:36 2018 -0500 Merge branch 'bug24634' into maint-0.3.2 changes/bug24634 | 3 +++ src/or/hs_common.c | 14 +++++++------- src/or/hs_service.c | 12 ++++++------ src/test/test_hs_common.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-)

1 0

[tor/master] Fix some shadowed-global warnings.
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit 1bc95633fbd9c27db87d81593242e85d08afe116 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 09:13:00 2018 -0500 Fix some shadowed-global warnings. These are all about local variables shadowing global functions. That isn't normally a problem, but at least one compiler we care about seems to treat this as a case of -Wshadow violation, so let's fix it. Fixes bug 24634; bugfix on 0.3.2.1-alpha. --- changes/bug24634 | 3 +++ src/or/hs_common.c | 14 +++++++------- src/or/hs_service.c | 12 ++++++------ src/test/test_hs_common.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/changes/bug24634 b/changes/bug24634 new file mode 100644 index 000000000..ac82b94fb --- /dev/null +++ b/changes/bug24634 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Resolve a few shadowed-variable warnings in the onion service code. + Fixes bug 24634; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_common.c b/src/or/hs_common.c index ad783a36f..a5cfaf03a 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -984,18 +984,18 @@ hs_build_address(const ed25519_public_key_t *key, uint8_t version, link_specifier_t * hs_link_specifier_dup(const link_specifier_t *lspec) { - link_specifier_t *dup = link_specifier_new(); - memcpy(dup, lspec, sizeof(*dup)); + link_specifier_t *result = link_specifier_new(); + memcpy(result, lspec, sizeof(*result)); /* The unrecognized field is a dynamic array so make sure to copy its * content and not the pointer. */ link_specifier_setlen_un_unrecognized( - dup, link_specifier_getlen_un_unrecognized(lspec)); - if (link_specifier_getlen_un_unrecognized(dup)) { - memcpy(link_specifier_getarray_un_unrecognized(dup), + result, link_specifier_getlen_un_unrecognized(lspec)); + if (link_specifier_getlen_un_unrecognized(result)) { + memcpy(link_specifier_getarray_un_unrecognized(result), link_specifier_getconstarray_un_unrecognized(lspec), - link_specifier_getlen_un_unrecognized(dup)); + link_specifier_getlen_un_unrecognized(result)); } - return dup; + return result; } /* From a given ed25519 public key pk and an optional secret, compute a diff --git a/src/or/hs_service.c b/src/or/hs_service.c index dd836bf84..45810c5c5 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1190,9 +1190,9 @@ setup_desc_intro_point(const ed25519_keypair_t *signing_kp, /* Copy link specifier(s). */ SMARTLIST_FOREACH_BEGIN(ip->base.link_specifiers, const hs_desc_link_specifier_t *, ls) { - hs_desc_link_specifier_t *dup = tor_malloc_zero(sizeof(*dup)); - link_specifier_copy(dup, ls); - smartlist_add(desc_ip->link_specifiers, dup); + hs_desc_link_specifier_t *copy = tor_malloc_zero(sizeof(*copy)); + link_specifier_copy(copy, ls); + smartlist_add(desc_ip->link_specifiers, copy); } SMARTLIST_FOREACH_END(ls); /* For a legacy intro point, we'll use an RSA/ed cross certificate. */ @@ -2276,15 +2276,15 @@ upload_descriptor_to_hsdir(const hs_service_t *service, /* Logging so we know where it was sent. */ { int is_next_desc = (service->desc_next == desc); - const uint8_t *index = (is_next_desc) ? hsdir->hsdir_index->store_second: - hsdir->hsdir_index->store_first; + const uint8_t *idx = (is_next_desc) ? hsdir->hsdir_index->store_second: + hsdir->hsdir_index->store_first; log_info(LD_REND, "Service %s %s descriptor of revision %" PRIu64 " initiated upload request to %s with index %s", safe_str_client(service->onion_address), (is_next_desc) ? "next" : "current", desc->desc->plaintext_data.revision_counter, safe_str_client(node_describe(hsdir)), - safe_str_client(hex_str((const char *) index, 32))); + safe_str_client(hex_str((const char *) idx, 32))); } /* XXX: Inform control port of the upload event (#20699). */ diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b9b76d15b..21daa58ab 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -971,12 +971,12 @@ helper_init_service(time_t now) /* Helper function to set the RFC 1123 time string into t. */ static void -set_consensus_times(const char *time, time_t *t) +set_consensus_times(const char *timestr, time_t *t) { - tt_assert(time); + tt_assert(timestr); tt_assert(t); - int ret = parse_rfc1123_time(time, t); + int ret = parse_rfc1123_time(timestr, t); tt_int_op(ret, OP_EQ, 0); done:

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit 6b3c07648ce5860f5ef0f4193eb812e971c02407 Merge: b62b40a57 9ef97a268 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 10:09:20 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24634 | 3 +++ src/or/hs_common.c | 14 +++++++------- src/or/hs_service.c | 14 +++++++------- src/test/test_hs_common.c | 6 +++--- 4 files changed, 20 insertions(+), 17 deletions(-) diff --cc src/or/hs_service.c index 80f3e5020,45810c5c5..0db22991c --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@@ -2265,13 -2284,10 +2265,13 @@@ upload_descriptor_to_hsdir(const hs_ser (is_next_desc) ? "next" : "current", desc->desc->plaintext_data.revision_counter, safe_str_client(node_describe(hsdir)), - safe_str_client(hex_str((const char *) index, 32))); + safe_str_client(hex_str((const char *) idx, 32))); + + /* Fire a UPLOAD control port event. */ + hs_control_desc_event_upload(service->onion_address, hsdir->identity, - &desc->blinded_kp.pubkey, index); ++ &desc->blinded_kp.pubkey, idx); } - /* XXX: Inform control port of the upload event (#20699). */ end: tor_free(encoded_desc); return;

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit c7c043d2b6f42893c220dbb2fd1991f4a34683b6 Merge: 1a070767d 9ef97a268 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 10:08:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24634 | 3 +++ src/or/hs_common.c | 14 +++++++------- src/or/hs_service.c | 12 ++++++------ src/test/test_hs_common.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-)

1 0