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

[torbrowser/maint-2.2] Small fix to continue when no stamps exist.
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit b30d28e532e93d42b9b43f96bea0a9734f1dde40 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sun Apr 8 21:37:24 2012 +0200 Small fix to continue when no stamps exist. --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index fed251a..1a32df0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -202,7 +202,7 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* - rm $(STAMP_DIR)/*stamp + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7e2c080..b4dd9fd 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -217,7 +217,7 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* - rm $(STAMP_DIR)/*stamp + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 505e5b6..d690230 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -208,7 +208,7 @@ clean: rm -f *~ rm -fr *.xpi *.jar *.zip rm -fr $(NAME)_* - rm $(STAMP_DIR)/*stamp + rm -f $(STAMP_DIR)/*.stamp cd ../src/RelativeLink/ && $(MAKE) clean ## Also remove the output files

1 0

[torbrowser/maint-2.2] OSX: Add patch to change tbb paths inside vidalia
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit 83572fcf2697daa55a2067d814cf6e761a1b94b1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 18 02:09:08 2012 +0200 OSX: Add patch to change tbb paths inside vidalia Once the next Vidalia release is out, we'll want to just revert this patch. --- build-scripts/versions.mk | 5 ++ .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 61 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index ee29c6b..1710582 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -187,6 +187,11 @@ $(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/* $(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) rm -rf $(VIDALIA_DIR) cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ +ifeq (MacOS,$(PLATFORM)) + cp ../src/current-patches/vidalia/*patch $(VIDALIA_DIR) + cp patch-any-src.sh $(VIDALIA_DIR) + cd $(VIDALIA_DIR) && ./patch-any-src.sh +endif $(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR) rm -rf $(LIBEVENT_DIR) diff --git a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch new file mode 100644 index 0000000..d546ae1 --- /dev/null +++ b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch @@ -0,0 +1,61 @@ +From c06d989faabadfa643dfd4a34abae549f4eef213 Mon Sep 17 00:00:00 2001 +From: Sebastian Hahn <sebastian(a)torproject.org> +Date: Wed, 18 Apr 2012 02:01:36 +0200 +Subject: [PATCH] Adapt paths etc for OS X TBB + +--- + src/vidalia/MainWindow.cpp | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp +index d170d47..6835b1e 100644 +--- a/src/vidalia/MainWindow.cpp ++++ b/src/vidalia/MainWindow.cpp +@@ -619,24 +619,27 @@ MainWindow::launchBrowserFromDirectory() + + /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */ + QString browserExecutable = +- QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename); ++ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/" + browserDirectoryFilename); + /* The profile is in <browserDirectory>/Data/profile */ + QString profileDir = +- QDir::toNativeSeparators(browserDirectory + "/Data/profile"); ++ QDir::toNativeSeparators(browserDirectory + "/Library/Application Support/Firefox/Profiles/profile"); + + /* Copy the profile directory if it's not already there */ + QDir browserDirObj = QDir(browserDirectory); + + /* Copy the profile directory if it's not already there */ +- if (!browserDirObj.exists("Data/profile")) { +- browserDirObj.mkdir("Data/profile"); +- copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); ++ if (!browserDirObj.exists("Library/Application Support/Firefox/Profiles/profile")) { ++ browserDirObj.mkdir("Library/Application Support/Firefox/Profiles/profile"); ++ QString src = browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile"; ++ QString dst = profileDir; ++ vNotice("Copying '%1' to '%2'").arg(src).arg(dst); ++ copy_dir(src, dst); + } + + /* Copy the plugins directory if it's not already there */ +- if (!browserDirObj.exists("Data/plugins")) { +- browserDirObj.mkdir("Data/plugins"); +- copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins"); ++ if (!browserDirObj.exists("MacOS/Data/plugins")) { ++ browserDirObj.mkdir("MacOS/Data/plugins"); ++ copy_dir(browserDirectory + "/MacOS/Data/plugins", browserDirectory + "/MacOS/Data/plugins"); + } + + /* Build the command line arguments */ +@@ -644,7 +647,7 @@ MainWindow::launchBrowserFromDirectory() + // Is this better or worse than MOZ_NO_REMOTE? + commandLine << "-no-remote"; + commandLine << "-profile"; +- commandLine << profileDir; ++ commandLine << QDir::currentPath () + "/" + profileDir; + + /* Launch the browser */ + if(!_browserProcess->state() != QProcess::NotRunning) +-- +1.7.9.6 +

1 0

[torbrowser/maint-2.2] OSX: Add a document describing the setup of macx86.tpo
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit b30fdcd5c7304cab237754a9e367f4d120e97966 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 17 16:36:49 2012 +0200 OSX: Add a document describing the setup of macx86.tpo --- docs/buildmachine_setups/osx.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/docs/buildmachine_setups/osx.txt b/docs/buildmachine_setups/osx.txt new file mode 100644 index 0000000..7093859 --- /dev/null +++ b/docs/buildmachine_setups/osx.txt @@ -0,0 +1,37 @@ +Documentation for the setup of macx86.torproject.org + +Install Mac OS X Lion 10.7, get all updates. + +Download XCode 4.2.1 from +https://developer.apple.com/downloads/index.action, install. This puts +an Install Xcode.app into your applications, manually run the contained +installer script (don't just run the .app). It is in +Contents/MacOS/Install Xcode. + +Fetch macports from http://www.macports.org/install.php - choose the +Lion installer, install. This will change your PATH variable via your +~/.profile file. Run sudo port selfupdate. + +First off, we need a bit of software, so install it: + + sudo port install git-core wget cmake autoconf213 yasm + +This will probably prompt you to install java stuff, do it. + +Create a new limited (non-admin) "macx86builder" User to do the builds. + +Create a new directory, /builds, and chown it to macx86builder. + +sudo to macx86builder + + "sudo -u macx86builder -i" + +Then run these: + + cd /builds/ + git clone https://git.torproject.org/torbrowser + cd torbrowser + git checkout maint-2.2 + cd build-scripts + make -f osx.mk build-all-binaries copy-firefox bundle +

1 0

[torbrowser/maint-2.2] OSX: Copy qt_menu.nib from Qt source to vidalia
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit 0143a7d6db9241c24c366be27bf3ae1cedd5719a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 17 17:04:01 2012 +0200 OSX: Copy qt_menu.nib from Qt source to vidalia --- build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index b4dd9fd..83e008a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -83,6 +83,7 @@ build-vidalia: build-openssl build-qt $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install + cp -r $(QT_DIR)/src/gui/mac/qt_menu.nib $(VIDALIA)/Contents/Resources/ touch $(STAMP_DIR)/build-vidalia LIBEVENT_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)"

