- tor-commits - lists.torproject.org

[tor/master] Do not apply bugtrapping flags to test-memwipe, since testing memwipe requires bugs.
by nickm＠torproject.org 12 May '16

12 May '16

commit b1dce55b8236cc7ecf66f87c0bd96b0dcf874fcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 2 12:56:18 2016 -0400 Do not apply bugtrapping flags to test-memwipe, since testing memwipe requires bugs. Fixes bug 18901. --- src/test/include.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index c4ef30f..b714152 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -170,9 +170,9 @@ src_test_test_slow_LDADD = $(src_test_test_LDADD) src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS) src_test_test_memwipe_CPPFLAGS = $(src_test_test_CPPFLAGS) -src_test_test_memwipe_CFLAGS = $(src_test_test_CFLAGS) +src_test_test_memwipe_CFLAGS = $(TEST_CFLAGS) src_test_test_memwipe_LDADD = $(src_test_test_LDADD) -src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) +src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@

1 0

[tor/master] Prefer builtin true.
by nickm＠torproject.org 12 May '16

12 May '16

commit a3615a988ebb1181ae636d0f9111ade0f1d3f6cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 12:54:15 2016 -0400 Prefer builtin true. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 626be6c..0a78a9f 100644 --- a/configure.ac +++ b/configure.ac @@ -787,13 +787,13 @@ m4_ifdef([AS_VAR_IF],[ TOR_CHECK_CFLAGS(-fPIE) TOR_CHECK_LDFLAGS(-pie, "$all_ldflags_for_check", "$all_libs_for_check") fi - TOR_TRY_COMPILE_WITH_CFLAGS(-ftrapv, , CFLAGS_FTRAPV="-ftrapv", /bin/true) - TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, , CFLAGS_FWRAPV="-fwrapv", /bin/true) + TOR_TRY_COMPILE_WITH_CFLAGS(-ftrapv, , CFLAGS_FTRAPV="-ftrapv", true) + TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, , CFLAGS_FWRAPV="-fwrapv", true) fi if test "x$enable_expensive_hardening" = "xyes"; then - TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=address], , CFLAGS_ASAN="-fsanitize=address", /bin/true) - TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=undefined], , CFLAGS_UBSAN="-fsanitize=undefined", /bin/true) + TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=address], , CFLAGS_ASAN="-fsanitize=address", true) + TOR_TRY_COMPILE_WITH_CFLAGS([-fsanitize=undefined], , CFLAGS_UBSAN="-fsanitize=undefined", true) TOR_CHECK_CFLAGS([-fno-omit-frame-pointer]) fi

1 0

[tor/master] Merge branch 'ftrapv_v3'
by nickm＠torproject.org 12 May '16

12 May '16

