tor-commits June 2019

tor-commits@lists.torproject.org

21 participants
1482 discussions

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit e51b57ee047420b929c7d58de70df6ea5ca77565 Merge: 04cb2d401 802ac8ad6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:16:34 2019 -0400 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0 changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 463ded569c13f633b12d74ad0048b0b367a511b4 Merge: 121d271dc 6a6f7eb67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:24:10 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 23 ++---------------- changes/bug30189 | 4 ++++ changes/bug30316 | 4 ++++ changes/bug30452 | 3 +++ changes/ticket30213 | 3 +++ changes/ticket30234 | 2 ++ changes/ticket30454 | 10 ++++++++ doc/tor.1.txt | 17 ++++++++----- src/app/config/config.c | 13 ++++++++++ src/app/main/main.c | 1 + src/config/torrc.sample.in | 21 ++++++++++++---- src/feature/dirauth/authmode.h | 4 ++++ src/feature/dirauth/dirvote.c | 11 ++++----- src/feature/hs/hs_cell.c | 16 +++++++------ src/feature/hs/hs_cell.h | 13 ---------- src/feature/hs/hs_client.c | 18 +++++++------- src/feature/hs/hs_intropoint.c | 27 +++++++++++---------- src/feature/hs/hs_intropoint.h | 15 ------------ src/lib/log/util_bug.c | 14 +++++++++++ src/lib/log/util_bug.h | 8 ++++--- src/test/test_hs_cell.c | 2 +- src/test/test_hs_intropoint.c | 4 ++-- src/trunnel/hs/cell_introduce1.c | 44 +++++++++++++--------------------- src/trunnel/hs/cell_introduce1.h | 7 ++++++ src/trunnel/hs/cell_introduce1.trunnel | 21 +++++++++++++--- 25 files changed, 174 insertions(+), 131 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 6a6f7eb6718f22da80596a35e7774b075a417e97 Merge: d63c17f2a 821dd5458 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:22:52 2019 -0400 Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0 changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.0] Move bandwidth-file-headers line to appear in the correct vote section
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 29 13:43:50 2019 -0400 Move bandwidth-file-headers line to appear in the correct vote section Fixes bug 30316; bugfix on 0.3.5.1-alpha. --- changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug30316 b/changes/bug30316 new file mode 100644 index 000000000..3e396318a --- /dev/null +++ b/changes/bug30316 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - Move the "bandwidth-file-headers" line in directory authority votes + so that it conforms to dir-spec.txt. Fixes bug 30316; bugfix on + 0.3.5.1-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 5e426b0f8..af8b3dc20 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -322,10 +322,10 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" + "%s" /* bandwidth file headers */ "dir-source %s %s %s %s %d %d\n" "contact %s\n" "%s" /* shared randomness information */ - "%s" /* bandwidth file headers */ , v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", methods, @@ -338,13 +338,12 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, flags, flag_thresholds, params, + bw_headers_line ? bw_headers_line : "", voter->nickname, fingerprint, voter->address, fmt_addr32(addr), voter->dir_port, voter->or_port, voter->contact, shared_random_vote_str ? - shared_random_vote_str : "", - bw_headers_line ? - bw_headers_line : ""); + shared_random_vote_str : ""); tor_free(params); tor_free(flags);

1 0

