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

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

02 Jan '18

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

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

02 Jan '18

commit 707076002d4db2b8b2e6f05bea86316674bf9f45 Merge: 94c59851d fb5877b97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Conditional check added
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 5865e56ec083bbccd46bf71a9343b3744f0c4ecc Author: ArunaMaurya221B <aruna.maurya12(a)gmail.com> Date: Fri Dec 22 16:15:42 2017 +0530 Conditional check added --- src/or/nodelist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index e6eaefb21..042074998 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -916,9 +916,12 @@ node_get_ed25519_id(const node_t *node) } } +/* Checking whether microdesc_ed25519() is all zero*/ if (node->md) { if (node->md->ed25519_identity_pkey) { md_pk = node->md->ed25519_identity_pkey; + if (BUG(ed25519_public_key_is_zero(md_pk))) + md_pk = NULL; } }

1 0

[tor/master] Expand comments in node_get_ed25519_id() and put them near the relevant code
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 53f350182e60b32791b23ea98368a41037bffd0d Author: teor <teor2345(a)gmail.com> Date: Sun Dec 24 19:47:42 2017 +1100 Expand comments in node_get_ed25519_id() and put them near the relevant code And add a changes file. Follow-up to 24001. --- changes/ticket24001 | 4 ++++ src/or/nodelist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket24001 b/changes/ticket24001 new file mode 100644 index 000000000..4701a38ed --- /dev/null +++ b/changes/ticket24001 @@ -0,0 +1,4 @@ + o Minor features (code correctness, descriptors): + - Check that microdesc ed25519 ids are non-zero in node_get_ed25519_id(), + before returning them. + Implements 24001, patch by "aruna1234". diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 042074998..4eafe6d7a 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -908,18 +908,22 @@ node_get_ed25519_id(const node_t *node) { const ed25519_public_key_t *ri_pk = NULL; const ed25519_public_key_t *md_pk = NULL; + if (node->ri) { if (node->ri->cache_info.signing_key_cert) { ri_pk = &node->ri->cache_info.signing_key_cert->signing_key; + /* Checking whether routerinfo ed25519 is all zero. + * Our descriptor parser should make sure this never happens. */ if (BUG(ed25519_public_key_is_zero(ri_pk))) ri_pk = NULL; } } -/* Checking whether microdesc_ed25519() is all zero*/ if (node->md) { if (node->md->ed25519_identity_pkey) { md_pk = node->md->ed25519_identity_pkey; + /* Checking whether microdesc ed25519 is all zero. + * Our descriptor parser should make sure this never happens. */ if (BUG(ed25519_public_key_is_zero(md_pk))) md_pk = NULL; }

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket24001'
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit d53f779853ee112ca152198f7695ac3b940719ae Merge: 996328f37 53f350182 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:07:13 2018 -0500 Merge remote-tracking branch 'teor/ticket24001' changes/ticket24001 | 4 ++++ src/or/nodelist.c | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'teor/bug24762'
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 2819e9467e229c2469b6fb0fd584f5cf020ffd3e Merge: 5051cfe9b d99ccf090 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 09:54:56 2018 -0500 Merge remote-tracking branch 'teor/bug24762' changes/bug24762 | 3 +++ src/or/main.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Stop trying to remove NULL filenames on shutdown
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit d99ccf090f5c5cb4ca76524a73c6fd7543fe969e Author: teor <teor2345(a)gmail.com> Date: Fri Dec 29 23:00:57 2017 +1100 Stop trying to remove NULL filenames on shutdown Fixes bug 24762; bugfix on master. (Not in any released version of Tor.) --- changes/bug24762 | 3 +++ src/or/main.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug24762 b/changes/bug24762 new file mode 100644 index 000000000..e9d3badaa --- /dev/null +++ b/changes/bug24762 @@ -0,0 +1,3 @@ + o Minor bugfixes (shutdown, file handling): + - Stop trying to remove NULL filenames on shutdown. + Fixes bug 24762; bugfix on master. diff --git a/src/or/main.c b/src/or/main.c index e449b95b9..9e51e35bc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3480,12 +3480,12 @@ tor_free_all(int postfork) /** * Remove the specified file, and log a warning if the operation fails for - * any reason other than the file not existing. + * any reason other than the file not existing. Ignores NULL filenames. */ void tor_remove_file(const char *filename) { - if (tor_unlink(filename) != 0 && errno != ENOENT) { + if (filename && tor_unlink(filename) != 0 && errno != ENOENT) { log_warn(LD_FS, "Couldn't unlink %s: %s", filename, strerror(errno)); }

1 0

[tor/master] Remove changes file for 24762
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 996328f374cb3f3b9820278b7e76ba1ee40dbfed Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 09:55:29 2018 -0500 Remove changes file for 24762 (Bugfixes for bugs not in any released Tor don't get listed in the changelog, and therefore don't need changes files.) --- changes/bug24762 | 3 --- 1 file changed, 3 deletions(-) diff --git a/changes/bug24762 b/changes/bug24762 deleted file mode 100644 index e9d3badaa..000000000 --- a/changes/bug24762 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (shutdown, file handling): - - Stop trying to remove NULL filenames on shutdown. - Fixes bug 24762; bugfix on master.

1 0

[tor/master] Merge remote-tracking branch 'ffmancera/github/bug24677'
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 5051cfe9bd66aa68c6825c00e107f759c921a9ff Merge: f5d89fab2 3871c102a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 09:37:23 2018 -0500 Merge remote-tracking branch 'ffmancera/github/bug24677' Makefile.am | 10 ++++++---- changes/ticket24677 | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Use ping -6 ::1 on Linux when ping6 ::1 fails on tests.
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 3871c102a6345484c5c49c91d324885bfde2e242 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Tue Jan 2 15:18:36 2018 +0100 Use ping -6 ::1 on Linux when ping6 ::1 fails on tests. Tor test now checks if "ping -6 -c 1 -W 1 ::1" works when "ping6 -c 1 -W 1 ::1" fails on tests. Fixes #24677; bugfix in 0.2.9.3-alpha. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- Makefile.am | 10 ++++++---- changes/ticket24677 | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index ad2ceb66a..e92417cda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,17 +117,19 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert # Run all available tests using automake's test-driver # only run IPv6 tests if we can ping6 ::1 (localhost) +# only run IPv6 tests if we can ping ::1 (localhost) # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011) # only run mixed tests if we have a tor-stable binary -# Try both the BSD and the Linux ping6 syntax, because they're incompatible +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6, +# because they're incompatible test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ - if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1; then \ - echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ + if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \ + echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ else \ - echo "ping6 ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ + echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ fi; \ if command -v tor-stable >/dev/null 2>&1; then \ diff --git a/changes/ticket24677 b/changes/ticket24677 new file mode 100644 index 000000000..5e6d55186 --- /dev/null +++ b/changes/ticket24677 @@ -0,0 +1,4 @@ + o Minor bugfix (network IPv6 test): + - Tor test now checks if "ping -6 ::1" works when the user runs "make + test-network-all". Fixes bug 24677; bugfix on 0.2.9.3-alpha. + Patch by "ffmancera".

1 0