- tor-commits - lists.torproject.org

[tor/master] rend_service_introduce(): do protocol violation check before anything else.
by nickm＠torproject.org 18 Apr '12

18 Apr '12

commit 2d276ab9d9193d5152fe2599e9d39f2df9ea7d43 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 19 00:47:37 2012 +0200 rend_service_introduce(): do protocol violation check before anything else. (Cherry-picked from 6ba13e4 by nickm) --- changes/bug5644 | 5 +++++ src/or/rendservice.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changes/bug5644 b/changes/bug5644 new file mode 100644 index 0000000..a390eba --- /dev/null +++ b/changes/bug5644 @@ -0,0 +1,5 @@ + o Major bugfixes + - Prevent a client-side assertion failure when receiving an + INTRODUCE2 cell by an exit relay, in a general purpose + circuit. Fixes bug 5644; bugfix on tor-0.2.1.6-alpha + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index bb3aacd..a1daa8a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -909,13 +909,6 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, time_t *access_time; or_options_t *options = get_options(); - tor_assert(circuit->rend_data); - - base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, - circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN); - log_info(LD_REND, "Received INTRODUCE2 cell for service %s on circ %d.", - escaped(serviceid), circuit->_base.n_circ_id); - if (circuit->_base.purpose != CIRCUIT_PURPOSE_S_INTRO) { log_warn(LD_PROTOCOL, "Got an INTRODUCE2 over a non-introduction circuit %d.", @@ -923,6 +916,13 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, return -1; } + tor_assert(circuit->rend_data); + + base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, + circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN); + log_info(LD_REND, "Received INTRODUCE2 cell for service %s on circ %d.", + escaped(serviceid), circuit->_base.n_circ_id); + /* min key length plus digest length plus nickname length */ if (request_len < DIGEST_LEN+REND_COOKIE_LEN+(MAX_NICKNAME_LEN+1)+ DH_KEY_LEN+42) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 18 Apr '12

18 Apr '12

