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

[tor/master] Allow spaces in CCLD in linker.sh
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit e084afde80a844328a1eeef33d732e0f0a0d9eda Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 19:16:25 2018 -0400 Allow spaces in CCLD in linker.sh Hello71 spotted this first. --- link_rust.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/link_rust.sh.in b/link_rust.sh.in index 2b972fdf2..59f4142ba 100644 --- a/link_rust.sh.in +++ b/link_rust.sh.in @@ -7,4 +7,4 @@ # We'd like to remove the need for this, but build.rs doesn't let us pass # -static-libasan and -static-libubsan to the linker. -"$CCLD" @RUST_LINKER_OPTIONS@ "$@" +$CCLD @RUST_LINKER_OPTIONS@ "$@"

1 0

[tor/release-0.3.4] Use different RUST_LINKER_OPTIONS for sanitizers
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 6c3ad4cae8b967f6dc9ee98f5b01de9e327e9880 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:53:09 2018 -0400 Use different RUST_LINKER_OPTIONS for sanitizers These appear to work for me. --- configure.ac | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f976cdd42..606bceeda 100644 --- a/configure.ac +++ b/configure.ac @@ -1128,11 +1128,20 @@ dnl What's more, we need to specify them in a linker script rather than dnl from build.rs: these options aren't allowed in the cargo:rustc-flags dnl variable. RUST_LINKER_OPTIONS="" -if test "x$CFLAGS_ASAN" != "x"; then - RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -static-libasan" -fi -if test "x$CFLAGS_UBSAN" != "x"; then - RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -static-libubsan" +if test "x$have_clang" = "xyes"; then + if test "x$CFLAGS_ASAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS $CFLAGS_ASAN" + fi + if test "x$CFLAGS_UBSAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS $CFLAGS_UBSAN" + fi +else + if test "x$CFLAGS_ASAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -lasan" + fi + if test "x$CFLAGS_UBSAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -lubsan" + fi fi AC_SUBST(RUST_LINKER_OPTIONS)

1 0

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

21 Jun '18

commit 3b606ff787967d4f51af79deb8313210e4ca5754 Merge: 6c3ad4cae f91ea506f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:53:51 2018 -0400 Merge branch 'maint-0.3.4' into additional_rust_test_fixes src/common/util.c | 5 ++--- src/or/control.c | 5 ++--- src/or/geoip.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-)

1 0

[tor/release-0.3.4] Allow spaces in CCLD in linker.sh
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit e084afde80a844328a1eeef33d732e0f0a0d9eda Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 19:16:25 2018 -0400 Allow spaces in CCLD in linker.sh Hello71 spotted this first. --- link_rust.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/link_rust.sh.in b/link_rust.sh.in index 2b972fdf2..59f4142ba 100644 --- a/link_rust.sh.in +++ b/link_rust.sh.in @@ -7,4 +7,4 @@ # We'd like to remove the need for this, but build.rs doesn't let us pass # -static-libasan and -static-libubsan to the linker. -"$CCLD" @RUST_LINKER_OPTIONS@ "$@" +$CCLD @RUST_LINKER_OPTIONS@ "$@"

1 0

[tor/release-0.3.4] Add a leak suppression for backtrace_alloc
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit d110f9c9a684e2ab030a65b1366dfb0f037a8279 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 18:02:49 2018 -0400 Add a leak suppression for backtrace_alloc This appears to be an internal rust thing: I don't know why it's leaking. We should investigate further. --- src/test/include.am | 1 + src/test/rust_supp.txt | 1 + src/test/test_rust.sh | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index 4146de73b..4fe222b55 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -364,6 +364,7 @@ EXTRA_DIST += \ src/test/fuzz_static_testcases.sh \ src/test/slownacl_curve25519.py \ src/test/zero_length_keys.sh \ + src/test/rust_supp.txt \ src/test/test_keygen.sh \ src/test/test_key_expiration.sh \ src/test/test_zero_length_keys.sh \ diff --git a/src/test/rust_supp.txt b/src/test/rust_supp.txt new file mode 100644 index 000000000..7fa50f3fb --- /dev/null +++ b/src/test/rust_supp.txt @@ -0,0 +1 @@ +leak:backtrace_alloc diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4795258d0..b1eae7d5f 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,6 +3,7 @@ set -e +export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then @@ -16,5 +17,3 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do done exit $exitcode - -

1 0

