April 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/remove_old_libevent_autoconf_stuff'
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit c366e1fa322625fa96a9c7114bb63a002d016e27 Merge: 9b6e572 517e0f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 10:27:01 2015 -0400 Merge remote-tracking branch 'public/remove_old_libevent_autoconf_stuff' changes/deprecated-libevents | 3 ++ configure.ac | 16 +------- src/common/compat_libevent.c | 88 ++---------------------------------------- src/common/compat_libevent.h | 7 ---- src/or/config.c | 12 ------ 5 files changed, 8 insertions(+), 118 deletions(-)

1 0

[tor/master] Remove workarounds for Libevent < 1.3.
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 517e0f965bfafdcd798ccac7419e5c7da921dcd7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 16:59:05 2015 -0400 Remove workarounds for Libevent < 1.3. This actually lets us dump a lot of old cruft that nobody had (I hope!) tested in ages. Closes 15248. --- changes/deprecated-libevents | 3 ++ configure.ac | 16 +------- src/common/compat_libevent.c | 88 ++---------------------------------------- src/common/compat_libevent.h | 7 ---- src/or/config.c | 12 ------ 5 files changed, 8 insertions(+), 118 deletions(-) diff --git a/changes/deprecated-libevents b/changes/deprecated-libevents new file mode 100644 index 0000000..4ea0175 --- /dev/null +++ b/changes/deprecated-libevents @@ -0,0 +1,3 @@ + o New system requirements: + - Tor no longer includes workarounds for Libevent versions before 1.3e. + Libevent 2.0 or later is recommended. Closes ticket #15248. diff --git a/configure.ac b/configure.ac index e5e36d5..93893b3 100644 --- a/configure.ac +++ b/configure.ac @@ -439,15 +439,6 @@ AC_SUBST(TOR_LIB_WS32) AC_SUBST(TOR_LIB_GDI) AC_SUBST(TOR_LIB_IPHLPAPI) -dnl We need to do this before we try our disgusting hack below. -AC_CHECK_HEADERS([sys/types.h]) - -dnl This is a disgusting hack so we safely include older libevent headers. -AC_CHECK_TYPE(u_int64_t, unsigned long long) -AC_CHECK_TYPE(u_int32_t, unsigned long) -AC_CHECK_TYPE(u_int16_t, unsigned short) -AC_CHECK_TYPE(u_int8_t, unsigned char) - tor_libevent_pkg_redhat="libevent" tor_libevent_pkg_debian="libevent-dev" tor_libevent_devpkg_redhat="libevent-devel" @@ -488,13 +479,10 @@ save_CPPFLAGS="$CPPFLAGS" LIBS="-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $LIBS" LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS" -AC_CHECK_FUNCS([event_get_version \ - event_get_version_number \ - event_get_method \ - event_set_log_callback \ +AC_CHECK_FUNCS([event_get_version_number \ evutil_secure_rng_set_urandom_device_file \ evutil_secure_rng_init \ - event_base_loopexit]) + ]) AC_CHECK_MEMBERS([struct event.min_heap_idx], , , [#include <event.h> ]) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 15308dd..a366b6c 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -56,11 +56,6 @@ typedef uint32_t le_version_t; * it is. */ #define LE_OTHER V(0,0,99) -#if 0 -static le_version_t tor_get_libevent_version(const char **v_out); -#endif - -#if defined(HAVE_EVENT_SET_LOG_CALLBACK) || defined(RUNNING_DOXYGEN) /** A string which, if it appears in a libevent log, should be ignored. */ static const char *suppress_msg = NULL; /** Callback function passed to event_set_log() so we can intercept @@ -107,17 +102,6 @@ suppress_libevent_log_msg(const char *msg) { suppress_msg = msg; } -#else -void -configure_libevent_logging(void) -{ -} -void -suppress_libevent_log_msg(const char *msg) -{ - (void)msg; -} -#endif #ifndef HAVE_EVENT2_EVENT_H /** Work-alike replacement for event_new() on pre-Libevent-2.0 systems. */ @@ -275,19 +259,11 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) exit(1); } -#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD) /* Making this a NOTICE for now so we can link bugs to a libevent versions * or methods better. */ log_info(LD_GENERAL, "Initialized libevent version %s using method %s. Good.", event_get_version(), tor_libevent_get_method()); -#else - log_notice(LD_GENERAL, - "Initialized old libevent (version 1.0b or earlier)."); - log_warn(LD_GENERAL, - "You have a *VERY* old version of libevent. It is likely to be buggy; " - "please build Tor with a more recent version."); -#endif #ifdef USE_BUFFEREVENTS tor_libevent_set_tick_timeout(torcfg->msec_per_tick); @@ -301,27 +277,14 @@ tor_libevent_get_base, (void)) return the_event_base; } -#ifndef HAVE_EVENT_BASE_LOOPEXIT -/** Replacement for event_base_loopexit on some very old versions of Libevent - * that we are not yet brave enough to deprecate. */ -int -tor_event_base_loopexit(struct event_base *base, struct timeval *tv) -{ - tor_assert(base == the_event_base); - return event_loopexit(tv); -} -#endif - /** Return the name of the Libevent backend we're using. */ const char * tor_libevent_get_method(void) { #ifdef HAVE_EVENT2_EVENT_H return event_base_get_method(the_event_base); -#elif defined(HAVE_EVENT_GET_METHOD) - return event_get_method(); #else - return "<unknown>"; + return event_get_method(); #endif } @@ -376,54 +339,12 @@ le_versions_compatibility(le_version_t v) return 5; } -#if 0 -/** Return the version number of the currently running version of Libevent. - * See le_version_t for info on the format. - */ -static le_version_t -tor_get_libevent_version(const char **v_out) -{ - const char *v; - le_version_t r; -#if defined(HAVE_EVENT_GET_VERSION_NUMBER) - v = event_get_version(); - r = event_get_version_number(); -#elif defined (HAVE_EVENT_GET_VERSION) - v = event_get_version(); - r = tor_decode_libevent_version(v); -#else - v = "pre-1.0c"; - r = LE_OLD; -#endif - if (v_out) - *v_out = v; - return r; -} -#endif - /** Return a string representation of the version of the currently running * version of Libevent. */ const char * tor_libevent_get_version_str(void) { -#ifdef HAVE_EVENT_GET_VERSION return event_get_version(); -#else - return "pre-1.0c"; -#endif -} - -/** - * Compare the current Libevent method and version to a list of versions - * which are known not to work. Warn the user as appropriate. - */ -void -tor_check_libevent_version(const char *m, int server, - const char **badness_out) -{ - (void) m; - (void) server; - *badness_out = NULL; } #if defined(LIBEVENT_VERSION) @@ -452,7 +373,7 @@ tor_check_libevent_header_compatibility(void) /* In libevent versions before 2.0, it's hard to keep binary compatibility * between upgrades, and unpleasant to detect when the version we compiled * against is unlike the version we have linked against. Here's how. */ -#if defined(HEADER_VERSION) && defined(HAVE_EVENT_GET_VERSION) +#if defined(HEADER_VERSION) /* We have a header-file version and a function-call version. Easy. */ if (strcmp(HEADER_VERSION, event_get_version())) { le_version_t v1, v2; @@ -474,7 +395,7 @@ tor_check_libevent_header_compatibility(void) else log_info(LD_GENERAL, "I think these versions are binary-compatible."); } -#elif defined(HAVE_EVENT_GET_VERSION) +#else /* event_get_version but no _EVENT_VERSION. We might be in 1.4.0-beta or earlier, where that's normal. To see whether we were compiled with an earlier version, let's see whether the struct event defines MIN_HEAP_IDX. @@ -504,9 +425,6 @@ tor_check_libevent_header_compatibility(void) } #endif -#elif defined(HEADER_VERSION) -#warn "_EVENT_VERSION is defined but not get_event_version(): Libevent is odd." -#else /* Your libevent is ancient. */ #endif } diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 6bbfae0..39181ef 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -52,12 +52,7 @@ periodic_timer_t *periodic_timer_new(struct event_base *base, void *data); void periodic_timer_free(periodic_timer_t *); -#ifdef HAVE_EVENT_BASE_LOOPEXIT #define tor_event_base_loopexit event_base_loopexit -#else -struct timeval; -int tor_event_base_loopexit(struct event_base *base, struct timeval *tv); -#endif /** Defines a configuration for using libevent with Tor: passed as an argument * to tor_libevent_initialize() to describe how we want to set up. */ @@ -74,8 +69,6 @@ typedef struct tor_libevent_cfg { void tor_libevent_initialize(tor_libevent_cfg *cfg); MOCK_DECL(struct event_base *, tor_libevent_get_base, (void)); const char *tor_libevent_get_method(void); -void tor_check_libevent_version(const char *m, int server, - const char **badness_out); void tor_check_libevent_header_compatibility(void); const char *tor_libevent_get_version_str(void); const char *tor_libevent_get_header_version_str(void); diff --git a/src/or/config.c b/src/or/config.c index fca350c..085c640 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6695,7 +6695,6 @@ get_num_cpus(const or_options_t *options) static void init_libevent(const or_options_t *options) { - const char *badness=NULL; tor_libevent_cfg cfg; tor_assert(options); @@ -6716,17 +6715,6 @@ init_libevent(const or_options_t *options) tor_libevent_initialize(&cfg); suppress_libevent_log_msg(NULL); - - tor_check_libevent_version(tor_libevent_get_method(), - server_mode(get_options()), - &badness); - if (badness) { - const char *v = tor_libevent_get_version_str(); - const char *m = tor_libevent_get_method(); - control_event_general_status(LOG_WARN, - "BAD_LIBEVENT VERSION=%s METHOD=%s BADNESS=%s RECOVERED=NO", - v, m, badness); - } } /** Return a newly allocated string holding a filename relative to the data