commit 607a9056d4d91762db0d5fc13250c6ed272f0e1b Merge: 58e0e58 fb999ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 13:00:45 2016 -0400 Merge branch 'ftrapv_v3' There were some conflicts here, and some breakage to fix concerning library link order in newer targets. .gitignore | 3 ++ Makefile.am | 4 +-- acinclude.m4 | 20 ++++++++--- changes/bug17983 | 11 +++++++ configure.ac | 23 +++++++++++-- src/common/di_ops.c | 45 +++++++++++++++++++++++++ src/common/di_ops.h | 2 ++ src/common/include.am | 35 +++++++++++++------- src/ext/include.am | 9 +++-- src/or/include.am | 3 +- src/or/routerlist.c | 91 ++++++++++++++++++++------------------------------- src/or/routerlist.h | 13 ++------ src/test/include.am | 16 +++++++-- src/test/test_dir.c | 45 ++++++++++++------------- src/tools/include.am | 11 +++++-- 15 files changed, 212 insertions(+), 119 deletions(-) diff --cc Makefile.am index 13ba00d,e9abfc6..a8aa3af --- a/Makefile.am +++ b/Makefile.am @@@ -15,13 -15,13 +15,13 @@@ noinst_PROGRAMS DISTCLEANFILES= bin_SCRIPTS= AM_CPPFLAGS= - AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@ - SHELL = @SHELL@ + AM_CFLAGS=@TOR_SYSTEMD_CFLAGS@ @CFLAGS_BUGTRAP@ + SHELL=@SHELL@ if COVERAGE_ENABLED -TESTING_TOR_BINARY="$(top_builddir)/src/or/tor-cov" +TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov$(EXEEXT) else -TESTING_TOR_BINARY="$(top_builddir)/src/or/tor" +TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif include src/include.am diff --cc src/common/include.am index f7c486d,33baa12..6525e0b --- a/src/common/include.am +++ b/src/common/include.am @@@ -64,17 -77,14 +77,15 @@@ LIBOR_A_SRC = src/common/compat.c \ src/common/compat_threads.c \ src/common/container.c \ - src/common/di_ops.c \ src/common/log.c \ src/common/memarea.c \ + src/common/pubsub.c \ src/common/util.c \ + src/common/util_bug.c \ src/common/util_format.c \ src/common/util_process.c \ src/common/sandbox.c \ src/common/workqueue.c \ - src/ext/csiphash.c \ - src/ext/trunnel/trunnel.c \ $(libor_extra_source) \ $(threads_impl_source) \ $(readpassphrase_source) @@@ -93,19 -103,18 +104,19 @@@ LIBOR_CRYPTO_A_SRC = src/common/crypto_curve25519.c \ src/common/crypto_ed25519.c - LIBOR_EVENT_A_SOURCES = \ + LIBOR_EVENT_A_SRC = \ src/common/compat_libevent.c \ - src/common/procmon.c + src/common/procmon.c \ + src/common/timers.c \ + src/ext/timeouts/timeout.c - src_common_libor_a_SOURCES = $(LIBOR_A_SOURCES) - src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES) - src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SOURCES) + src_common_libor_a_SOURCES = $(LIBOR_A_SRC) + src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) + src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC) - src_common_libor_testing_a_SOURCES = $(LIBOR_A_SOURCES) - src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES) - src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SOURCES) + src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC) + src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) + src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC) src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) diff --cc src/test/include.am index d1e1cbd,d2909b2..db496ae --- a/src/test/include.am +++ b/src/test/include.am @@@ -196,16 -197,6 +203,17 @@@ src_test_test_workqueue_LDADD = src/or/ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS) +src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS) +src_test_test_timers_LDADD = \ ++ src/common/libor-testing.a \ ++ src/common/libor-ctime-testing.a \ + src/common/libor-event-testing.a \ + src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-testing.a \ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +src_test_test_timers_LDFLAGS = $(src_test_test_LDFLAGS) + noinst_HEADERS+= \ src/test/fakechans.h \ src/test/log_test_helpers.h \ diff --cc src/tools/include.am index 38ed575,b4ea82d..39e42a7 --- a/src/tools/include.am +++ b/src/tools/include.am @@@ -31,7 -35,8 +35,8 @@@ src_tools_tor_cov_gencert_CPPFLAGS = $( src_tools_tor_cov_gencert_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_tools_tor_cov_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ src/common/libor-crypto-testing.a \ ++ src/common/libor-ctime-testing.a \ $(LIBKECCAK_TINY) \ $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \

1 0

[tor/master] Document why we build memwipe that way.
by nickm＠torproject.org 12 May '16

12 May '16

commit fb999abea6edc99f151f546a7a4a60cf5b5f221b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 12:56:47 2016 -0400 Document why we build memwipe that way. --- src/test/include.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index b714152..d2909b2 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -170,8 +170,11 @@ src_test_test_slow_LDADD = $(src_test_test_LDADD) src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS) src_test_test_memwipe_CPPFLAGS = $(src_test_test_CPPFLAGS) +# Don't use bugtrap cflags here: memwipe tests require memory violations. src_test_test_memwipe_CFLAGS = $(TEST_CFLAGS) src_test_test_memwipe_LDADD = $(src_test_test_LDADD) +# The LDFLAGS need to include the bugtrap cflags, or else we won't link +# successfully with the libraries built with them. src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \

