tor-commits July 2018

tor-commits@lists.torproject.org

17 participants
1737 discussions

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 9e247ac271b849d1f627d9d8c8d3815b77f8f975 Merge: c31700d66 78386d8cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:39:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_bt.sh | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 78386d8cdd67ca9c00e77d5d8e6604c0841a7098 Merge: 559f79fd7 501deba8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:39:10 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 src/test/test_bt.sh | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit e0f99404f552e047b268c6c47691143a1491ec72 Merge: 9e247ac27 312a42fc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:39:25 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26787 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 312a42fc854a732d5f0fe4d5dcc1f567c2e069f4 Merge: 78386d8cd 93da2cae4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:39:25 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26787 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.3.3] Changes file for bug 26787
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 93da2cae49d0f3fbcf1c05932b76b2e6bd15017a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:39:22 2018 -0400 Changes file for bug 26787 --- changes/bug26787 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26787 b/changes/bug26787 new file mode 100644 index 000000000..b32e519a9 --- /dev/null +++ b/changes/bug26787 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Disable core dumps in test_bt.sh, to avoid failures in "make + distcheck". Fixes bug 26787; bugfix on 0.2.5.2-alpha.

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket26702-atomically'
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit c43e81a5a3afb9d1ed9808104672b3954cdd7005 Merge: 42c02097d 08b82409d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:30:11 2018 -0400 Merge remote-tracking branch 'teor/ticket26702-atomically' doc/tor.1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] doc: Explain how to avoid inconsistent reads on V3BandwidthsFile
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 08b82409d462bae454b073a9913f199b4c75ed3b Author: teor <teor2345(a)gmail.com> Date: Wed Jul 18 11:14:18 2018 +1000 doc: Explain how to avoid inconsistent reads on V3BandwidthsFile Closes 26702. --- doc/tor.1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f42ad0dd3..1db8cabf8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2747,7 +2747,9 @@ on the public Tor network. [[V3BandwidthsFile]] **V3BandwidthsFile** __FILENAME__:: V3 authoritative directories only. Configures the location of the bandwidth-authority generated file storing information on relays' measured - bandwidth capacities. (Default: unset) + bandwidth capacities. To avoid inconsistent reads, bandwidth data should + be written to temporary file, then renamed to the configured filename. + (Default: unset) [[V3AuthUseLegacyKey]] **V3AuthUseLegacyKey** **0**|**1**:: If set, the directory authority will sign consensuses not only with its

1 0

[tor/master] Use the "testing" variant of several C libraries in build.rs
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 0c4c5eeb55b7e1f5e3f5073ad28b90aab75ebc16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:18:25 2018 -0400 Use the "testing" variant of several C libraries in build.rs --- src/rust/build.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rust/build.rs b/src/rust/build.rs index 2cf85b404..3c6089326 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -149,14 +149,14 @@ pub fn main() { // tor uses. We must be careful with factoring and dependencies // moving forward! cfg.component("tor-crypt-ops-testing"); - cfg.component("tor-sandbox"); + cfg.component("tor-sandbox-testing"); cfg.component("tor-encoding-testing"); - cfg.component("tor-net"); + cfg.component("tor-net-testing"); cfg.component("tor-thread-testing"); cfg.component("tor-memarea-testing"); - cfg.component("tor-log"); - cfg.component("tor-lock"); - cfg.component("tor-fdio"); + cfg.component("tor-log-testing"); + cfg.component("tor-lock-testing"); + cfg.component("tor-fdio-testing"); cfg.component("tor-container-testing"); cfg.component("tor-smartlist-core-testing"); cfg.component("tor-string-testing");

1 0

[tor/master] Add two more dependencies in build.rs
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 42c02097db1dd791d2bd8af78f91658589cf4988 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 16:20:31 2018 -0400 Add two more dependencies in build.rs --- src/rust/build.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rust/build.rs b/src/rust/build.rs index 3c6089326..2ac24b334 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -151,6 +151,8 @@ pub fn main() { cfg.component("tor-crypt-ops-testing"); cfg.component("tor-sandbox-testing"); cfg.component("tor-encoding-testing"); + cfg.component("tor-fs-testing"); + cfg.component("tor-time-testing"); cfg.component("tor-net-testing"); cfg.component("tor-thread-testing"); cfg.component("tor-memarea-testing");

1 0

[tor/master] rust: Add "test-c-from-rust" feature-gate.
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 508332feaf99ada12037c3a7fa77eab8516bb69e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 18 18:57:38 2018 +0000 rust: Add "test-c-from-rust" feature-gate. Due to linker issues (#25386) when testing Rust code which calls C, all tests which touch FFI code should now be feature-gated behind the "test-c-from-rust" flag. To run this test code, cargo must be called with `cargo test --features="test-c-from-rust"`. * FIXES #26398: https://bugs.torproject.org/26398 --- src/rust/Cargo.toml | 9 +++++++++ src/rust/crypto/Cargo.toml | 4 ++++ src/rust/crypto/digests/sha2.rs | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index c3e44d2a7..4bbadbe53 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -14,3 +14,12 @@ members = [ debug = true panic = "abort" +[features] +default = [] +# If this feature is enabled, test code which calls Tor C code from Rust will +# execute with `cargo test`. Due to numerous linker issues (#25386), this is +# currently disabled by default. Crates listed here are those which, in their +# unittests, doctests, and/or integration tests, call C code. +test-c-from-rust = [ + "crypto/test-c-from-rust", +] diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index c0c5e7bf9..c31c8e185 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -26,4 +26,8 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false } [features] testing = ["tor_log/testing"] +# If this feature is enabled, test code which calls Tor C code from Rust will +# execute with `cargo test`. Due to numerous linker issues (#25386), this is +# currently disabled by default. +test-c-from-rust = [] diff --git a/src/rust/crypto/digests/sha2.rs b/src/rust/crypto/digests/sha2.rs index 1cbb6c581..bb610ed9e 100644 --- a/src/rust/crypto/digests/sha2.rs +++ b/src/rust/crypto/digests/sha2.rs @@ -165,15 +165,19 @@ impl FixedOutput for Sha512 { #[cfg(test)] mod test { + #[cfg(feature = "test-c-from-rust")] use digest::Digest; + #[cfg(feature = "test-c-from-rust")] use super::*; + #[cfg(feature = "test-c-from-rust")] #[test] fn sha256_default() { let _: Sha256 = Sha256::default(); } + #[cfg(feature = "test-c-from-rust")] #[test] fn sha256_digest() { let mut h: Sha256 = Sha256::new(); @@ -190,11 +194,13 @@ mod test { assert_eq!(&result[..], &b"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"[..]); } + #[cfg(feature = "test-c-from-rust")] #[test] fn sha512_default() { let _: Sha512 = Sha512::default(); } + #[cfg(feature = "test-c-from-rust")] #[test] fn sha512_digest() { let mut h: Sha512 = Sha512::new();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2018