1 0

[tor/master] Integrate zero_length_keys test into the automake test suite.
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 21e242530783f9f71bad3e94f6482ac100c710e8 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 5 09:03:06 2015 +0100 Integrate zero_length_keys test into the automake test suite. The zero length keys test now requires the path to the Tor binary as the first parameter to ensure the correct Tor binary is used without hard coding a path. The wrapper script calls the zero length keys test for each test separately to ensure the correct shell is used (as configured by autoconf). Another solution would have been to place the tests into separate functions so multiple tests could be run internally. This would have made a diff of considerable size and frankly it is outside the scope of this fix. --- .gitignore | 1 + configure.ac | 1 + src/test/include.am | 7 +++++-- src/test/test_zero_length_keys.sh.in | 10 ++++++++++ src/test/zero_length_keys.sh | 20 +++++++++++++------- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 912b06e..5fc000f 100644 --- a/.gitignore +++ b/.gitignore @@ -174,6 +174,7 @@ cscope.* /src/test/test-child.exe /src/test/test-ntor-cl.exe /src/test/test_workqueue.exe +/src/test/test_zero_length_keys.sh # /src/tools/ /src/tools/tor-checkkey diff --git a/configure.ac b/configure.ac index 2c9c7a3..32afc1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ AC_CONFIG_FILES([ src/config/torrc.minimal scripts/maint/checkOptionDocs.pl scripts/maint/updateVersions.pl + src/test/test_zero_length_keys.sh ]) if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then diff --git a/src/test/include.am b/src/test/include.am index c857ec2..eba13ab 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,4 +1,8 @@ -TESTS += src/test/test src/test/test-slow src/test/test-memwipe +TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ + src/test/test_zero_length_keys.sh + +TEST_EXTENSIONS = .sh +SH_LOG_COMPILER = $(SHELL) noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED @@ -170,7 +174,6 @@ if USEPYTHON $(top_builddir)/src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py $(top_builddir)/src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py endif - $(SHELL) $(top_srcdir)/src/test/zero_length_keys.sh EXTRA_DIST += \ src/test/bt_test.py \ diff --git a/src/test/test_zero_length_keys.sh.in b/src/test/test_zero_length_keys.sh.in new file mode 100644 index 0000000..47467ba --- /dev/null +++ b/src/test/test_zero_length_keys.sh.in @@ -0,0 +1,10 @@ +#!/bin/sh +# Check that tor regenerates keys when key files are zero-length + +exitcode=0 + +@SHELL@ @abs_top_srcdir@/src/test/zero_length_keys.sh "@builddir@/src/or/tor" -z || exitcode=1 +@SHELL@ @abs_top_srcdir@/src/test/zero_length_keys.sh "@builddir@/src/or/tor" -d || exitcode=1 +@SHELL@ @abs_top_srcdir@/src/test/zero_length_keys.sh "@builddir@/src/or/tor" -e || exitcode=1 + +exit ${exitcode} diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index 2fd11d3..3c61f8d 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -3,13 +3,13 @@ # Test for bug #13111 - Tor fails to start if onion keys are zero length # # Usage: -# ./zero_length_keys.sh +# ./zero_length_keys.sh PATH_TO_TOR # Run all the tests below -# ./zero_length_keys.sh -z +# ./zero_length_keys.sh PATH_TO_TOR -z # Check tor will launch and regenerate zero-length keys -# ./zero_length_keys.sh -d +# ./zero_length_keys.sh PATH_TO_TOR -d # Check tor regenerates deleted keys (existing behaviour) -# ./zero_length_keys.sh -e +# ./zero_length_keys.sh PATH_TO_TOR -e # Check tor does not overwrite existing keys (existing behaviour) # # Exit Statuses: @@ -19,10 +19,16 @@ # 3: a command failed - the test could not be completed # -if [ $# -lt 1 ]; then +if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then + echo "Usage: ${0} PATH_TO_TOR [-z|-d|-e]" + exit 1 +elif [ $# -eq 1 ]; then echo "Testing that tor correctly handles zero-length keys" - "$0" -z && "$0" -d && "$0" -e + "$0" "${1}" -z && "$0" "${1}" -d && "$0" "${1}" -e exit $? +else #[$# -gt 1 ]; then + TOR_BINARY="${1}" + shift fi DATA_DIR=`mktemp -d -t tor_zero_length_keys.XXXXXX` @@ -40,7 +46,7 @@ touch "$DATA_DIR"/empty_torrc # DisableNetwork means that the ORPort won't actually be opened. # 'ExitRelay 0' suppresses a warning. -TOR="./src/or/tor --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc" +TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc" if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then