1 0

[tor/master] Fix inconsistent tab/space mixing in include.am files.
by nickm＠torproject.org 12 May '16

12 May '16

commit 445e05a015cea76a4694f43a250b3d29e38e4e51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 13:06:58 2016 -0400 Fix inconsistent tab/space mixing in include.am files. This is a whitespace only, cosmetic fix. There is still some inconsistency between lists, but less inconsistency inside individual lists. --- src/common/include.am | 4 ++-- src/test/include.am | 4 ++-- src/tools/include.am | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 6525e0b..c39ad8d 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -1,14 +1,14 @@ noinst_LIBRARIES += \ src/common/libor.a \ - src/common/libor-ctime.a \ + src/common/libor-ctime.a \ src/common/libor-crypto.a \ src/common/libor-event.a if UNITTESTS_ENABLED noinst_LIBRARIES += \ src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ + src/common/libor-ctime-testing.a \ src/common/libor-crypto-testing.a \ src/common/libor-event-testing.a endif diff --git a/src/test/include.am b/src/test/include.am index db496ae..fa660f5 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -254,7 +254,7 @@ EXTRA_DIST += \ src/test/slownacl_curve25519.py \ src/test/zero_length_keys.sh \ src/test/test_keygen.sh \ - src/test/test_zero_length_keys.sh \ - src/test/test_ntor.sh src/test/test_bt.sh \ + src/test/test_zero_length_keys.sh \ + src/test/test_ntor.sh src/test/test_bt.sh \ src/test/test-network.sh \ src/test/test_switch_id.sh diff --git a/src/tools/include.am b/src/tools/include.am index 39e42a7..d0185b5 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -17,7 +17,7 @@ src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_tools_tor_cov_resolve_LDADD = src/common/libor-testing.a \ src/common/libor-ctime-testing.a \ - @TOR_LIB_MATH@ @TOR_LIB_WS32@ + @TOR_LIB_MATH@ @TOR_LIB_WS32@ endif src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c @@ -26,8 +26,8 @@ src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \ src/common/libor-ctime.a \ $(LIBKECCAK_TINY) \ $(LIBDONNA) \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ if COVERAGE_ENABLED src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c @@ -39,8 +39,8 @@ src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \ src/common/libor-ctime-testing.a \ $(LIBKECCAK_TINY) \ $(LIBDONNA) \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ endif src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c @@ -50,7 +50,7 @@ src_tools_tor_checkkey_LDADD = src/common/libor.a \ src/common/libor-crypto.a \ $(LIBKECCAK_TINY) \ $(LIBDONNA) \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ EXTRA_DIST += src/tools/tor-fw-helper/README

1 0

[tor/master] Add a comment to have_enough_path_info()
by nickm＠torproject.org 12 May '16

12 May '16

