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

[tor/master] rust: Use tor_util::strings utils for protover_compute_for_old_tor.
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 6c77593a57d5a22a2fb3105d1466fb3ed26b1244 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 10 01:52:26 2018 +0000 rust: Use tor_util::strings utils for protover_compute_for_old_tor. --- src/rust/protover/ffi.rs | 16 +--------------- src/rust/protover/protover.rs | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 404b15838..c86fe7522 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -190,7 +190,6 @@ pub extern "C" fn protover_is_supported_here( #[no_mangle] pub extern "C" fn protover_compute_for_old_tor(version: *const c_char) -> *const c_char { let supported: &'static CStr; - let elder_protocols: &'static [u8]; let empty: &'static CStr; empty = empty_static_cstr(); @@ -208,19 +207,6 @@ pub extern "C" fn protover_compute_for_old_tor(version: *const c_char) -> *const Err(_) => return empty.as_ptr(), }; - elder_protocols = compute_for_old_tor(&version); - - // If we're going to pass it to C, there cannot be any intermediate NUL - // bytes. An assert is okay here, since changing the const byte slice - // in protover.rs to contain a NUL byte somewhere in the middle would be a - // programming error. - assert!(byte_slice_is_c_like(elder_protocols)); - - // It's okay to unwrap the result of this function because - // we can see that the bytes we're passing into it 1) are valid UTF-8, - // 2) have no intermediate NUL bytes, and 3) are terminated with a NUL - // byte. - supported = CStr::from_bytes_with_nul(elder_protocols).unwrap_or(empty); - + supported = compute_for_old_tor(&version); supported.as_ptr() } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index d354d8e25..e9fcdddd9 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -11,8 +11,6 @@ use std::collections::{HashMap, HashSet}; use std::ops::Range; use std::string::String; -use tor_util::strings::NUL_BYTE; - /// The first version of Tor that included "proto" entries in its descriptors. /// Authorities should use this to decide whether to guess proto lines. /// @@ -744,7 +742,7 @@ pub fn is_supported_here(proto: Proto, vers: Version) -> bool { /// /// # Returns /// -/// A `&'static [u8]` encoding a list of protocol names and supported +/// A `&'static CStr` encoding a list of protocol names and supported /// versions. The string takes the following format: /// /// "HSDir=1-1 LinkAuth=1" @@ -753,27 +751,29 @@ pub fn is_supported_here(proto: Proto, vers: Version) -> bool { /// only for tor versions older than FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS. /// /// C_RUST_COUPLED: src/rust/protover.c `compute_for_old_tor` -pub fn compute_for_old_tor(version: &str) -> &'static [u8] { +pub fn compute_for_old_tor(version: &str) -> &'static CStr { + let empty: &'static CStr = cstr!(""); + if c_tor_version_as_new_as(version, FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS) { - return NUL_BYTE; + return empty; } if c_tor_version_as_new_as(version, "0.2.9.1-alpha") { - return b"Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1-2 \ - Link=1-4 LinkAuth=1 Microdesc=1-2 Relay=1-2\0"; + return cstr!("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1-2 \ + Link=1-4 LinkAuth=1 Microdesc=1-2 Relay=1-2"); } if c_tor_version_as_new_as(version, "0.2.7.5") { - return b"Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 \ - Link=1-4 LinkAuth=1 Microdesc=1-2 Relay=1-2\0"; + return cstr!("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 \ + Link=1-4 LinkAuth=1 Microdesc=1-2 Relay=1-2"); } if c_tor_version_as_new_as(version, "0.2.4.19") { - return b"Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 \ - Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2\0"; + return cstr!("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 \ + Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2"); } - NUL_BYTE + empty } #[cfg(test)]

1 0

[tor/master] Merge remote-tracking branch 'isis/bug25185'
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit bda1dfb9e0a863ae1ec1230c23ed74837be01a35 Merge: acb7a536c a4797a7e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 15 20:35:30 2018 -0500 Merge remote-tracking branch 'isis/bug25185' src/rust/protover/ffi.rs | 34 +--------- src/rust/protover/lib.rs | 1 + src/rust/protover/protover.rs | 95 ++++++++++++++------------ src/rust/tor_util/strings.rs | 154 +++++++++++++++++++++++++++++------------- 4 files changed, 161 insertions(+), 123 deletions(-) diff --cc src/rust/protover/protover.rs index e5dc69b9a,e9fcdddd9..03776411c --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@@ -9,10 -10,7 +10,8 @@@ use std::fmt use std::collections::{HashMap, HashSet}; use std::ops::Range; use std::string::String; +use std::u32; - use tor_util::strings::NUL_BYTE; - /// The first version of Tor that included "proto" entries in its descriptors. /// Authorities should use this to decide whether to guess proto lines. /// @@@ -24,32 -22,8 +23,8 @@@ const FIRST_TOR_VERSION_TO_ADVERTISE_PR /// before concluding that someone is trying to DoS us /// /// C_RUST_COUPLED: src/or/protover.c `MAX_PROTOCOLS_TO_EXPAND` -const MAX_PROTOCOLS_TO_EXPAND: u32 = 500; +const MAX_PROTOCOLS_TO_EXPAND: usize = (1<<16); - /// Currently supported protocols and their versions, as a byte-slice. - /// - /// # Warning - /// - /// This byte-slice ends in a NUL byte. This is so that we can directly convert - /// it to an `&'static CStr` in the FFI code, in order to hand the static string - /// to C in a way that is compatible with C static strings. - /// - /// Rust code which wishes to accesses this string should use - /// `protover::get_supported_protocols()` instead. - /// - /// C_RUST_COUPLED: src/or/protover.c `protover_get_supported_protocols` - pub(crate) const SUPPORTED_PROTOCOLS: &'static [u8] = - b"Cons=1-2 \ - Desc=1-2 \ - DirCache=1-2 \ - HSDir=1-2 \ - HSIntro=3-4 \ - HSRend=1-2 \ - Link=1-5 \ - LinkAuth=1,3 \ - Microdesc=1-2 \ - Relay=1-2\0"; - /// Known subprotocols in Tor. Indicates which subprotocol a relay supports. /// /// C_RUST_COUPLED: src/or/protover.h `protocol_type_t`

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 799c82be70edaf67ea9904e426cde5213b16f4b7 Merge: 744399ea7 5f7d78ce2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 15 20:32:57 2018 -0500 Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3 src/test/test.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/maint-0.3.3] tests: Remove duplicate included header file in src/test/test.c.
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 5f7d78ce2af006e90eca46f12a9c2738469dfd51 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 16 01:19:12 2018 +0000 tests: Remove duplicate included header file in src/test/test.c. * FIXES #25271: https://bugs.torproject.org/25271 --- src/test/test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index 810cbafb1..4a9f0f570 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -62,7 +62,6 @@ double fabs(double x); #include "routerparse.h" #include "statefile.h" #include "crypto_curve25519.h" -#include "onion_ntor.h" /** Run unit tests for the onion handshake code. */ static void