1 0

[tor/master] Integrate ntor test into the automake test suite.
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit c535494238cee580acaa6debe2eb942bb90ea59d Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 5 10:43:12 2015 +0100 Integrate ntor test into the automake test suite. --- .gitignore | 1 + configure.ac | 1 + src/test/include.am | 6 ++++-- src/test/test_ntor.sh.in | 9 +++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5fc000f..da5fc47 100644 --- a/.gitignore +++ b/.gitignore @@ -175,6 +175,7 @@ cscope.* /src/test/test-ntor-cl.exe /src/test/test_workqueue.exe /src/test/test_zero_length_keys.sh +/src/test/test_ntor.sh # /src/tools/ /src/tools/tor-checkkey diff --git a/configure.ac b/configure.ac index 32afc1b..184211b 100644 --- a/configure.ac +++ b/configure.ac @@ -1663,6 +1663,7 @@ AC_CONFIG_FILES([ scripts/maint/checkOptionDocs.pl scripts/maint/updateVersions.pl src/test/test_zero_length_keys.sh + src/test/test_ntor.sh ]) if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then diff --git a/src/test/include.am b/src/test/include.am index eba13ab..0ed3cb3 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,6 +1,10 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ src/test/test_zero_length_keys.sh +if USEPYTHON +TESTS += src/test/test_ntor.sh +endif + TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) @@ -169,8 +173,6 @@ src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) if USEPYTHON - $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py test-tor - $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py self-test $(top_builddir)/src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py $(top_builddir)/src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py endif diff --git a/src/test/test_ntor.sh.in b/src/test/test_ntor.sh.in new file mode 100644 index 0000000..5fea8ce --- /dev/null +++ b/src/test/test_ntor.sh.in @@ -0,0 +1,9 @@ +#!/bin/sh +# Validate Tor's ntor implementation. + +exitcode=0 + +@PYTHON@ @abs_top_srcdir@/src/test/ntor_ref.py test-tor || exitcode=1 +@PYTHON@ @abs_top_srcdir@/src/test/ntor_ref.py self-test || exitcode=1 + +exit ${exitcode}

