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

[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

[tor/master] Add configure option to control ZSTD_STATIC_LINKING_ONLY
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit a03488954c15b2fe2643d19c5530d9c927665b6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 6 11:58:05 2018 -0500 Add configure option to control ZSTD_STATIC_LINKING_ONLY --- configure.ac | 6 ++++++ src/common/compress_zstd.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3cb187b0e..2063e9a83 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,8 @@ AC_ARG_ENABLE(cargo-online-mode, AS_HELP_STRING(--enable-cargo-online-mode, [Allow cargo to make network requests to fetch crates. For builds with rust only.])) AC_ARG_ENABLE(restart-debugging, AS_HELP_STRING(--enable-restart-debugging, [Build Tor with support for debugging in-process restart. Developers only.])) +AC_ARG_ENABLE(zstd-advanced-apis, + AS_HELP_STRING(--disable-zstd-advanced-apis, [Build without support for zstd's "static-only" APIs.])) if test "x$enable_coverage" != "xyes" -a "x$enable_asserts_in_tests" = "xno" ; then AC_MSG_ERROR([Can't disable assertions outside of coverage build]) @@ -114,6 +116,10 @@ if test "$enable_restart_debugging" = "yes"; then [Defined if we're building with support for in-process restart debugging.]) fi +if test "$enable_zstd_advanced_apis" != "no"; then + AC_DEFINE(ENABLE_ZSTD_ADVANCED_APIS, 1, + [Defined if we're going to try to use zstd's "static-only" APIs.]) +fi # systemd support if test "x$enable_systemd" = "xno"; then diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 96906efb9..0c3e7104f 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -18,12 +18,12 @@ #include "compress.h" #include "compress_zstd.h" +#ifdef ENABLE_ZSTD_ADVANCED_APIS /* 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. */ + * that the compile-time version matches the run-time version. */ #define ZSTD_STATIC_LINKING_ONLY +#endif #ifdef HAVE_ZSTD #include <zstd.h> @@ -499,7 +499,7 @@ tor_zstd_init(void) void tor_zstd_warn_if_version_mismatched(void) { -#ifdef HAVE_ZSTD +#if defined(HAVE_ZSTD) && defined(ENABLE_ZSTD_ADVANCED_APIS) if (! tor_zstd_can_use_static_apis()) { char header_version[VERSION_STR_MAX_LEN]; char runtime_version[VERSION_STR_MAX_LEN];

1 0