1 0

[tor/master] Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 799c82be70edaf67ea9904e426cde5213b16f4b7 Merge: 744399ea7 5f7d78ce2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 15 20:32:57 2018 -0500 Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3 src/test/test.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/master] tests: Remove duplicate included header file in src/test/test.c.
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 5f7d78ce2af006e90eca46f12a9c2738469dfd51 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 16 01:19:12 2018 +0000 tests: Remove duplicate included header file in src/test/test.c. * FIXES #25271: https://bugs.torproject.org/25271 --- src/test/test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index 810cbafb1..4a9f0f570 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -62,7 +62,6 @@ double fabs(double x); #include "routerparse.h" #include "statefile.h" #include "crypto_curve25519.h" -#include "onion_ntor.h" /** Run unit tests for the onion handshake code. */ static void

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit acb7a536c2e140cd642a03a28ef02f619eb32ec5 Merge: a1dd8afc1 799c82be7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 15 20:33:00 2018 -0500 Merge branch 'maint-0.3.3' src/test/test.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 799c82be70edaf67ea9904e426cde5213b16f4b7 Merge: 744399ea7 5f7d78ce2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 15 20:32:57 2018 -0500 Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3 src/test/test.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/release-0.3.3] tests: Remove duplicate included header file in src/test/test.c.
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 5f7d78ce2af006e90eca46f12a9c2738469dfd51 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 16 01:19:12 2018 +0000 tests: Remove duplicate included header file in src/test/test.c. * FIXES #25271: https://bugs.torproject.org/25271 --- src/test/test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index 810cbafb1..4a9f0f570 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -62,7 +62,6 @@ double fabs(double x); #include "routerparse.h" #include "statefile.h" #include "crypto_curve25519.h" -#include "onion_ntor.h" /** Run unit tests for the onion handshake code. */ static void