[tor/release-0.3.4] eol@eof is still the law in 0.3.4 :(
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 8f3712cf6e02bb7e7a8ad9570fda3f6904c7d181 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 19:05:11 2018 -0400 eol@eof is still the law in 0.3.4 :( --- src/common/util.c | 1 + src/or/control.c | 1 + src/or/geoip.c | 1 + 3 files changed, 3 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 26b76c31f..dece5877f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5375,3 +5375,4 @@ tor_ntohll(uint64_t a) { return tor_htonll(a); } + diff --git a/src/or/control.c b/src/or/control.c index ae54689c0..bb68925f8 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7736,3 +7736,4 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ + diff --git a/src/or/geoip.c b/src/or/geoip.c index c66bee0fa..d59043a7f 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1884,3 +1884,4 @@ geoip_free_all(void) memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest)); } +

1 0

[tor/release-0.3.4] add build.rs to EXTRA_DIST
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 01d0bf180344b213b3bf43d8e40dc9c8e4990976 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 19:32:01 2018 -0400 add build.rs to EXTRA_DIST --- src/rust/include.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/include.am b/src/rust/include.am index 5fd9741e0..5e5b0b3fa 100644 --- a/src/rust/include.am +++ b/src/rust/include.am @@ -1,6 +1,7 @@ include src/rust/tor_rust/include.am EXTRA_DIST +=\ + src/rust/build.rs \ src/rust/Cargo.toml \ src/rust/Cargo.lock \ src/rust/.cargo/config.in \

1 0

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

21 Jun '18

commit 73bc863822bc58adaafc4017c25acaff0ecb43c1 Merge: c389c4129 01d0bf180 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 08:38:17 2018 -0400 Merge branch 'additional_rust_test_fixes' into maint-0.3.4 .gitignore | 2 + config.rust.in | 22 +++++ configure.ac | 29 ++++++ link_rust.sh.in | 10 +++ src/common/util.c | 1 + src/or/control.c | 1 + src/or/geoip.c | 1 + src/rust/build.rs | 179 +++++++++++++++++++++++++++++++++++++ src/rust/crypto/Cargo.toml | 2 +- src/rust/crypto/digests/sha2.rs | 23 +++-- src/rust/crypto/lib.rs | 3 +- src/rust/external/crypto_digest.rs | 10 ++- src/rust/include.am | 1 + src/test/include.am | 8 +- src/test/rust_supp.txt | 1 + src/test/test_rust.sh | 3 +- 16 files changed, 281 insertions(+), 15 deletions(-)

1 0

[tor/maint-0.3.4] Use different RUST_LINKER_OPTIONS for sanitizers
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 6c3ad4cae8b967f6dc9ee98f5b01de9e327e9880 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:53:09 2018 -0400 Use different RUST_LINKER_OPTIONS for sanitizers These appear to work for me. --- configure.ac | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f976cdd42..606bceeda 100644 --- a/configure.ac +++ b/configure.ac @@ -1128,11 +1128,20 @@ dnl What's more, we need to specify them in a linker script rather than dnl from build.rs: these options aren't allowed in the cargo:rustc-flags dnl variable. RUST_LINKER_OPTIONS="" -if test "x$CFLAGS_ASAN" != "x"; then - RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -static-libasan" -fi -if test "x$CFLAGS_UBSAN" != "x"; then - RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -static-libubsan" +if test "x$have_clang" = "xyes"; then + if test "x$CFLAGS_ASAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS $CFLAGS_ASAN" + fi + if test "x$CFLAGS_UBSAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS $CFLAGS_UBSAN" + fi +else + if test "x$CFLAGS_ASAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -lasan" + fi + if test "x$CFLAGS_UBSAN" != "x"; then + RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -lubsan" + fi fi AC_SUBST(RUST_LINKER_OPTIONS)

1 0

[tor/maint-0.3.4] Merge branch 'rust_build_script_v3' into additional_rust_test_fixes
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit e99ecf939936ed1e8fabbf2f30488d20389ecb7b Merge: 7589fd6d4 bd9ebb376 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:07:47 2018 -0400 Merge branch 'rust_build_script_v3' into additional_rust_test_fixes .gitignore | 2 + config.rust.in | 22 ++++++ configure.ac | 20 +++++ link_rust.sh.in | 10 +++ src/rust/build.rs | 179 +++++++++++++++++++++++++++++++++++++++++++++ src/rust/crypto/Cargo.toml | 2 +- src/test/include.am | 7 +- 7 files changed, 239 insertions(+), 3 deletions(-) diff --cc src/rust/crypto/Cargo.toml index 08b0832c9,9d302ee3b..869e0d625 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@@ -25,4 -26,4 +26,3 @@@ rand = { version = "=0.5.0-pre.2", defa rand_core = { version = "=0.2.0-pre.0", default-features = false } [features] - -testing = ["tor_log/testing"]

1 0