1 0

[torbrowser/maint-2.2] OSX: work around dist-osx-libraries target breakage
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit 5c1a8e1c1bca49158c6dd82faac7229dc97c5d89 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 18 03:21:03 2012 +0200 OSX: work around dist-osx-libraries target breakage Vidalia's make dist-osx-libraries target is broken for some reason. We'll just call macdeployqt manually for now --- build-scripts/osx.mk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 83e008a..493052e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -249,7 +249,10 @@ directory-structure: ## Package up all the Vidalia and Tor pre-requisites ## Firefox and Pidgin are installed in their own targets -install-binaries: +install-binaries: + chmod 644 $(BUILT_DIR)/lib/libssl.* + chmod 644 $(BUILT_DIR)/lib/libcrypto.* + $(BUILT_DIR)/bin/macdeployqt $(VIDALIA) -no-plugins # Vidalia cp -R $(VIDALIA) $(APPDIR)/Vidalia.app cp $(TOR) $(APPDIR)

1 0

[torbrowser/maint-2.2] Win/OSX: Remove -O -g from libevent, tor cflags
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit 6fdf347054540320c9e624b21cd34ca4392ac4b1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 11 17:58:51 2012 +0200 Win/OSX: Remove -O -g from libevent, tor cflags --- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 68e13fe..a39eb94 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -85,7 +85,7 @@ build-vidalia: build-openssl build-qt $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install touch $(STAMP_DIR)/build-vidalia -LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" +LIBEVENT_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) @@ -94,7 +94,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" +TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index dc8de89..505e5b6 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -86,7 +86,7 @@ build-vidalia: build-openssl $(VIDALIA_DIR) cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) touch $(STAMP_DIR)/build-vidalia -LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" +LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) @@ -95,7 +95,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" +TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin

1 0