1 0

[tor/master] Enable (safe) use of zstd static-only APIs
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 358b609e9dfd503cc25985d197a92610cbbe9f3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 6 10:34:41 2018 -0500 Enable (safe) use of zstd static-only APIs We'll only use these when the compile-time version and the run-time version of the zstd library match. Part of ticket 25162. --- changes/ticket25162 | 6 ++++++ src/common/compress_zstd.c | 36 ++++++++++++++++++++++++++++++++++++ src/common/compress_zstd.h | 6 ++++++ 3 files changed, 48 insertions(+) diff --git a/changes/ticket25162 b/changes/ticket25162 new file mode 100644 index 000000000..37019a7f8 --- /dev/null +++ b/changes/ticket25162 @@ -0,0 +1,6 @@ + o Minor features (compression, zstd): + - When running with zstd, Tor now considers using advanced functions that + the zstd maintainers have labeled as potentially unstable. To + prevent breakage, Tor will only use this functionality when + the runtime version of the zstd library matches the version + with which it were compiled. Closes ticket 25162. diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 0db87d61b..799448744 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -18,6 +18,13 @@ #include "compress.h" #include "compress_zstd.h" +/* This is a lie, but we make sure it doesn't get us in trouble by wrapping + * all invocations of zstd's static-only functions in a check to make sure + * that the compile-time version matches the run-time version. + * + * Note: Make sure that this file still builds with this macro disabled. */ +#define ZSTD_STATIC_LINKING_ONLY + #ifdef HAVE_ZSTD #include <zstd.h> #endif @@ -85,6 +92,26 @@ tor_zstd_get_header_version_str(void) #endif } +#ifdef TOR_UNIT_TESTS +static int static_apis_disable_for_testing = 0; +#endif + +/** Return true iff we can use the "static-only" APIs. */ +int +tor_zstd_can_use_static_apis(void) +{ +#if defined(ZSTD_STATIC_LINKING_ONLY) && defined(HAVE_ZSTD) +#ifdef TOR_UNIT_TESTS + if (static_apis_disable_for_testing) { + return 0; + } +#endif + return (ZSTD_VERSION_NUMBER == ZSTD_versionNumber()); +#else + return 0; +#endif +} + /** Internal Zstandard state for incremental compression/decompression. * The body of this struct is not exposed. */ struct tor_zstd_compress_state_t { @@ -440,3 +467,12 @@ tor_zstd_init(void) atomic_counter_init(&total_zstd_allocation); } +#ifdef TOR_UNIT_TESTS +/** Testing only: disable usage of static-only APIs, so we can make sure that + * we still work without them. */ +void +tor_zstd_set_static_apis_disabled_for_testing(int disabled) +{ + static_apis_disable_for_testing = disabled; +} +#endif diff --git a/src/common/compress_zstd.h b/src/common/compress_zstd.h index 9bca24ded..8882617c9 100644 --- a/src/common/compress_zstd.h +++ b/src/common/compress_zstd.h @@ -17,6 +17,8 @@ const char *tor_zstd_get_version_str(void); const char *tor_zstd_get_header_version_str(void); +int tor_zstd_can_use_static_apis(void); + /** Internal state for an incremental Zstandard compression/decompression. */ typedef struct tor_zstd_compress_state_t tor_zstd_compress_state_t; @@ -42,5 +44,9 @@ size_t tor_zstd_get_total_allocation(void); void tor_zstd_init(void); +#ifdef TOR_UNIT_TESTS +void tor_zstd_set_static_apis_disabled_for_testing(int disabled); +#endif + #endif /* !defined(TOR_COMPRESS_ZSTD_H) */

1 0