commit e9dae1ff2e147d2b74fb1ce2836fb9c42f227af4 Merge: 4db5a1e 2d276ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 22:30:02 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/rendservice.c Conflicts were due to new NON_ANONYMOUS_MODE_ENABLED tor2web code; I think I resolved them correctly. changes/bug5644 | 5 +++++ src/or/rendservice.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --cc src/or/rendservice.c index 30b0d88,a1daa8a..44e6697 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@@ -1062,11 -907,15 +1062,18 @@@ rend_service_introduce(origin_circuit_ time_t now = time(NULL); char diffie_hellman_hash[DIGEST_LEN]; time_t *access_time; - or_options_t *options = get_options(); + const or_options_t *options = get_options(); + if (circuit->_base.purpose != CIRCUIT_PURPOSE_S_INTRO) { + log_warn(LD_PROTOCOL, + "Got an INTRODUCE2 over a non-introduction circuit %d.", + circuit->_base.n_circ_id); + return -1; + } + +#ifndef NON_ANONYMOUS_MODE_ENABLED + tor_assert(!(circuit->build_state->onehop_tunnel)); +#endif tor_assert(circuit->rend_data); base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1,

1 0

[tor/maint-0.2.2] rend_service_introduce(): do protocol violation check before anything else.
by nickm＠torproject.org 18 Apr '12

18 Apr '12

commit 2d276ab9d9193d5152fe2599e9d39f2df9ea7d43 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 19 00:47:37 2012 +0200 rend_service_introduce(): do protocol violation check before anything else. (Cherry-picked from 6ba13e4 by nickm) --- changes/bug5644 | 5 +++++ src/or/rendservice.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changes/bug5644 b/changes/bug5644 new file mode 100644 index 0000000..a390eba --- /dev/null +++ b/changes/bug5644 @@ -0,0 +1,5 @@ + o Major bugfixes + - Prevent a client-side assertion failure when receiving an + INTRODUCE2 cell by an exit relay, in a general purpose + circuit. Fixes bug 5644; bugfix on tor-0.2.1.6-alpha + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index bb3aacd..a1daa8a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -909,13 +909,6 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, time_t *access_time; or_options_t *options = get_options(); - tor_assert(circuit->rend_data); - - base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, - circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN); - log_info(LD_REND, "Received INTRODUCE2 cell for service %s on circ %d.", - escaped(serviceid), circuit->_base.n_circ_id); - if (circuit->_base.purpose != CIRCUIT_PURPOSE_S_INTRO) { log_warn(LD_PROTOCOL, "Got an INTRODUCE2 over a non-introduction circuit %d.", @@ -923,6 +916,13 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, return -1; } + tor_assert(circuit->rend_data); + + base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, + circuit->rend_data->rend_pk_digest, REND_SERVICE_ID_LEN); + log_info(LD_REND, "Received INTRODUCE2 cell for service %s on circ %d.", + escaped(serviceid), circuit->_base.n_circ_id); + /* min key length plus digest length plus nickname length */ if (request_len < DIGEST_LEN+REND_COOKIE_LEN+(MAX_NICKNAME_LEN+1)+ DH_KEY_LEN+42) {

1 0

[torflow/master] Merge remote-tracking branch 'origin/master'
by mikeperry＠torproject.org 18 Apr '12

18 Apr '12

commit 840072d7d5885bafbe3c463f5ba686ae32114457 Merge: 2d580e2 3c0dd74 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Apr 18 17:13:01 2012 -0700 Merge remote-tracking branch 'origin/master' NetworkScanners/BwAuthority/README.spec.txt | 6 ++ NetworkScanners/BwAuthority/aggregate.py | 77 ++++++++++++++++++++------- 2 files changed, 64 insertions(+), 19 deletions(-)

1 0

[torflow/master] Submodule.
by mikeperry＠torproject.org 18 Apr '12

18 Apr '12

commit 2d580e2d165e87c5b04eaff8e0bfd6b2019cd1bb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Apr 18 17:07:46 2012 -0700 Submodule. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index 3de9176..305a759 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit 3de91767e208d1642a8cf89dc1b645f637abaf8e +Subproject commit 305a759d99dd01f60faed9aa036b37746d3c54c5

1 0

[pytorctl/master] Turn an exception into a log.
by mikeperry＠torproject.org 18 Apr '12

18 Apr '12

commit 305a759d99dd01f60faed9aa036b37746d3c54c5 Author: Mike Perry <mikeperry+git(a)torproject.org> Date: Wed Apr 18 16:47:25 2012 -0700 Turn an exception into a log. --- TorCtl.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index db8b5b8..517a282 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -563,7 +563,7 @@ class Connection: else: # not of a recognized authentication type (new addition to the # control-spec?) - raise IOError("Unrecognized authentication type: %s" % authInfo) + plog("INFO", "Unrecognized authentication type: %s" % authInfo) self._authType = authType self._cookiePath = cookiePath

1 0

[torbrowser/maint-2.2] OSX: Correctly set min version for Vidalia
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit e513c36dc9d7825d27dd511caee84c846ce01117 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 18 04:01:06 2012 +0200 OSX: Correctly set min version for Vidalia Each line in a make rule gets executed in its own shell, so exporting something in one line means it'll be gone in the next. We only need the MACOSX_DEPLOYMENT_TARGET during cmake, so only set it there. Fixes bug 4263. --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 493052e..6a4bac5 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -78,9 +78,9 @@ build-qt: build-zlib build-openssl $(QT_DIR) VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. build-vidalia: build-openssl build-qt $(VIDALIA_DIR) - export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) -mkdir $(VIDALIA_DIR)/build - cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ + cd $(VIDALIA_DIR)/build && \ + MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) 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/

1 0

[torbrowser/maint-2.2] Update settings for the macx86 builder
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit 1fce8030e46ebe02716254bf91b3e99bb0249475 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 2 11:32:37 2012 +0200 Update settings for the macx86 builder --- build-scripts/config/mozconfig-osx-i386 | 11 ++++++----- build-scripts/osx.mk | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index e0d2187..6ec8d67 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -3,12 +3,13 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options AUTOCONF=autoconf213 mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j8" # Options for cross-compilation on Snow Leopard. -HOST_CC="gcc-4.2 -arch i386" -HOST_CXX="g++-4.2 -arch i386" -CC="gcc-4.2 -arch i386" -CXX="g++-4.2 -arch i386" +HOST_CC="gcc -arch i386" +HOST_CXX="g++ -arch i386" +CC="gcc -arch i386" +CXX="g++ -arch i386" RANLIB=ranlib AR=ar AS=$CC @@ -18,7 +19,7 @@ CROSS_COMPILE=1 ac_add_options --target=i386-apple-darwin$DARWIN_VERSION # Options for 'configure' (same as command-line options). -ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk +ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk ac_add_options --enable-macos-target=10.5 ac_add_options --enable-application=browser ac_add_options --enable-official-branding diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a39eb94..7e2c080 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -14,15 +14,15 @@ ## Architecture -ARCH_TYPE=x86_64 +ARCH_TYPE=i386 BUILD_NUM=8 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options OSX_VERSION=10.5 -CC=CC=gcc-4.0 +CC= # These can probably be left alone for OSX_VERSION 10.5 and up -SDK_PATH=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk +SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk SDK=-sdk $(SDK_PATH) MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION) CF_MIN_VERSION=-isysroot $(SDK_PATH) @@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION) $(LD_MIN_VERSION) ## Build machine specific settings # Number of cpu cores used to build in parallel -NUM_CORES=2 +NUM_CORES=4 ## Location of directory for source fetching FETCH_DIR=$(PWD)/build

1 0

[torbrowser/maint-2.2] Add targets to fetch and extract obfsproxy
by erinn＠torproject.org 18 Apr '12

18 Apr '12

commit cab58ff1b6e46305eeb75fbfce56df145b2f20ee Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 2 11:41:28 2012 +0200 Add targets to fetch and extract obfsproxy --- build-scripts/versions.mk | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 395be17..818d1d4 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -17,6 +17,7 @@ TORBUTTON_VER=1.4.5.1 NOSCRIPT_VER=2.3.4 HTTPSEVERYWHERE_VER=2.0.1 OTR_VER=3.2.0 +OBFSPROXY_VER=0.1.1 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -36,7 +37,7 @@ PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2 TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi NOSCRIPT_PACKAGE=addon-722-latest.xpi HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi - +OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -53,6 +54,7 @@ PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archiv… TORBUTTON_URL=https://www.torproject.org/dist/torbutton/$(TORBUTTON_PACKAGE) NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSC… HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) +OBFSPROXY_URL=https://www.torproject.org/dist/obfsproxy/$(OBFSPROXY_PACKAGE) # Provide some mappings between lower and upper case, which means we don't need # to rely on shell shenanigans when we need the upper case version. This is @@ -68,6 +70,7 @@ firefox=FIREFOX pidgin=PIDGIN mozbuild=MOZBUILD pymake=PYMAKE +obfsproxy=OBFSPROXY # The locations of the unpacked tarballs ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER) @@ -80,6 +83,7 @@ TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER) FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER) MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER) +OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER) # Empty targets are written in arch-dependent $(BUILD_DIR). Usual # VPATH issues documented below should be avoided as the paths of @@ -93,7 +97,7 @@ vpath build-% $(STAMP_DIR) vpath patch-% $(STAMP_DIR) vpath %.stamp $(STAMP_DIR) -fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) | $(FETCH_DIR) ; +fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(FETCH_DIR) ; source-dance: fetch-source unpack-source ; @@ -154,7 +158,10 @@ langpack_%.xpi: langpack_en-US.xpi: touch $@ -unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) +$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL) + +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR) $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR) @@ -213,22 +220,26 @@ $(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR) rm -rf $(PYMAKE_DIR) cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/ +$(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) + rm -rf $(OBFSPROXY_DIR) + cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/ + clean-fetch-%: rm -rf $(FETCH_DIR)/$($($*)_PACKAGE) -clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox +clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox clean-fetch-obfsproxy clean-unpack-%: rm -rf $($($*)_DIR) -clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox +clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox clean-unpack-obfsproxy clean-build-%: rm -rf $($($*)_DIR) rm -rf build-$* -clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox +clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox clean-build-obfsproxy .PHONY: clean-fetch clean-unpack clean-build

1 0

[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