[tor/maint-0.4.0] Merge branch 'bug30316_035' into bug30316_040
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 821dd54586bffd95bdd8c9d333b1f80ef55d3742 Merge: 593d29920 0ab4dc7ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 29 13:48:25 2019 -0400 Merge branch 'bug30316_035' into bug30316_040 Fixes conflicts and also moves bandwidth-file-digest. changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --cc src/feature/dirauth/dirvote.c index 29f5d0450,af8b3dc20..755b99bae --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@@ -348,6 -322,7 +348,8 @@@ format_networkstatus_vote(crypto_pk_t * "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" + "%s" /* bandwidth file headers */ ++ "%s" /* bandwidth file digest */ "dir-source %s %s %s %s %d %d\n" "contact %s\n" "%s" /* shared randomness information */ @@@ -365,6 -338,7 +365,8 @@@ flags, flag_thresholds, params, + bw_headers_line ? bw_headers_line : "", ++ bw_file_digest ? bw_file_digest: "", voter->nickname, fingerprint, voter->address, fmt_addr32(addr), voter->dir_port, voter->or_port, voter->contact,

1 0

[tor/maint-0.4.0] Travis: remove sudo configuration
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 10c71105e6403025f380dee7c3d7e1ce40e8f2b6 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migrati… --- .travis.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab7db2a92..7f20875cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ env: - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: - ## include creates builds with gcc, linux, sudo: false + ## include creates builds with gcc, linux include: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" @@ -71,12 +71,6 @@ matrix: ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx @@ -92,20 +86,6 @@ matrix: ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" -## We don't need sudo. (The "apt:" stanza after this allows us to not need -## sudo; otherwise, we would need it for getting dependencies.) -## -## But we use "sudo: required" to force non-containerized builds, working -## around a Travis CI environment issue: clang LeakAnalyzer fails -## because it requires ptrace and the containerized environment no -## longer allows ptrace. -## https://github.com/travis-ci/travis-ci/issues/9033 -## -## In the matrix above, we exclude redundant combinations. -sudo: - - false - - required - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit d63c17f2afb810f5db896b10909fe9ff2bfe7cf9 Merge: e51b57ee0 b05b165a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:22:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0 .travis.yml | 22 +--------------------- changes/ticket30213 | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.4.0] Add changes file
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit b05b165a75a9d9e912da64788fc873fb215f5d75 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 000000000..acb761480 --- /dev/null +++ b/changes/ticket30213 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Remove sudo configuration lines from .travis.yml as they are no longer + needed with current Travis build environment. Resolves issue 30213.

1 0

[tor/maint-0.4.0] Use a tor_abort_() wrapper in our util_bug.h macros
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 802ac8ad618a0674c26bb973a2277e07b20f8c7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 15 14:16:23 2019 -0400 Use a tor_abort_() wrapper in our util_bug.h macros Previously, our use of abort() would break anywhere that we didn't include stdlib.h. This was especially troublesome in case where tor_assert_nonfatal() was used with ALL_BUGS_ARE_FATAL, since that one seldom gets tested. As an alternative, we could have just made this header include stdlib.h. But that seems bloaty. Fixes bug 30189; bugfix on 0.3.4.1-alpha. --- changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/changes/bug30189 b/changes/bug30189 new file mode 100644 index 000000000..f8c932a5f --- /dev/null +++ b/changes/bug30189 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, unusual configuration): + - Avoid failures when building with ALL_BUGS_ARE_FAILED due to + missing declarations of abort(), and prevent other such failures + in the future. Fixes bug 30189; bugfix on 0.3.4.1-alpha. diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index f42d2d2ab..c65a91ae9 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -19,6 +19,7 @@ #include "lib/string/printf.h" #include <string.h> +#include <stdlib.h> #ifdef TOR_UNIT_TESTS static void (*failed_assertion_cb)(void) = NULL; @@ -120,6 +121,19 @@ tor_bug_occurred_(const char *fname, unsigned int line, #endif } +/** + * Call the abort() function to kill the current process with a fatal + * error. + * + * (This is a separate function so that we declare it in util_bug.h without + * including stdlib in all the users of util_bug.h) + **/ +void +tor_abort_(void) +{ + abort(); +} + #ifdef _WIN32 /** Take a filename and return a pointer to its final element. This * function is called on __FILE__ to fix a MSVC nit where __FILE__ diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 18d40bbf3..2a4d68127 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -99,7 +99,7 @@ if (ASSERT_PREDICT_LIKELY_(expr)) { \ } else { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ - abort(); \ + tor_abort_(); \ } STMT_END #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */ @@ -107,7 +107,7 @@ STMT_BEGIN { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \ "line should be unreached"); \ - abort(); \ + tor_abort_(); \ } STMT_END /* Non-fatal bug assertions. The "unreached" variants mean "this line should @@ -141,7 +141,7 @@ #define BUG(cond) \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ - abort(), 1) \ + tor_abort_(), 1) \ : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #define tor_assert_nonfatal_unreached() STMT_NIL @@ -226,6 +226,8 @@ void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, int once); +void tor_abort_(void) ATTR_NORETURN; + #ifdef _WIN32 #define SHORT_FILE__ (tor_fix_source_file(__FILE__)) const char *tor_fix_source_file(const char *fname);

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2019