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

[tor/maint-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/maint-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/maint-0.3.2] Fix the clz32 and clz64 settings on MSVC.
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit accd0ea65bb817ad8f2361c5ca06c40ac9a9a11f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 09:34:25 2017 -0500 Fix the clz32 and clz64 settings on MSVC. Fixes bug 24633; bugfix on 0.2.9.1-alpha. --- changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug24633 b/changes/bug24633 new file mode 100644 index 000000000..028c7cc14 --- /dev/null +++ b/changes/bug24633 @@ -0,0 +1,5 @@ + o Minor bugfixes (portability, msvc): + - Fix a bug in the bit-counting parts of our timing-wheel code on + MSVC. (Note that MSVC is still not a supported build platform, + due to cyptographic timing channel risks.) Fixes bug 24633; + bugfix on 0.2.9.1-alpha. diff --git a/src/ext/timeouts/timeout-bitops.c b/src/ext/timeouts/timeout-bitops.c index a018f33b9..45466f6cb 100644 --- a/src/ext/timeouts/timeout-bitops.c +++ b/src/ext/timeouts/timeout-bitops.c @@ -40,7 +40,7 @@ static __inline int clz32(unsigned long val) { DWORD zeros = 0; _BitScanReverse(&zeros, val); - return zeros; + return 31 - zeros; } #ifdef _WIN64 /* According to the documentation, these only exist on Win64. */ @@ -54,7 +54,7 @@ static __inline int clz64(uint64_t val) { DWORD zeros = 0; _BitScanReverse64(&zeros, val); - return zeros; + return 63 - zeros; } #else static __inline int ctz64(uint64_t val)

1 0

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

03 Jan '18

commit bbc9ff160e7071b7a2fa9ab200b6496580975b06 Merge: 8a7767603 c9b3f6352 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 08:59:59 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

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

03 Jan '18

commit c9b3f6352f68a03b5380db0e459a8cd6407c5603 Merge: 6e5e4f92a accd0ea65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 08:59:52 2018 -0500 Merge branch 'bug24633_029' into maint-0.2.9 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 03 Jan '18

03 Jan '18

commit bbc9ff160e7071b7a2fa9ab200b6496580975b06 Merge: 8a7767603 c9b3f6352 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 08:59:59 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

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

03 Jan '18

commit c1d98c75e305eaf63e81903ca5a4eb68dcae515b Merge: fb5877b97 bbc9ff160 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 08:59:59 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

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

03 Jan '18

commit bbc9ff160e7071b7a2fa9ab200b6496580975b06 Merge: 8a7767603 c9b3f6352 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 08:59:59 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

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

03 Jan '18

commit b62b40a572d8693daa5851eee5f423007535b3b6 Merge: bd9739bae 451c852a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 09:00:00 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

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

03 Jan '18

commit c1d98c75e305eaf63e81903ca5a4eb68dcae515b Merge: fb5877b97 bbc9ff160 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 3 08:59:59 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24633 | 5 +++++ src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0