From c9b8a4a133780cb2ab3847292284a6e9292b70d1 Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Thu, 13 Aug 2009 21:13:09 -0400 Subject: [PATCH 1/4] update fetch-all with dir auth --- contrib/directory-archive/fetch-all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/directory-archive/fetch-all b/contrib/directory-archive/fetch-all index fabcbb8bc4..dfa5a1b3e5 100755 --- a/contrib/directory-archive/fetch-all +++ b/contrib/directory-archive/fetch-all @@ -30,8 +30,8 @@ DIRSERVERS="" DIRSERVERS="$DIRSERVERS 86.59.21.38:80" # tor26 DIRSERVERS="$DIRSERVERS 128.31.0.34:9031" # moria1 DIRSERVERS="$DIRSERVERS 128.31.0.34:9032" # moria2 -#DIRSERVERS="$DIRSERVERS 140.247.60.64:80" # lefkada DIRSERVERS="$DIRSERVERS 194.109.206.212:80" # dizum + DATEDIR=$(date "+%Y/%m/%d") TIME=$(date "+%Y%m%d-%H%M%S") From 9d11827780d15d8b398d8ce6b04110a4dea5e980 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 20 Aug 2009 11:51:34 -0400 Subject: [PATCH 2/4] Fix a rare infinite-recursion bug when shutting down. Once we had called log_free_all(), anything that tried to log a message (like a failed tor_assert()) would fail like this: 1. The logging call eventually invokes the _log() function. 2. _log() calls tor_mutex_lock(log_mutex). 3. tor_mutex_lock(m) calls tor_assert(m). 4. Since we freed the log_mutex, tor_assert() fails, and tries to log its failure. 5. GOTO 1. Now we allocate the mutex statically, and never destroy it on shutdown. Bugfix on 0.2.0.16-alpha, which introduced the log mutex. This bug was found by Matt Edman. --- ChangeLog | 3 +++ src/common/log.c | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d64423426e..842f05c1c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ Changes in version 0.2.1.20 - 2009-??-?? - Fix a signed/unsigned compile warning in 0.2.1.19. - Fix possible segmentation fault on directory authorities. Bugfix on 0.2.1.14-rc. + - Fix an extremely infinite recursion bug that could occur if we tried + to log a message after shutting down the log subsystem. Found by Matt + Edman. Bugfix on 0.2.0.16-alpha. Changes in version 0.2.1.19 - 2009-07-28 diff --git a/src/common/log.c b/src/common/log.c index a7b0c12c4a..ea09fca167 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -94,7 +94,8 @@ should_log_function_name(log_domain_mask_t domain, int severity) } /** A mutex to guard changes to logfiles and logging. */ -static tor_mutex_t *log_mutex = NULL; +static tor_mutex_t log_mutex; +static int log_mutex_initialized = 0; /** Linked list of logfile_t. */ static logfile_t *logfiles = NULL; @@ -105,9 +106,9 @@ static int syslog_count = 0; #endif #define LOCK_LOGS() STMT_BEGIN \ - tor_mutex_acquire(log_mutex); \ + tor_mutex_acquire(&log_mutex); \ STMT_END -#define UNLOCK_LOGS() STMT_BEGIN tor_mutex_release(log_mutex); STMT_END +#define UNLOCK_LOGS() STMT_BEGIN tor_mutex_release(&log_mutex); STMT_END /** What's the lowest log level anybody cares about? Checking this lets us * bail out early from log_debug if we aren't debugging. */ @@ -448,8 +449,9 @@ logs_free_all(void) log_free(victim); } tor_free(appname); - tor_mutex_free(log_mutex); - log_mutex = NULL; + + /* We _could_ destroy the log mutex here, but that would screw up any logs + * that happened between here and the end of execution. */ } /** Remove and free the log entry victim from the linked-list @@ -545,8 +547,10 @@ add_stream_log(const log_severity_list_t *severity, void init_logging(void) { - if (!log_mutex) - log_mutex = tor_mutex_new(); + if (!log_mutex_initialized) { + tor_mutex_init(&log_mutex); + log_mutex_initialized = 1; + } } /** Add a log handler to receive messages during startup (before the real From 25f9e20a1c10aae6bf5b43a25c668b7295a64525 Mon Sep 17 00:00:00 2001 From: phobos Date: Tue, 25 Aug 2009 15:58:25 -0400 Subject: [PATCH 3/4] update osx-dmg creation directions for the new methods --- doc/tor-osx-dmg-creation.txt | 119 +++++++++++++++++++++++++---------- 1 file changed, 85 insertions(+), 34 deletions(-) diff --git a/doc/tor-osx-dmg-creation.txt b/doc/tor-osx-dmg-creation.txt index 6728e24ae8..9a89e98759 100644 --- a/doc/tor-osx-dmg-creation.txt +++ b/doc/tor-osx-dmg-creation.txt @@ -1,24 +1,103 @@ ## Instructions for building the official dmgs for OSX. ## +## The loose table of contents: +## Summary +## Single Architecture Binaries for PPC or X86, not both. +## Backwards compatible single-architecture binaries for OSX x86 10.4 from newer versions of OS X. +## Universal Binaries for OSX PPC and X86 +## Each section is delineated by ###. The following steps are the exact steps used to produce the "official" OSX builds of tor. -Summary: +### Summary: 1) Compile and install a static version of the latest release of libevent. 2) Acquire and install your preferred version of tor. Extract. 3) "make dist-osx" 4) You now have a dmg from which you can install Tor. -## Universal Binaries for OSX PPC and X86 -## This method works in OSX 10.4 (Tiger) and newer OSX versions. -## See far below if you don't care about cross compiling for PPC and X86. -## The single architecture process starts with "###" +### Single Architecture Binaries for PPC or X86, not both. +### This method works in all versions of OSX 10.3 through 10.6 + +## Compiling libevent ## + +1) Download the latest stable libevent from +http://www.monkey.org/~provos/libevent/ + +2) The first step of compiling libevent is to configure it as +follows: + ./configure --enable-static --disable-shared + +3) Complete the "make" and "make install". You will need to be root, +or sudo -s, to complete the "make install". + +## Compiling Tor ## + +4) Get your preferred version of the tor source from https://www.torproject.org. Extract the +tarball. + +5) In the top level, this means /path/to/tor/, not tor/contrib/osx, +do a configure with these parameters: + CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \ + --bindir=/Library/Tor --sysconfdir=/Library + +6) In same top level dir, do a "make dist-osx". There now exists a +.dmg file in the same directory. Install from this dmg. + +### Backwards compatible single-architecture binaries for OSX x86 10.4 from newer versions of OS X. 1) Install the latest XCode updates available from http://developer.apple.com. -## Compiling libevent +## Compiling libevent ## + +2) Download latest stable libevent from +http://www.monkey.org/~provos/libevent/ + +3) The first step of compiling libevent is to configure it as +follows: +CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" \ +LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ +./configure --enable-static --disable-shared --disable-dependency-tracking + +4) Complete the "make" and "make install". You will need to be root, +or sudo -s, to complete the "make install". + +5) Check for a successful universal binary of libevent.a in, by default, +/usr/local/lib by using the following command: + "file /usr/local/lib/libevent.a" + + Your output should be: +/usr/local/lib/libevent.a (for architecture i386): current ar archive random library + +6) Get your preferred version of the tor source from https://www.torproject.org/download. +Extract the tarball. + +7) In the top level, this means /path/to/tor/, not tor/contrib/osx, +do a configure with these parameters: +CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" \ +LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ +CONFDIR=/Library/Tor \ +./configure --prefix=/Library/Tor --bindir=/Library/Tor \ +--sysconfdir=/Library --disable-dependency-tracking + +8) "make dist-osx" + +9) Confirm you have created a universal binary by issuing the follow command: +"file src/or/tor". Its output should be as follows: +src/or/tor (for architecture i386): Mach-O executable i386 + +10) There should exist in the top-level directory a +Tor-$VERSION-universal-Bundle.dmg + +11) Congrats. You have a backwards-compatible binary. You are now ready to install Tor. + +### Universal Binaries for OSX PPC and X86 +### This method works in OSX 10.4 (Tiger) and newer OSX versions. + +1) Install the latest XCode updates available from http://developer.apple.com. + +## Compiling libevent ## 2) Download latest stable libevent from http://www.monkey.org/~provos/libevent/ @@ -64,31 +143,3 @@ src/or/tor (for architecture ppc): Mach-O executable ppc Tor-$VERSION-universal-Bundle.dmg 11) Congrats. You have a universal binary. You are now ready to install Tor. - -### Single Architecture Binaries for PPC or X86, not both. -### This method works in all versions of OSX 10.3 through 10.5 - -### Compiling libevent - -1) Download the latest stable libevent from -http://www.monkey.org/~provos/libevent/ - -2) The first step of compiling libevent is to configure it as -follows: - ./configure --enable-static --disable-shared - -3) Complete the "make" and "make install". You will need to be root, -or sudo -s, to complete the "make install". - -### Compiling Tor - -4) Get your preferred version of the tor source from https://www.torproject.org. Extract the -tarball. - -5) In the top level, this means /path/to/tor/, not tor/contrib/osx, -do a configure with these parameters: - CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \ - --bindir=/Library/Tor --sysconfdir=/Library - -6) In same top level dir, do a "make dist-osx". There now exists a -.dmg file in the same directory. Install from this dmg. From 127069f3d2b739dfc50b04ad982c2a7a2764f1a7 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 26 Aug 2009 14:11:53 -0400 Subject: [PATCH 4/4] nobody forward-ported the 0.2.0.35 changelog --- ChangeLog | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/ChangeLog b/ChangeLog index 842f05c1c4..fb0383c466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,37 @@ Changes in version 0.2.1.17-rc - 2009-07-07 further bugs for relays on dynamic IP addresses. +Changes in version 0.2.0.35 - 2009-06-24 + o Security fix: + - Avoid crashing in the presence of certain malformed descriptors. + Found by lark, and by automated fuzzing. + - Fix an edge case where a malicious exit relay could convince a + controller that the client's DNS question resolves to an internal IP + address. Bug found and fixed by "optimist"; bugfix on 0.1.2.8-beta. + + o Major bugfixes: + - Finally fix the bug where dynamic-IP relays disappear when their + IP address changes: directory mirrors were mistakenly telling + them their old address if they asked via begin_dir, so they + never got an accurate answer about their new address, so they + just vanished after a day. For belt-and-suspenders, relays that + don't set Address in their config now avoid using begin_dir for + all direct connections. Should fix bugs 827, 883, and 900. + - Fix a timing-dependent, allocator-dependent, DNS-related crash bug + that would occur on some exit nodes when DNS failures and timeouts + occurred in certain patterns. Fix for bug 957. + + o Minor bugfixes: + - When starting with a cache over a few days old, do not leak + memory for the obsolete router descriptors in it. Bugfix on + 0.2.0.33; fixes bug 672. + - Hidden service clients didn't use a cached service descriptor that + was older than 15 minutes, but wouldn't fetch a new one either, + because there was already one in the cache. Now, fetch a v2 + descriptor unless the same descriptor was added to the cache within + the last 15 minutes. Fixes bug 997; reported by Marcus Griep. + + Changes in version 0.2.1.16-rc - 2009-06-20 Tor 0.2.1.16-rc speeds up performance for fast exit relays, and fixes a bunch of minor bugs.