1 0

[tor/master] Integrate backtrace test into the automake test suite.
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 0e89abfa73ee8494f1e654823ab68282858038b0 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Mar 5 11:05:17 2015 +0100 Integrate backtrace test into the automake test suite. For this to work bt_test.py now returns an exit code indicating success or failure. Additionally, check-local and its specific dependencies are now obsolete so they are removed. --- .gitignore | 1 + configure.ac | 1 + src/test/bt_test.py | 4 ++-- src/test/include.am | 16 +--------------- src/test/test_bt.sh.in | 9 +++++++++ 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index da5fc47..6139201 100644 --- a/.gitignore +++ b/.gitignore @@ -176,6 +176,7 @@ cscope.* /src/test/test_workqueue.exe /src/test/test_zero_length_keys.sh /src/test/test_ntor.sh +/src/test/test_bt.sh # /src/tools/ /src/tools/tor-checkkey diff --git a/configure.ac b/configure.ac index 184211b..098a15c 100644 --- a/configure.ac +++ b/configure.ac @@ -1664,6 +1664,7 @@ AC_CONFIG_FILES([ scripts/maint/updateVersions.pl src/test/test_zero_length_keys.sh src/test/test_ntor.sh + src/test/test_bt.sh ]) if test x$asciidoc = xtrue && test "$ASCIIDOC" = "none" ; then diff --git a/src/test/bt_test.py b/src/test/bt_test.py index 0afe797..e694361 100755 --- a/src/test/bt_test.py +++ b/src/test/bt_test.py @@ -36,7 +36,7 @@ LINES = sys.stdin.readlines() for I in range(len(LINES)): if matches(LINES[I:], FUNCNAMES): print("OK") - break + sys.exit(0) else: print("BAD") - + sys.exit(1) diff --git a/src/test/include.am b/src/test/include.am index 0ed3cb3..3c9eed8 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -2,7 +2,7 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ src/test/test_zero_length_keys.sh if USEPYTHON -TESTS += src/test/test_ntor.sh +TESTS += src/test/test_ntor.sh src/test/test_bt.sh endif TEST_EXTENSIONS = .sh @@ -154,13 +154,6 @@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ -I"$(top_srcdir)/src/or" -NTOR_TEST_DEPS=src/test/test-ntor-cl - -if COVERAGE_ENABLED -CMDLINE_TEST_TOR = $(top_builddir)/src/or/tor-cov -else -CMDLINE_TEST_TOR = $(top_builddir)/src/or/tor -endif noinst_PROGRAMS += src/test/test-bt-cl src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c @@ -170,13 +163,6 @@ src_test_test_bt_cl_LDADD = src/common/libor-testing.a \ src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) - -check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) -if USEPYTHON - $(top_builddir)/src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py - $(top_builddir)/src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py -endif - EXTRA_DIST += \ src/test/bt_test.py \ src/test/ntor_ref.py \ diff --git a/src/test/test_bt.sh.in b/src/test/test_bt.sh.in new file mode 100644 index 0000000..d249875 --- /dev/null +++ b/src/test/test_bt.sh.in @@ -0,0 +1,9 @@ +#!/bin/sh +# Test backtrace functionality. + +exitcode=0 + +@builddir@/src/test/test-bt-cl assert | @PYTHON@ @abs_top_srcdir@/src/test/bt_test.py || exitcode=1 +@builddir@/src/test/test-bt-cl crash | @PYTHON@ @abs_top_srcdir@/src/test/bt_test.py || exitcode=1 + +exit ${exitcode}