[torbrowser/maint-2.2] Update to Qt 4.8.1
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit 1a2b64a6cb5849e93ccdc3cb54621607d5f397ad Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 17 14:40:00 2012 +0200 Update to Qt 4.8.1 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 818d1d4..ee29c6b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -5,7 +5,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 OPENSSL_VER=1.0.0h LIBPNG_VER=1.5.9 -QT_VER=4.7.4 +QT_VER=4.8.1 VIDALIA_VER=0.2.17 LIBEVENT_VER=2.0.17-stable TOR_VER=0.2.2.35

1 0

[stem/master] Adding test for contact info with carriage return
by atagar＠torproject.org 18 Apr '12

18 Apr '12

commit 725beac5437d85e8da5baa8a6fce90ce76fa9f9f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 18 09:31:14 2012 -0700 Adding test for contact info with carriage return Interesting use case spotted by Karsten on... https://trac.torproject.org/projects/tor/ticket/5637 --- test/integ/descriptor/data/cr_in_contact_line | 47 +++++++++++++++++++++++++ test/integ/descriptor/server_descriptor.py | 27 ++++++++++++++ 2 files changed, 74 insertions(+), 0 deletions(-) diff --git a/test/integ/descriptor/data/cr_in_contact_line b/test/integ/descriptor/data/cr_in_contact_line new file mode 100644 index 0000000..f1d93fb --- /dev/null +++ b/test/integ/descriptor/data/cr_in_contact_line @@ -0,0 +1,47 @@ +router pogonip 75.5.248.48 9001 0 0 +platform Tor 0.1.2.17 on Darwin i386 +published 2007-09-03 10:15:53 +opt fingerprint 6DAB D62B C65D 4E6F E620 2931 57FC 7696 8DAB 9C9B +uptime 5423 +bandwidth 98304 196608 0 +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAO6pORBI9rGRCPSb2lLwzl2630eFMlBXLgLtwQvYLY2s58cWpKjhI+ZF +Q43+0e50pgC//JyS3Zac4O7MA5+BUfMvNOzKUdSIIGc6QjwST/larbDy14k9XalQ ++G8rdnKb7gDNLrHjxhw5tC0JSTSTXI08bNsFeN1MoY8sFBjRlyDxAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALL0zokdBKjVcZA1P0K2jWK7afkvmB2bpRAdx5x1KRPZtB0mRxyjvgwL +Tp0z3jLwhB4gzYY4LmS8p5RBH53gv4GsNW1rPSr99q4wjWyEY5AfjOdJZtFo/nhP +881leOraicfcXmqrgtfbXZ0Jj+G9Ko216yEv4vBN/UV87kZHb/4tAgMBAAE= +-----END RSA PUBLIC KEY----- +opt write-history 2007-09-03 10:01:27 (900 s) 471040,874496,354304,0,0,0,0,0,0,0,0,60416,1160192,2017280,3396608,1585152,5990400,5469184,10896384,20568064,23362560,43372544,36531200,43439104,47890432,54303744,38624256,40414208,26827776,0,0,0,0,50176,611328,3126272,2952192,33792,28672 +opt read-history 2007-09-03 10:01:27 (900 s) 6890496,2631680,2260992,0,0,0,0,0,0,0,0,1096704,1856512,1133568,1038336,1390592,3272704,2115584,6868992,13585408,13746176,30726144,25562112,28556288,36113408,35810304,25213952,30357504,13510656,0,0,0,0,964608,568320,966656,1991680,17408,140288 +opt hibernating 1 +contact jie1 at pacbell dot net -----BEGIN PGP PUBLIC KEY BLOCK-----Version: GnuPG v1 dot 4 dot 7 (Darwin)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Xaw3-----END PGP PUBLIC KEY BLOCK----- +reject 0.0.0.0/8:* +reject 169.254.0.0/16:* +reject 127.0.0.0/8:* +reject 192.168.0.0/16:* +reject 10.0.0.0/8:* +reject 172.16.0.0/12:* +reject *:25 +reject *:119 +reject *:135-139 +reject *:445 +reject *:465 +reject *:563 +reject *:587 +reject *:1214 +reject *:4661-4666 +reject *:6346-6429 +reject *:6699 +reject *:6881-6999 +accept *:* +router-signature +-----BEGIN SIGNATURE----- +PrL8cocQcTTmQp0wy0dxlFOczGv8s2/hZzAafOhjdM0QqLMLh9FW/4RqH0jcDz+P +t1QU3xIF3JV1fsW0rx4vFYKXG7WrLrrQp3gGuJvrXO+132UAsrs7eJKk3yxEi2lq +FNY26XGZqTDPY4WPl08/JgXXfckgFFg76E4Jcl5/tY8= +-----END SIGNATURE----- diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index ee099b4..815674a 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -241,6 +241,33 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(["reject *:*"], desc.exit_policy) self.assertEquals([], desc.get_unrecognized_lines()) + def test_cr_in_contact_line(self): + """ + Parses a descriptor with a huge contact line containing anomalous carriage + returns ('\r' entries). + """ + + descriptor_path = os.path.join(DESCRIPTOR_TEST_DATA, "cr_in_contact_line") + + descriptor_file = open(descriptor_path) + descriptor_contents = descriptor_file.read() + descriptor_file.close() + + desc = stem.descriptor.server_descriptor.RelayDescriptorV3(descriptor_contents) + + self.assertEquals("pogonip", desc.nickname) + self.assertEquals("6DABD62BC65D4E6FE620293157FC76968DAB9C9B", desc.fingerprint) + self.assertEquals("75.5.248.48", desc.address) + + # the contact info block is huge so just checking the start and end, + # including some of the embedded carriage returns + + contact_start = "jie1 at pacbell dot net -----BEGIN PGP PUBLIC KEY BLOCK-----\rVersion:" + contact_end = "YFRk3NhCY=\r=Xaw3\r-----END PGP PUBLIC KEY BLOCK-----" + + self.assertTrue(desc.contact.startswith(contact_start)) + self.assertTrue(desc.contact.endswith(contact_end)) + def test_bridge_descriptor(self): """ Parses a bridge descriptor.

