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

[tor/master] Fix up the rust build script library list.
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit b0adf2fc9b079e530494328c8c1aa4528b649080 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 12:04:11 2018 -0400 Fix up the rust build script library list. --- src/rust/build.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rust/build.rs b/src/rust/build.rs index 8bb9eb295..b43fbdceb 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -151,10 +151,13 @@ pub fn main() { // moving forward! cfg.component("tor-crypt-ops-testing"); cfg.component("or-testing"); - cfg.component("libtor-lock"); + cfg.component("tor-log"); + cfg.component("tor-lock"); + cfg.component("tor-fdio"); cfg.component("tor-container-testing"); cfg.component("tor-string-testing"); cfg.component("tor-malloc"); + cfg.component("tor-wallclock"); cfg.component("tor-err-testing"); cfg.component("or-event-testing"); cfg.component("tor-intmath-testing");

1 0

[tor/master] Make an inline static so we can build with coverage enabled.
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit 1b93b065fc3eb52fe5674d6df05c71c505ed1ef3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 14:11:37 2018 -0400 Make an inline static so we can build with coverage enabled. --- src/lib/string/compat_ctype.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/string/compat_ctype.h b/src/lib/string/compat_ctype.h index 3fde6eaf8..530a10270 100644 --- a/src/lib/string/compat_ctype.h +++ b/src/lib/string/compat_ctype.h @@ -31,10 +31,10 @@ extern const uint8_t TOR_TOLOWER_TABLE[]; #define TOR_TOLOWER(c) (TOR_TOLOWER_TABLE[(uint8_t)c]) #define TOR_TOUPPER(c) (TOR_TOUPPER_TABLE[(uint8_t)c]) -inline int hex_decode_digit(char c); +static inline int hex_decode_digit(char c); /** Helper: given a hex digit, return its value, or -1 if it isn't hex. */ -inline int +static inline int hex_decode_digit(char c) { switch (c) {

1 0

[tor/master] We also need torerr in tm_cvt.
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit 4b32446a4c52f9ac91cf230b90ee5b72331793be Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 13:34:35 2018 -0400 We also need torerr in tm_cvt. --- src/lib/wallclock/tm_cvt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/wallclock/tm_cvt.c b/src/lib/wallclock/tm_cvt.c index cf73cc542..63f92bff2 100644 --- a/src/lib/wallclock/tm_cvt.c +++ b/src/lib/wallclock/tm_cvt.c @@ -8,6 +8,7 @@ #include "lib/cc/compat_compiler.h" #include "lib/wallclock/tm_cvt.h" #include "lib/string/printf.h" +#include "lib/err/torerr.h" #include <errno.h> #include <time.h>

1 0

[tor/master] Another windows include
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit 405fa42e8a835de394503231a85258972a65bd89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 13:52:30 2018 -0400 Another windows include --- scripts/maint/checkIncludes.py | 15 ++++++++++++--- src/lib/wallclock/tm_cvt.c | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index 3c611675e..cb3354abf 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -58,12 +58,21 @@ def load_include_rules(fname): result.addPattern(line) return result +MDD = "--mdd" in sys.argv[1:] + +if MDD: + print( + for dirpath, dirnames, fnames in os.walk("src"): if ".may_include" in fnames: rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) - for fname in fnames: - if fname_is_c(fname): - rules.applyToFile(os.path.join(dirpath,fname)) + if MDD: + dp = dirpath.replace("src/","") + rules.dump_mdd(dp) + else: + for fname in fnames: + if fname_is_c(fname): + rules.applyToFile(os.path.join(dirpath,fname)) if trouble: err( diff --git a/src/lib/wallclock/tm_cvt.c b/src/lib/wallclock/tm_cvt.c index 63f92bff2..987b0ffeb 100644 --- a/src/lib/wallclock/tm_cvt.c +++ b/src/lib/wallclock/tm_cvt.c @@ -13,6 +13,7 @@ #include <errno.h> #include <time.h> #include <string.h> +#include <stdlib.h> #if !defined(_WIN32) /** Defined iff we need to add locks when defining fake versions of reentrant

1 0

[tor/master] Merge branch 'log_dependencies'
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit 92d8284a9792267514cbe21f3ce1564f6ad0e10b Merge: b4e23dba9 1b93b065f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 11:27:33 2018 -0400 Merge branch 'log_dependencies' .gitignore | 16 + Makefile.am | 16 + scripts/maint/checkIncludes.py | 15 +- src/common/.may_include | 3 - src/common/address.c | 6 +- src/common/address.h | 26 +- src/common/address_set.c | 3 +- src/common/buffers.c | 2 +- src/common/compat.c | 488 +-------- src/common/compat.h | 73 +- src/common/compat_libevent.c | 2 +- src/common/compat_pthreads.c | 82 +- src/common/compat_threads.c | 30 +- src/common/compat_threads.h | 42 +- src/common/compat_time.c | 56 +- src/common/compat_time.h | 5 +- src/common/compat_winthreads.c | 30 +- src/common/confline.c | 5 +- src/common/confline.h | 5 +- src/common/container.h | 742 ------------- src/common/include.am | 6 - src/common/memarea.c | 3 +- src/common/procmon.h | 2 +- src/common/sandbox.c | 6 +- src/common/storagedir.c | 5 +- src/common/timers.c | 2 +- src/common/token_bucket.c | 4 +- src/common/util.c | 1122 +------------------- src/common/util.h | 207 +--- src/common/util_format.c | 41 +- src/common/util_format.h | 2 - src/common/util_process.c | 2 +- src/common/workqueue.c | 2 +- src/include.am | 9 + src/lib/cc/compat_compiler.h | 14 + src/lib/compress/.may_include | 1 + src/lib/compress/compress.c | 2 +- src/lib/compress/compress_lzma.c | 2 +- src/lib/compress/compress_none.c | 2 +- src/lib/compress/compress_zlib.c | 2 +- src/lib/compress/compress_zstd.c | 2 +- src/lib/container/.may_include | 16 + src/lib/container/bitarray.h | 80 ++ src/lib/container/bloomfilt.c | 49 + src/lib/container/bloomfilt.h | 58 + src/lib/container/include.am | 24 + src/lib/container/map.c | 414 ++++++++ src/lib/container/map.h | 255 +++++ src/lib/container/order.c | 51 + src/lib/container/order.h | 54 + .../container.c => lib/container/smartlist.c} | 508 +-------- src/lib/container/smartlist.h | 360 +++++++ src/lib/crypt_ops/.may_include | 8 + src/lib/crypt_ops/aes.c | 2 +- src/lib/crypt_ops/crypto.c | 5 +- src/lib/crypt_ops/crypto_curve25519.c | 3 +- src/lib/crypt_ops/crypto_dh.c | 2 +- src/lib/crypt_ops/crypto_digest.c | 5 +- src/lib/crypt_ops/crypto_digest.h | 16 +- src/lib/crypt_ops/crypto_ed25519.c | 2 +- src/lib/crypt_ops/crypto_format.c | 6 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- src/lib/crypt_ops/crypto_pwbox.c | 2 +- src/lib/crypt_ops/crypto_rand.c | 5 +- src/lib/crypt_ops/crypto_rsa.c | 2 +- src/lib/crypt_ops/crypto_rsa.h | 2 +- src/lib/crypt_ops/crypto_util.c | 2 +- src/lib/ctime/.may_include | 5 +- src/lib/ctime/di_ops.c | 17 +- src/lib/defs/.may_include | 1 + src/lib/defs/digest_sizes.h | 18 + src/lib/defs/include.am | 3 + src/lib/fdio/.may_include | 4 + src/lib/fdio/fdio.c | 109 ++ src/lib/fdio/fdio.h | 17 + src/lib/fdio/include.am | 17 + src/lib/intmath/.may_include | 4 + src/lib/intmath/addsub.c | 20 + src/lib/intmath/addsub.h | 13 + src/lib/intmath/bits.c | 88 ++ src/lib/intmath/bits.h | 16 + src/lib/intmath/cmp.h | 20 + src/lib/intmath/include.am | 22 + src/lib/intmath/muldiv.c | 75 ++ src/lib/intmath/muldiv.h | 22 + src/lib/lock/.may_include | 5 + src/lib/lock/compat_mutex.c | 34 + src/lib/lock/compat_mutex.h | 60 ++ src/lib/lock/compat_mutex_pthreads.c | 97 ++ src/lib/lock/compat_mutex_winthreads.c | 40 + src/lib/lock/include.am | 24 + src/lib/log/.may_include | 15 + src/lib/log/include.am | 24 + src/lib/log/ratelim.c | 55 + src/lib/log/ratelim.h | 48 + src/{common/log.c => lib/log/torlog.c} | 62 +- src/{common => lib/log}/torlog.h | 10 +- src/{common => lib/log}/util_bug.c | 37 +- src/{common => lib/log}/util_bug.h | 11 +- src/lib/malloc/.may_include | 6 + src/lib/malloc/include.am | 17 + src/lib/malloc/util_malloc.c | 230 ++++ src/lib/malloc/util_malloc.h | 92 ++ src/lib/string/.may_include | 9 + src/lib/string/compat_ctype.c | 67 ++ src/lib/string/compat_ctype.h | 62 ++ src/lib/string/compat_string.c | 14 + src/lib/string/compat_string.h | 39 + src/lib/string/include.am | 25 + src/lib/string/printf.c | 152 +++ src/lib/string/printf.h | 25 + src/lib/string/scanf.c | 312 ++++++ src/lib/string/scanf.h | 19 + src/lib/string/util_string.c | 340 ++++++ src/lib/string/util_string.h | 42 + src/lib/tls/.may_include | 2 + src/lib/tls/buffers_tls.c | 2 +- src/lib/tls/tortls.c | 4 +- src/lib/trace/.may_include | 4 +- src/lib/trace/debug.h | 2 +- src/lib/wallclock/.may_include | 6 + src/lib/wallclock/approx_time.c | 38 + src/lib/wallclock/approx_time.h | 20 + src/lib/wallclock/include.am | 21 + src/lib/wallclock/tm_cvt.c | 195 ++++ src/lib/wallclock/tm_cvt.h | 17 + src/lib/wallclock/tor_gettimeofday.c | 82 ++ src/lib/wallclock/tor_gettimeofday.h | 15 + src/or/config.c | 20 +- src/or/config.h | 4 +- src/or/confparse.c | 4 +- src/or/consdiff.c | 1 - src/or/consdiff.h | 3 +- src/or/dirauth/dirvote.c | 2 + src/or/dirserv.c | 3 +- src/or/entrynodes.c | 3 +- src/or/geoip.c | 3 +- src/or/hs_client.c | 1 - src/or/hs_descriptor.h | 1 - src/or/include.am | 4 +- src/or/keypin.c | 4 +- src/or/microdesc.c | 4 +- src/or/onion_ntor.c | 2 +- src/or/or.h | 5 +- src/or/parsecommon.c | 4 +- src/or/parsecommon.h | 13 +- src/or/protover.h | 11 +- src/or/rephist.c | 4 +- src/or/routerlist.c | 3 +- src/or/routerparse.c | 3 +- src/or/routerset.c | 3 +- src/or/routerset.h | 3 +- src/or/torcert.c | 2 +- src/rust/build.rs | 8 + src/test/bench.c | 3 +- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/log_test_helpers.c | 2 +- src/test/test_bridges.c | 1 - src/test/test_bt_cl.c | 2 +- src/test/test_circuitlist.c | 3 +- src/test/test_containers.c | 5 +- src/test/test_dir_common.c | 1 - src/test/test_entrynodes.c | 3 +- src/test/test_guardfraction.c | 1 - src/test/test_logging.c | 7 +- src/test/test_routerlist.c | 1 - src/test/test_status.c | 2 +- src/test/test_tortls.c | 2 +- src/test/test_util.c | 3 +- src/test/test_util_slow.c | 2 +- src/tools/tor-gencert.c | 2 +- src/tools/tor-resolve.c | 2 +- 173 files changed, 4500 insertions(+), 3534 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit 25226fb260a6b5f93187b707ec35f06637fbe710 Merge: 6107a2127 d6d3f8486 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Prefer recent Python 3 in autoconf.
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit 47ee7978fe73816bf15cb392d0e89301f65724f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 09:28:50 2018 -0400 Prefer recent Python 3 in autoconf. Closes ticket 26372. --- changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/feature26372_029 b/changes/feature26372_029 new file mode 100644 index 000000000..150ac3055 --- /dev/null +++ b/changes/feature26372_029 @@ -0,0 +1,4 @@ + o Minor features (compilation): + + - When building Tor, prefer to use Python 3 over Python 2, and more + recent (contemplated) versions over older ones. Closes ticket 26372. diff --git a/configure.ac b/configure.ac index 15ecbe60e..279660d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -213,7 +213,11 @@ AM_PROG_CC_C_O AC_PROG_CC_C99 AC_ARG_VAR([PYTHON], [path to Python binary]) -AC_CHECK_PROGS(PYTHON, [python python2 python2.7 python3 python3.3]) +AC_CHECK_PROGS(PYTHON, [ \ + python3 \ + python3.8 python3.7 python3.6 python3.5 python3.4 \ + python \ + python2 python2.7]) if test "x$PYTHON" = "x"; then AC_MSG_WARN([Python unavailable; some tests will not be run.]) fi

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit d6d3f8486dbac9837a793f431dcd58505e7274e4 Merge: 340fcc7e2 fcd26af7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'feature26372_029' into maint-0.2.9
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit fcd26af7c0b9926f8e56149a72de9dd47ad37a69 Merge: dd69e74e3 47ee7978f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 09:21:55 2018 -0400 Merge branch 'feature26372_029' into maint-0.2.9 changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'feature26372_029' into maint-0.2.9
by nickm＠torproject.org 26 Jun '18

26 Jun '18

commit fcd26af7c0b9926f8e56149a72de9dd47ad37a69 Merge: dd69e74e3 47ee7978f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 09:21:55 2018 -0400 Merge branch 'feature26372_029' into maint-0.2.9 changes/feature26372_029 | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0