1 0

[tor/master] Add changes file for 15344.
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit d54b17f479e6114f7443f8f62cac9323251e370a Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Mar 18 16:45:48 2015 +0100 Add changes file for 15344. --- changes/feature15344 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/feature15344 b/changes/feature15344 new file mode 100644 index 0000000..3bd640a --- /dev/null +++ b/changes/feature15344 @@ -0,0 +1,3 @@ + o Minor features (testing): + - Integrate the ntor, backtrace and zero lengths keys tests into the + automake test suite. Closes ticket 15344.

1 0

[tor/master] Fix crash-test for assertion failure
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 9b6e57290fad73d968d12398c018f16b345f2c23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 10:25:16 2015 -0400 Fix crash-test for assertion failure When we made assertions not get compiled in for the coverage case, we missed one case where, for our tests, we really DO want to have an assertion fail: the backtrace test. Bugfix on 1228dd293b60a8eaab03472fa29428c5e2752c44; bug not in any released tor --- src/test/test_bt_cl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 0fa0cd5..01c621e 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -5,6 +5,8 @@ #include <stdio.h> #include <stdlib.h> +/* To prevent 'assert' from going away. */ +#undef TOR_COVERAGE #include "or.h" #include "util.h" #include "backtrace.h"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 23 Apr '15