1 0

[tor/master] Remove needless check for a buffer that could not be NULL.
by nickm＠torproject.org 18 Apr '12

18 Apr '12

commit 4db5a1e151a7aa69f2682854b021d1f9bb0f5caf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 10:38:39 2012 -0400 Remove needless check for a buffer that could not be NULL. Fixes coverity CID 508: coverity scan doesn't like checking a variable for non-NULL after it has been definitely dereferenced. This should take us back down to zero coverity issues. --- src/common/crypto.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index dd85d14..e37b282 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1051,10 +1051,9 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_t *env, tor_assert(outlen+symlen < INT_MAX); return (int)(outlen + symlen); err: - if (buf) { - memset(buf, 0, pkeylen); - tor_free(buf); - } + + memset(buf, 0, pkeylen); + tor_free(buf); crypto_cipher_free(cipher); return -1; }

1 0

[tor/master] Don't fetch v2 networkstatuses from caches, even if auths are down
by nickm＠torproject.org 18 Apr '12

18 Apr '12

commit 0b1ec16058f51cfa68da845507d1c30110cfff52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 12:09:19 2012 -0400 Don't fetch v2 networkstatuses from caches, even if auths are down Fix for 5635; fix on 0.2.2.26-beta, where caches stopped fetching this information. --- changes/bug5635 | 6 ++++++ src/or/directory.c | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/bug5635 b/changes/bug5635 new file mode 100644 index 0000000..9c2e729 --- /dev/null +++ b/changes/bug5635 @@ -0,0 +1,6 @@ + o Major bugfixes (directory authorities): + - If authorities are unable to get a set of v2 consensus documents + from other directory authorities, they no longer fail-back and try + to fetch them from regular directory caches. This is a bugfix on + 0.2.2.26-beta, where routers stopped downloading v2 consensus + documents entirely. Fix for bug #5635. diff --git a/src/or/directory.c b/src/or/directory.c index fbde785..6394aec 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -354,6 +354,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, const routerstatus_t *rs = NULL; const or_options_t *options = get_options(); int prefer_authority = directory_fetches_from_authorities(options); + int require_authority = 0; int get_via_tor = purpose_needs_anonymity(dir_purpose, router_purpose); dirinfo_type_t type; time_t if_modified_since = 0; @@ -369,6 +370,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: type = V2_DIRINFO; prefer_authority = 1; /* Only v2 authorities have these anyway. */ + require_authority = 1; /* Don't fallback to asking a non-authority */ break; case DIR_PURPOSE_FETCH_SERVERDESC: type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO : @@ -469,6 +471,11 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, return; } } + if (rs == NULL && require_authority) { + log_info(LD_DIR, "No authorities were available for %s: will try " + "later.", dir_conn_purpose_to_string(dir_purpose)); + return; + } } if (!rs && type != BRIDGE_DIRINFO) { /* anybody with a non-zero dirport will do */

1 0