commit 0c41ae18329644828ff247b00a7f4e99e3f38312 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon May 9 14:26:13 2016 -0400 Add a comment to have_enough_path_info() Comment only change --- src/or/circuituse.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea..fa6c666 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1674,7 +1674,11 @@ circuit_launch(uint8_t purpose, int flags) return circuit_launch_by_extend_info(purpose, NULL, flags); } -/* DOCDOC */ +/* Do we have enough descriptors to build paths? + * If need_exit is true, return 1 if we can build exit paths. + * (We need at least one Exit in the consensus to build exit paths.) + * If need_exit is false, return 0 if we can build internal paths. + */ static int have_enough_path_info(int need_exit) {

1 0

[tor/master] Allow directories in small networks to bootstrap
by nickm＠torproject.org 12 May '16

12 May '16

commit c2817774c28a40f76890b68775097596d14e035e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon May 9 14:29:07 2016 -0400 Allow directories in small networks to bootstrap Skip DirPort checks when the consensus has no exits. Resolves #19003, bugfix on #18050 in 0.2.8.1-alpha. --- changes/bug19003 | 5 +++++ src/or/router.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug19003 b/changes/bug19003 new file mode 100644 index 0000000..d9ef23d --- /dev/null +++ b/changes/bug19003 @@ -0,0 +1,5 @@ + o Minor bugfixes (small networks): + - Allow directories in small networks to bootstrap by + skipping DirPort checks when the consensus has no exits. + Resolves #19003, bugfix on #18050 in 0.2.8.1-alpha. + Patch by teor. diff --git a/src/or/router.c b/src/or/router.c index 68bcf13..dd84210 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1551,6 +1551,8 @@ proxy_mode(const or_options_t *options) * and * - We believe both our ORPort and DirPort (if present) are reachable from * the outside; or + * - We believe both our ORPort is reachable from the outside, and we can't + * check our DirPort because the consensus has no exits; or * - We are an authoritative directory server. */ static int @@ -1568,7 +1570,13 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; + /* If there are no exits in the consensus, but have enough descriptors to + * build internal paths, we can't possibly verify our DirPort. + * This only happens in small networks without exits. */ + if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) + return check_whether_orport_reachable(); + /* If there are exits in the consensus, use an exit to check our DirPort. */ return check_whether_orport_reachable() && check_whether_dirport_reachable(); }

1 0

[tor/master] Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8
by nickm＠torproject.org 12 May '16

12 May '16

commit ce6f2d1c4da5125cdd4a69fcc4cd45f7c3d6ca8d Merge: d00d3f1 b8b5bcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 11:09:33 2016 -0400 Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8 changes/bug19003 | 5 +++++ src/or/circuituse.c | 6 +++++- src/or/router.c | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-)

1 0

[tor/master] refactor the #19003 patches
by nickm＠torproject.org 12 May '16

12 May '16

commit b8b5bccfd9f350cd796a8bcd6b79b9d303a79e11 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 13:03:49 2016 -0400 refactor the #19003 patches fix the logic in one of the comments --- src/or/circuituse.c | 2 +- src/or/router.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fa6c666..a4b5801 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1677,7 +1677,7 @@ circuit_launch(uint8_t purpose, int flags) /* Do we have enough descriptors to build paths? * If need_exit is true, return 1 if we can build exit paths. * (We need at least one Exit in the consensus to build exit paths.) - * If need_exit is false, return 0 if we can build internal paths. + * If need_exit is false, return 1 if we can build internal paths. */ static int have_enough_path_info(int need_exit) diff --git a/src/or/router.c b/src/or/router.c index dd84210..3f94703 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1549,9 +1549,9 @@ proxy_mode(const or_options_t *options) * and * - We have ORPort set * and - * - We believe both our ORPort and DirPort (if present) are reachable from + * - We believe our ORPort and DirPort (if present) are reachable from * the outside; or - * - We believe both our ORPort is reachable from the outside, and we can't + * - We believe our ORPort is reachable from the outside, and we can't * check our DirPort because the consensus has no exits; or * - We are an authoritative directory server. */ @@ -1570,14 +1570,15 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - /* If there are no exits in the consensus, but have enough descriptors to - * build internal paths, we can't possibly verify our DirPort. - * This only happens in small networks without exits. */ - if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) - return check_whether_orport_reachable(); - - /* If there are exits in the consensus, use an exit to check our DirPort. */ - return check_whether_orport_reachable() && check_whether_dirport_reachable(); + if (!check_whether_orport_reachable()) + return 0; + if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { + /* All set: there are no exits in the consensus (maybe this is a tiny + * test network), so we can't check our DirPort reachability. */ + return 1; + } else { + return check_whether_dirport_reachable(); + } } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 12 May '16

12 May '16

commit 58e0e587a6e0ddb04a8fa6a58852d843b1c21a2c Merge: f936f18 ce6f2d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 11:09:40 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19003 | 5 +++++ src/or/circuituse.c | 6 +++++- src/or/router.c | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-)

1 0