23 Apr '15

commit cc3b2327ce9958eacde6774bef8ee689866e7229 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 23 14:15:21 2015 +0000 Update translations for tails-greeter --- hr/hr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/hr.po b/hr/hr.po index 4212228..a629a6d 100644 --- a/hr/hr.po +++ b/hr/hr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2015-04-23 13:33+0000\n" +"PO-Revision-Date: 2015-04-23 13:52+0000\n" "Last-Translator: 0Ensó0 <zelena990(a)gmail.com>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/torproject/language/hr/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Stop modifying const argument in handle_control_postdescriptor
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit d59c4063f393774c2c4328061b1e47c7dbb0250c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 10:47:50 2015 -0400 Stop modifying const argument in handle_control_postdescriptor Fixes 15546. --- changes/bug15546 | 4 ++++ src/or/control.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/bug15546 b/changes/bug15546 new file mode 100644 index 0000000..b33b0aa --- /dev/null +++ b/changes/bug15546 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - For correctness, avoid modifying a constant string in + handle_control_postdescriptor. Fixes bug 15546; bugfix on + 0.1.1.16-rc. \ No newline at end of file diff --git a/src/or/control.c b/src/or/control.c index 5ec97bd..9b0981d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2733,12 +2733,14 @@ handle_control_postdescriptor(control_connection_t *conn, uint32_t len, uint8_t purpose = ROUTER_PURPOSE_GENERAL; int cache = 0; /* eventually, we may switch this to 1 */ - char *cp = memchr(body, '\n', len); + const char *cp = memchr(body, '\n', len); smartlist_t *args = smartlist_new(); tor_assert(cp); - *cp++ = '\0'; + ++cp; - smartlist_split_string(args, body, " ", + char *cmdline = tor_memdup_nulterm(body, cp-body); + + smartlist_split_string(args, cmdline, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH_BEGIN(args, char *, option) { if (!strcasecmpstart(option, "purpose=")) { @@ -2787,6 +2789,7 @@ handle_control_postdescriptor(control_connection_t *conn, uint32_t len, done: SMARTLIST_FOREACH(args, char *, arg, tor_free(arg)); smartlist_free(args); + tor_free(cmdline); return 0; }

1 0

[tor/master] Merge remote-tracking branch 'public/bug15546'
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 372aef8981f383db8962fbbe67f4d18b56d3740d Merge: c389447 d59c406 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 09:50:29 2015 -0400 Merge remote-tracking branch 'public/bug15546' changes/bug15546 | 4 ++++ src/or/control.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-)

1 0