- tor-commits - lists.torproject.org

[tor/release-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit daeaa9ff04f53cea00c5fbb305e92df771ee9114 Merge: ab4c6b6 93be3a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 13:34:20 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3 Makefile.am | 33 +++++++++++++-------------- changes/bug6043 | 6 +++++ changes/bug6480 | 5 ++++ changes/bug6490 | 4 +++ changes/bug6500 | 2 + changes/bug6530 | 5 ++++ changes/pathsel-BUGGY-a | 14 +++++++++++ doc/tor-rpm-creation.txt | 56 +++++++++++++++++++++++++++++++++++---------- doc/tor.1.txt | 4 +- doc/torify.1.txt | 2 +- src/or/config.c | 29 +++++++++++++++++++++++ src/or/dns.c | 30 ++++++++++++++---------- src/or/routerlist.c | 31 +++++++++++++++++++------ src/or/routerparse.c | 2 +- tor.spec.in | 27 +++++++++++++--------- 15 files changed, 185 insertions(+), 65 deletions(-)

1 0

[tor/release-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit 93be3a8822ae791cc8adb78ea7d7e76e4c10db41 Merge: 82c5e38 d48cebc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 12:04:11 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/or/routerlist.c changes/pathsel-BUGGY-a | 14 ++++++++++++++ src/or/routerlist.c | 24 +++++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --cc src/or/routerlist.c index 37de70f,30c20bf..4979b93 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -1905,11 -1879,15 +1912,13 @@@ smartlist_choose_node_by_bandwidth_weig * guard node: consider all guard's bandwidth equally. Otherwise, weight * guards proportionally less. */ -static void * -smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule, - int statuses) +static const node_t * +smartlist_choose_node_by_bandwidth(smartlist_t *sl, + bandwidth_weight_rule_t rule) { - unsigned i; + unsigned int i; + unsigned int i_chosen; + unsigned int i_has_been_chosen; - routerinfo_t *router; - routerstatus_t *status=NULL; int32_t *bandwidths; int is_exit; int is_guard;

1 0

[tor/release-0.2.3] Try to clarify impact of bug 6537
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit d48cebc5e498b0ae673635f40fc57cdddab45d5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 11:54:11 2012 -0400 Try to clarify impact of bug 6537 I don't personally agree that this is likely to be easy to exploit, and some initial experimention I've done suggests that cache-miss times are just plain too fast to get useful info out of when they're mixed up with the rest of Tor's timing noise. Nevertheless, I'm leaving Robert's initial changelog entry in the git history so that he can be the voice of reason if I'm wrong. :) --- changes/pathsel-BUGGY-a | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/changes/pathsel-BUGGY-a b/changes/pathsel-BUGGY-a index cad2af5..2e642c7 100644 --- a/changes/pathsel-BUGGY-a +++ b/changes/pathsel-BUGGY-a @@ -3,10 +3,12 @@ - Try to leak less information about what relays a client is choosing to a side-channel attacker. Previously, a Tor client would stop iterating through the list of available relays as - soon as it had chosen one, thus leaking information about which - relays it picked for a circuit to a timing attack. (Tor is - likely to still leak information about which relays it has - chosen for a circuit to other processes on the same computer, - through e.g. which cache lines it loads while building the - circuit.) - + soon as it had chosen one, thus finishing a little earlier + when it picked a router earlier in the list. If an attacker + can recover this timing information (nontrivial but not + proven to be impossible), they could learn some coarse- + grained information about which relays a client was picking + (middle nodes in particular are likelier to be affected than + exits). The timing attack might be mitigated by other factors + (see bug #6537 for some discussion), but it's best not to + take chances. Fixes bug 6537; bugfix on 0.0.8rc1.

1 0

[tor/release-0.2.3] Fix some manpage typos
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit d9bd0de0628ff3ac9d84409315ad6df38981f019 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 10:16:03 2012 -0400 Fix some manpage typos This is based on a pair of patches from A. Costa. I couldn't apply those directly, since they changed the generated *roff files, not the asciidoc source. Fixes Tor bug 6500 and Debian bug 683359. --- changes/bug6500 | 2 ++ doc/tor.1.txt | 4 ++-- doc/torify.1.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug6500 b/changes/bug6500 new file mode 100644 index 0000000..cac2054 --- /dev/null +++ b/changes/bug6500 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - Fix some typos in the manpages. Patch from A. Costa. Fixes bug 6500. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 78c3487..e7ba848 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -169,7 +169,7 @@ GENERAL OPTIONS duty of that proxy to properly forward the traffic to the bridge. + + In its second form, when set along with a corresponding Bridge line, the Tor - client launches the pluggable transport proxy exacutable in + client launches the pluggable transport proxy executable in __path-to-binary__ using __options__ as its command-line options, and forwards its traffic to it. It's the duty of that proxy to properly forward the traffic to the bridge. @@ -1709,7 +1709,7 @@ DIRECTORY AUTHORITY SERVER OPTIONS **V3BandwidthsFile** __FILENAME__:: V3 authoritative directories only. Configures the location of the - bandiwdth-authority generated file storing information on relays' measured + bandwidth-authority generated file storing information on relays' measured bandwidth capacities. (Default: unset) **V3AuthUseLegacyKey** **0**|**1**:: diff --git a/doc/torify.1.txt b/doc/torify.1.txt index ca2c385..4a4be12 100644 --- a/doc/torify.1.txt +++ b/doc/torify.1.txt @@ -21,7 +21,7 @@ DESCRIPTION wrapper available on a system. It calls torsocks or tsocks with a tor specific configuration file. + -torsocks is an improved wrapper that explictly rejects UDP, safely resolves DNS +torsocks is an improved wrapper that explicitly rejects UDP, safely resolves DNS lookups and properly socksifies your TCP connections. + tsocks itself is a wrapper between the tsocks library and the application that

1 0

[tor/release-0.2.3] Merge branch 'bug6490_v2' into maint-0.2.3
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit aed93f8ad918787ea787061106bcd5289c712823 Merge: d9bd0de 2bd4521 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 10:28:43 2012 -0400 Merge branch 'bug6490_v2' into maint-0.2.3 changes/bug6490 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.3] Warn when accounting is used in a way likely to link hidden services
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit 2bd45213c991df62bf184758c5e8222685bda1ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 11:58:55 2012 -0400 Warn when accounting is used in a way likely to link hidden services Fix for 6490. --- changes/bug6490 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/changes/bug6490 b/changes/bug6490 new file mode 100644 index 0000000..c92daad --- /dev/null +++ b/changes/bug6490 @@ -0,0 +1,4 @@ + o Minor features: + - Warn when Tor is configured to use accounting in a way that will + link a hidden service to some other hidden service or public + address. Fix for bug 6490. diff --git a/src/or/config.c b/src/or/config.c index 918efd4..a369297 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -594,6 +594,7 @@ static void option_reset(const config_format_t *fmt, or_options_t *options, const config_var_t *var, int use_defaults); static void config_free(const config_format_t *fmt, void *options); static int config_lines_eq(config_line_t *a, config_line_t *b); +static int config_count_key(const config_line_t *a, const char *key); static int option_is_same(const config_format_t *fmt, const or_options_t *o1, const or_options_t *o2, const char *name); @@ -3066,6 +3067,20 @@ config_lines_eq(config_line_t *a, config_line_t *b) return 1; } +/** Return the number of lines in a whose key is key. */ +static int +config_count_key(const config_line_t *a, const char *key) +{ + int n = 0; + while (a) { + if (!strcasecmp(a->key, key)) { + ++n; + } + a = a->next; + } + return n; +} + /** Return true iff the option name has the same value in o1 * and o2. Must not be called for LINELIST_S or OBSOLETE options. */ @@ -3848,6 +3863,20 @@ options_validate(or_options_t *old_options, or_options_t *options, if (accounting_parse_options(options, 1)<0) REJECT("Failed to parse accounting options. See logs for details."); + if (options->AccountingMax) { + if (options->RendConfigLines && server_mode(options)) { + log_warn(LD_CONFIG, "Using accounting with a hidden service and an " + "ORPort is risky: your hidden service(s) and your public " + "address will all turn off at the same time, which may alert " + "observers that they are being run by the same party."); + } else if (config_count_key(options->RendConfigLines, + "HiddenServiceDir") > 1) { + log_warn(LD_CONFIG, "Using accounting with multiple hidden services is " + "risky: they will all turn off at the same time, which may " + "alert observers that they are being run by the same party."); + } + } + if (options->HTTPProxy) { /* parse it now */ if (tor_addr_port_lookup(options->HTTPProxy, &options->HTTPProxyAddr, &options->HTTPProxyPort) < 0)

1 0

[tor/release-0.2.3] Dependencies for RPM building with mock should work now
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit cf20fac37f78cc1212eaf0dc5260eabf46bcea92 Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Fri Jun 8 15:41:53 2012 +0200 Dependencies for RPM building with mock should work now --- doc/tor-rpm-creation.txt | 19 ++++++++++++++++++- tor.spec.in | 8 ++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index 3fc6bde..eb22c22 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -3,7 +3,7 @@ The process used to create the official rpms is as follows: Download latest stable libevent from -http://www.monkey.org/~provos/libevent/ +http://libevent.org/ The first step of compiling libevent is to configure it as follows: ./configure --enable-static --disable-shared @@ -24,3 +24,20 @@ make dist-rpm You should have at least two, maybe three, rpms. There should be the binary i386.rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. + + +## Instructions for building RPMs for multiple architectures or distributions +## using 'mock' + +Make sure you have mock installed and configured, see following HOWTOs for setup: +https://fedoraproject.org/wiki/How_to_create_an_RPM_package +https://fedoraproject.org/wiki/Using_Mock_to_test_package_builds + +Take the source RPM generated by previous step, and execute mock for every +target architecture (the names come from files in /etc/mock, strip the .cfg +extension in the -r parameter): + +mock --rebuild -r fedora-17-x86_64 tor-X.Y.Z.src.rpm + +(Note: don't build under OpenVZ - it breaks unshare() syscall, which in turn +breaks mock. It could save you several hours.) diff --git a/tor.spec.in b/tor.spec.in index 25557b7..127bf36 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -109,11 +109,11 @@ Vendor: The Tor Project (https://torproject.org) Packager: Erinn Clark <erinn(a)torproject.org> %if %{is_suse} -Requires: openssl >= 0.9.7 -BuildRequires: openssl-devel >= 0.9.7, rpm >= 4.0, zlib-devel +Requires: openssl >= 0.9.7, libevent >= 1.4.13 +BuildRequires: openssl-devel >= 0.9.7, rpm >= 4.0, zlib-devel, libevent-devel >= 1.4.13, asciidoc %else -Requires: openssl >= 0.9.7 -BuildRequires: openssl-devel >= 0.9.7 +Requires: openssl >= 0.9.7, libevent >= 1.4.13 +BuildRequires: openssl-devel >= 0.9.7, libevent-devel >= 1.4.13, asciidoc %endif %if %{is_fc} BuildRequires: rpm-build >= 4.0

1 0

[tor/release-0.2.3] Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball.
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit 72260cfa680ac1fd77d8859d471f766853ddc063 Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Fri Jun 15 23:59:35 2012 +0200 Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball. Signed-off-by: Ondrej Mikle <ondrej.mikle(a)gmail.com> --- Makefile.am | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index a80763d..e25e8ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,23 +24,18 @@ EXTRA_DIST = \ #install-data-local: # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor -# Assume a tarball is in .. for now. -dist-rpm: - RPM_BUILD_DIR="/tmp/tor-rpm-build-$$$$"; \ - rm -rf $$RPM_BUILD_DIR; \ - mkdir $$RPM_BUILD_DIR || exit 1; \ - for subdir in BUILD RPMS SOURCES SPECS SRPMS; do \ - mkdir $$RPM_BUILD_DIR/$$subdir; \ - done; \ - mkdir $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION); \ - cp -R ./ $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION)/; \ - pushd $$RPM_BUILD_DIR/SOURCES/; \ - tar zcf tor-$(VERSION).tar.gz ./; \ - popd; \ - LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ - mv $$RPM_BUILD_DIR/SRPMS/* .; \ - mv $$RPM_BUILD_DIR/RPMS/* .; \ - rm -rf $$RPM_BUILD_DIR +# Use automake's dist-gzip target to build the tarball +dist-rpm: dist-gzip + TIMESTAMP=$$(date +"%Y-%m-%d_%H.%M.%S"); \ + RPM_BUILD_DIR=$$(mktemp -d "/tmp/tor-rpm-build-$$TIMESTAMP-XXXX"); \ + mkdir -p "$$RPM_BUILD_DIR"/{BUILD,RPMS,SOURCES/"tor-$(VERSION)",SPECS,SRPMS}; \ + cp -fa "$(distdir).tar.gz" "$$RPM_BUILD_DIR"/SOURCES/; \ + LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ + cp -fa "$$RPM_BUILD_DIR"/SRPMS/* .; \ + cp -fa "$$RPM_BUILD_DIR"/RPMS/* .; \ + rm -rf "$$RPM_BUILD_DIR"; \ + echo "RPM build finished"; \ + #end of dist-rpm dist: check

1 0

[tor/release-0.2.3] Fixed creating _tor user in RPM-based installs.
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit a7fc797edffc3ae6c2813ae354be35a1cd3c175e Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Sat Jun 16 22:41:59 2012 +0200 Fixed creating _tor user in RPM-based installs. --- tor.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tor.spec.in b/tor.spec.in index 127bf36..5605586 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -213,7 +213,7 @@ if [ ! -n "`/usr/bin/id -u %{toruser} 2>/dev/null`" ]; then # One would also like to default the UID, but doing that properly would # also require thought. if [ -x %{_sbindir}/nologin ]; then - %{_sbindir}/useradd -r -g %{torgroup} -d% {_localstatedir}/lib/%{name} -s %{_sbindir}/nologin %{toruser} 2> /dev/null + %{_sbindir}/useradd -r -g %{torgroup} -d %{_localstatedir}/lib/%{name} -s %{_sbindir}/nologin %{toruser} 2> /dev/null else %{_sbindir}/useradd -r -g %{torgroup} -d %{_localstatedir}/lib/%{name} -s /bin/false %{toruser} 2> /dev/null fi

1 0

[tor/release-0.2.3] changelog for bug6043
by nickm＠torproject.org 03 Aug '12

03 Aug '12

commit ae75fb13e175ec24cb3bff44150fd2f932aa5385 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 11:49:20 2012 -0400 changelog for bug6043 --- changes/bug6043 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug6043 b/changes/bug6043 new file mode 100644 index 0000000..b88bafb --- /dev/null +++ b/changes/bug6043 @@ -0,0 +1,6 @@ + o Packaging (RPM): + - Our default RPM spec files have been updated to work with mock + and rpmbuild on RHEL/Fedora. They have an updated set of + dependencies and conflicts, a fix for an ancient typo when creating + the "_tor" user, and better instructions. Thanks to Ondrej + Mikle for the patch series; fix for bug 6043.

1 0