- tor-commits - lists.torproject.org

[snowflake/master] Make logging in server match client (no payloads).
by dcf＠torproject.org 16 Jan '16

16 Jan '16

commit 726ad2bfb953b48bd8e0829d93a9b63f3e237bd1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jan 16 09:37:27 2016 -0800 Make logging in server match client (no payloads). --- server/snowflake.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/snowflake.go b/server/snowflake.go index 30036e0..de6cc76 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -50,7 +50,8 @@ func (c *webRTCConn) Read(b []byte) (int, error) { } func (c *webRTCConn) Write(b []byte) (int, error) { - log.Printf("webrtc Write %d %+q", len(b), string(b)) + // log.Printf("webrtc Write %d %+q", len(b), string(b)) + log.Printf("Write %d bytes --> WebRTC", len(b)) c.dc.Send(b) return len(b), nil } @@ -104,7 +105,8 @@ func datachannelHandler(conn *webRTCConn) { pw.Close() } dc.OnMessage = func(msg []byte) { - log.Printf("OnMessage channel %d %+q", len(msg), msg) + // log.Printf("OnMessage channel %d %+q", len(msg), msg) + log.Printf("OnMessage <--- %d bytes", len(msg)) n, err := pw.Write(msg) if err != nil { pw.CloseWithError(err)

1 0

[webwml/master] add a signature on the 2014 financials
by arma＠torproject.org 16 Jan '16

16 Jan '16

commit 84c411d69d41f63325ad7429fc8c144f8650066a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 16 05:36:28 2016 -0500 add a signature on the 2014 financials (the previous files have signatures. i'm not quite sure why, but who am i to break the trend.) --- ...rProject-combined-Form990_PC_Audit_Results.pdf.asc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/about/findoc/2014-TorProject-combined-Form990_PC_Audit_Results.pdf.asc b/about/findoc/2014-TorProject-combined-Form990_PC_Audit_Results.pdf.asc new file mode 100644 index 0000000..7804026 --- /dev/null +++ b/about/findoc/2014-TorProject-combined-Form990_PC_Audit_Results.pdf.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJWmh0eAAoJEMIYUlgZ94RRlBwP/09Wg8MBwVzDgkdhsr9q1HTO +Nw3XVoY18J7nhypjR22U+T6CEnx6CYUlDtFYkNwgWYPVrJmtg1gWVzi0ty3QuRTG +IKgpoerd5+d4fG+wUxC5SJDZ6a28fmnEivwTuN0Rs4tcVoekPmpfgxGnLVw6nHAO +vtuReyIl2yLfyG0sWpEVlMzjYS4jFTFVP/PU1HZ5XhitRqtJoPExhoc4LfGnUG4g +zPJfN/ldaWqiWAr2DC32z8ygiXeOkFlrEMa5rwDt8KLfVKtAzC7HwySIBlVcW90s +oMMnYsmRGJrN0w1tqtDIB5tcr6kNO+L7nKyvraREDpgsFdrAUJJDaOHurY/PN/7Y +Ewga5hcYH/Z1ChzvjATyLrCjK017Ea0ZISLP94+3hkmt20q3nsVEpOzcjAvy4m1S +C1hSSTR8sK3OeKvukEQryRIOTlmQ5gZZeRLp1x0QH7jXm7SqenBm/uod7Z8eNSQm +/dbTHUChthJrtUHy4hTrtw2SKFX+LH4/LRJTPUsXfhNwW+sBxt5nSCUgh4J11Mvq +exnFYVl9no1Xcn+NpLoIZheohdy0W1/5uIQTfJWEVwtbGlkrfp+6VBtqILdGuKGN +Miw8S7xU/t9gXF9mHpK7fC717TByONoCXh6gkBw0geRg4P/EaD6Fe3Jv/lb2rex7 +I9LuG/MLoj1OiTzhmivY +=Bd6v +-----END PGP SIGNATURE-----

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] fixup! Bug 16940: After update, load local change notes.
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit a46acd14e1bacdc0e3c68a29ee203ce37bd6c9a7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jan 15 09:16:15 2016 -0500 fixup! Bug 16940: After update, load local change notes. Fix path separator problem on Windows. This fixes bug 18064. --- browser/base/content/content.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/content.js b/browser/base/content/content.js index fd87352..d1afdb9 100644 --- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -606,7 +606,8 @@ let AboutTBUpdateListener = { let f = Cc["@mozilla.org/file/directory_service;1"] .getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile); f = f.parent.parent; // Remove "Data/Browser" - f.appendRelativePath("Docs/ChangeLog.txt"); + f.append("Docs"); + f.append("ChangeLog.txt"); let fs = Cc["@mozilla.org/network/file-input-stream;1"] .createInstance(Ci.nsIFileInputStream);

1 0

[tor-browser-bundle/hardened-builds] Bug 17428: Removing Flashproxy from Tor Browser
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit 4ebec5b9feaae342ed53c70005c6946c96fa0fe1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 14 15:16:01 2016 +0000 Bug 17428: Removing Flashproxy from Tor Browser Remove M2crypto as well as this was only used by Flashproxy. --- .../PTConfigs/linux/torrc-defaults-appendix | 7 ----- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 7 ----- .../PTConfigs/windows/torrc-defaults-appendix | 7 ----- .../linux/gitian-pluggable-transports.yml | 21 --------------- .../mac/gitian-pluggable-transports.yml | 27 -------------------- .../windows/gitian-pluggable-transports.yml | 26 ------------------- gitian/fetch-inputs.sh | 10 +++----- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/verify-tags.sh | 9 +++---- gitian/versions.alpha | 5 ---- gitian/versions.nightly | 5 ---- 13 files changed, 11 insertions(+), 122 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0885ff..c79efde 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 0dee29b..f5eb5e4 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index ad1eb07..2c1b636 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --man ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index d9b8338..25b5a1b 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -19,8 +19,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -47,7 +45,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "dzip.sh" @@ -164,24 +161,6 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - $PYTHON setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d483462..fd62919 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,8 +18,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +44,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" @@ -188,30 +185,6 @@ script: | sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We have to put $INSTDIR/openssl at the beginning of the header and library - # search paths (build_ext otherwise puts it at the end, after CFLAGS and - # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr - # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. - # It also has necessary headers like stdio.h, so we can't remove it - # completely, but our locally built openssl must take precedence. - CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES - python setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $TBDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..9c1642d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -8,8 +8,6 @@ packages: - "faketime" - "unzip" - "p7zip-full" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -17,8 +15,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +42,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" @@ -260,27 +255,6 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll - LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null - cd .. - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py - # file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip - cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9252aea..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 -ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 @@ -265,7 +264,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG -flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 64a0fd4..5fa3966 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -95,7 +95,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -199,7 +198,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 670d152..39dac5f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -100,7 +100,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -193,7 +192,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6aeec8a..2de0f1e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -94,7 +94,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -198,7 +197,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a1ce6a1..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -98,7 +98,6 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG -flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG @@ -122,12 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -142,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 22eb8df..fd03b8b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -26,7 +26,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -55,7 +54,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -81,7 +79,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -104,7 +101,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -130,7 +126,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a5407a6..d209c6a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,7 +29,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=master LIBFTE_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -58,7 +57,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -84,7 +82,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -107,7 +104,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -133,7 +129,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 17428: Removing Flashproxy from Tor Browser
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit 969136e13861c1cc6d983a66a82736a1fae971c3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 14 15:16:01 2016 +0000 Bug 17428: Removing Flashproxy from Tor Browser Remove M2crypto as well as this was only used by Flashproxy. --- .../PTConfigs/linux/torrc-defaults-appendix | 7 ----- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 7 ----- .../PTConfigs/windows/torrc-defaults-appendix | 7 ----- .../linux/gitian-pluggable-transports.yml | 21 --------------- .../mac/gitian-pluggable-transports.yml | 27 -------------------- .../windows/gitian-pluggable-transports.yml | 26 ------------------- gitian/fetch-inputs.sh | 10 +++----- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/verify-tags.sh | 9 +++---- gitian/versions.alpha | 5 ---- gitian/versions.nightly | 5 ---- 13 files changed, 11 insertions(+), 122 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0885ff..c79efde 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 0dee29b..f5eb5e4 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index ad1eb07..2c1b636 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --man ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 0f123ff..31deebb 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -20,8 +20,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -48,7 +46,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "dzip.sh" @@ -167,24 +164,6 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - $PYTHON setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d483462..fd62919 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,8 +18,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +44,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" @@ -188,30 +185,6 @@ script: | sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We have to put $INSTDIR/openssl at the beginning of the header and library - # search paths (build_ext otherwise puts it at the end, after CFLAGS and - # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr - # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. - # It also has necessary headers like stdio.h, so we can't remove it - # completely, but our locally built openssl must take precedence. - CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES - python setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $TBDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..9c1642d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -8,8 +8,6 @@ packages: - "faketime" - "unzip" - "p7zip-full" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -17,8 +15,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +42,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" @@ -260,27 +255,6 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll - LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null - cd .. - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py - # file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip - cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9252aea..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 -ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 @@ -265,7 +264,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG -flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 7e84cb9..0c70732 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -95,7 +95,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -224,7 +223,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 670d152..39dac5f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -100,7 +100,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -193,7 +192,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6aeec8a..2de0f1e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -94,7 +94,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -198,7 +197,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a1ce6a1..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -98,7 +98,6 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG -flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG @@ -122,12 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -142,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 149b765..95ca078 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -22,7 +22,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -51,7 +50,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -77,7 +75,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -100,7 +97,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -126,7 +122,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 92967a1..b1c7387 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,7 +29,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=master LIBFTE_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -58,7 +57,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -84,7 +82,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -107,7 +104,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -133,7 +129,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 16 Jan '16

16 Jan '16

commit 3c4864b84395579c51b6088c0b73dca051291584 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Jan 16 00:10:57 2016 -0500 update changelog --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2188805..124707b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.1.0-RC-2 / 16-January-2016 / 9ed17b551c29b9edf94d64f5f013ad607c21bbc5 **/ + +Quick fix for Samsung Galaxy devices which have a port conflict on the default SOCKS 9050 part +* 6ffea9e add ability to check if configured SOCKS port is available Samsung devices like to use 9050 (Since their hardware model is i9 + /** 15.1.0-RC-1 / 15-January-2016 / f541e9ffe14a2719863327bf262b48de135ee0fd **/ We updated the essentials

1 0

[orbot/master] 15.1.0-RC-2
by n8fr8＠torproject.org 16 Jan '16

16 Jan '16

commit 9ed17b551c29b9edf94d64f5f013ad607c21bbc5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 15 23:49:59 2016 -0500 15.1.0-RC-2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 37a4997..b62ff9a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.0-RC-1" - android:versionCode="15100021" + android:versionName="15.1.0-RC-2" + android:versionCode="15100022" android:installLocation="auto" >

1 0

[orbot/master] add ability to check if configured SOCKS port is available
by n8fr8＠torproject.org 16 Jan '16

16 Jan '16

commit 6ffea9e38ff6e78e5c9d0721e4556db363b25072 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 15 23:43:54 2016 -0500 add ability to check if configured SOCKS port is available Samsung devices like to use 9050 (Since their hardware model is i9050!). Tor likes to use port 9050. This new code looks to see if port 9050 is available, and if not, change the setting to 'auto' so Tor can find another port. --- src/org/torproject/android/service/TorService.java | 110 ++++---------------- .../android/service/TorServiceUtils.java | 20 ++++ .../torproject/android/vpn/OrbotVpnService.java | 6 +- 3 files changed, 45 insertions(+), 91 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ca92dbb..da4d0c1 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -629,6 +629,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (socksPortPref.indexOf(':')!=-1) socksPortPref = socksPortPref.split(":")[1]; + if (!socksPortPref.equalsIgnoreCase("auto")) + { + boolean isPortUsed = TorServiceUtils.isPortOpen("127.0.0.1",Integer.parseInt(socksPortPref),500); + + if (isPortUsed) //the specified port is not available, so let Tor find one instead + socksPortPref = "auto"; + } + extraLines.append("SOCKSPort ").append(socksPortPref).append('\n'); extraLines.append("SafeSocks 0").append('\n'); extraLines.append("TestSocks 0").append('\n'); @@ -1094,86 +1102,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon confSocks = st.nextToken().split(":")[1]; confSocks = confSocks.substring(0,confSocks.length()-1); mPortSOCKS = Integer.parseInt(confSocks); - - /** - if (!isReconnect) //if we are reconnected then we don't need to reset the ports - { - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, - String.valueOf(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); - if (socksPortPref.indexOf(':')!=-1) - socksPortPref = socksPortPref.split(":")[1]; - - String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); - if (transPort.indexOf(':')!=-1) - transPort = transPort.split(":")[1]; - - String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); - if (dnsPort.indexOf(':')!=-1) - dnsPort = dnsPort.split(":")[1]; - - try - { - int newSocksPort = Integer.parseInt(socksPortPref); - - ArrayList<String> socksLines = new ArrayList<String>(); - socksLines.add("SOCKSPort " + mPortSOCKS); - socksLines.add("SOCKSPort " + socksPortPref); - - conn.setConf(socksLines); - - mPortSOCKS = newSocksPort; - - sendCallbackLogMessage("Local SOCKS port: " + socksPortPref); - - } - catch (Exception e) - { - sendCallbackLogMessage("Error setting TransProxy port to: " + socksPortPref); - - - } - - try - { - ArrayList<String> confLines = new ArrayList<String>(); - - confLines.add("TransPort " + transPort); - - conn.setConf(confLines); - - sendCallbackLogMessage("Local TransProxy port: " + transPort); - - } - catch (Exception e) - { - sendCallbackLogMessage("ERROR setting TransProxy port to: " + transPort); - - - - } - - try - { - ArrayList<String> confLines = new ArrayList<String>(); - - confLines.add("DNSPort " + dnsPort); - - conn.setConf(confLines); - - sendCallbackLogMessage("Local DNSPort port: " + dnsPort); - - } - catch (Exception e) - { - sendCallbackLogMessage("ERROR setting DNSport to: " + dnsPort); - - - } - }*/ - + return Integer.parseInt(torProcId); } @@ -1277,6 +1206,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon Intent intent = new Intent(TorService.this, OrbotVpnService.class); intent.setAction("start"); + intent.putExtra("torSocks", mPortSOCKS); + if (!mIsLollipop) intent.putExtra("proxyPort",OrbotVpnService.mSocksProxyPort); @@ -2086,18 +2017,17 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0) + + //only apply GeoIP if you need it + File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); + File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); + + if (fileGeoIP.exists()) { - - //only apply GeoIP if you need it - File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); - File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); - - extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n'); - extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n'); - + extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n'); + extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n'); } - + if (!TextUtils.isEmpty(entranceNodes)) extraLines.append("EntryNodes" + ' ' + entranceNodes).append('\n'); diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 91d48e9..b8ae024 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -7,6 +7,9 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.net.ConnectException; +import java.net.InetSocketAddress; +import java.net.Socket; import java.util.StringTokenizer; import org.sufficientlysecure.rootcommands.Shell; @@ -166,5 +169,22 @@ public class TorServiceUtils implements TorServiceConstants { } } + public static boolean isPortOpen(final String ip, final int port, final int timeout) { + try { + Socket socket = new Socket(); + socket.connect(new InetSocketAddress(ip, port), timeout); + socket.close(); + return true; + } + catch(ConnectException ce){ + ce.printStackTrace(); + return false; + } + + catch (Exception ex) { + ex.printStackTrace(); + return false; + } + } } diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 6cc718c..9b039bc 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -65,8 +65,11 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private String mSessionName = "OrbotVPN"; private ParcelFileDescriptor mInterface; + private int mTorSocks = TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT; + public static int mSocksProxyPort = -1; private ProxyServer mSocksProxyServer; + private final static int VPN_MTU = 1500; @@ -96,6 +99,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { { Log.d(TAG,"starting OrbotVPNService service!"); + mTorSocks = intent.getIntExtra("torSocks", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); mSocksProxyPort = intent.getIntExtra("proxyPort", 0); // The handler is only used to show messages. @@ -277,7 +281,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { final String defaultRoute = "0.0.0.0"; final String localSocks = localhost + ':' - + String.valueOf(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); + + String.valueOf(mTorSocks); final String localDNS = virtualGateway + ':' + "8091";//String.valueOf(TorServiceConstants.TOR_DNS_PORT_DEFAULT); final boolean localDnsTransparentProxy = true;

1 0

[orbot/master] add new feature graphic for google play
by n8fr8＠torproject.org 16 Jan '16

16 Jan '16

commit b4ca30b8111a206668ecc54c6f8fae865ecd743e Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 15 23:43:40 2016 -0500 add new feature graphic for google play --- docs/featuregraphic.png | Bin 0 -> 299999 bytes docs/featuregraphic.xcf | Bin 0 -> 1316429 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/featuregraphic.png b/docs/featuregraphic.png new file mode 100644 index 0000000..f0c12d4 Binary files /dev/null and b/docs/featuregraphic.png differ diff --git a/docs/featuregraphic.xcf b/docs/featuregraphic.xcf new file mode 100644 index 0000000..e569cb5 Binary files /dev/null and b/docs/featuregraphic.xcf differ

1 0

[orbot/master] update CHANGELOG for v15.1.0-RC-1
by n8fr8＠torproject.org 15 Jan '16

15 Jan '16

commit fd5071feab7bab0d1b736fee5c5bb0b4e291dcce Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 15 15:25:30 2016 -0500 update CHANGELOG for v15.1.0-RC-1 --- CHANGELOG | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5446f1c..2188805 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,55 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.1.0-RC-1 / 15-January-2016 / f541e9ffe14a2719863327bf262b48de135ee0fd **/ + +We updated the essentials +* 317405d update external versions of Tor 0.2.7.6 and OpenSSL 1.0.1q + +We made the ability scan QR codes from bridges.torproject.org work again! +* 8f7165c fixes for settings processing and QRCode scanning of bridges - support new JSON array form bridges.torproject.org - only enab + +We fixed the DNS leak bug in the VPN feature and improved the usability overall (no Orbot restart required) +* 76b2171 update pdnsd and tun2socks to Android-16 add stpcpy function not present before Android-21 +* 39244a6 fix the ability to select per app VPN routing +* d839b15 fixes for VPN service UI to work on Android6 +* 3691cca native binary asset building fixes move pdnsd exec to assets +* f369652 add code to kill pdnsd daemon when VPN is stopped +* f1fcec3 add support for PDNSD DNS Daemon for VPN DNS resolution Tor's DNS port doesn't work well with the VPN mode, so we will use PD +* 8d8fe0c updates to improve VPN support +* 699b60d add linancillary for badvpn tun2socks update for DNS + +We added the controversial ability for the user to easily set their exit country, with the default to the whole world +* 52acf68 move "World" string to resource +* 3b41365 allow country exit node select to persist +* b208178 add initial support for easy exit country selection + +We now recommend Orfox over Orweb +* 51205b8 update for Orfox +* 0a5dd08 use a browser constant here, with the new constant being Orfox + +We made some new graphics +* c54ab18 deleted these graphics +* 534c2fb update style, icons and graphics + +We improve the build process, updated localizations and links to other repos: +* 3240367 clean shouldn't clean assets, so we can easily builds for multiple platforms +* 0081d00 remove Pluto Go building form this Makefile for now +* 2288210 update to OpenSSL's github mirror +* dfc5101 update tfx config +* eaf49da update store and app translations +* fe9119d update jenkins-build script +* 6dc8cf6 update makefile for new pluto builds +* 0261236 change this to "browser button" +* 3462cbd small updates to icon and strings +* bb55557 update installer to get PLUTO binaries from assets +* 7d213e2 delete pluggable transport binaries here; build with Makefile use the external/pluto project +* 6cf1201 update makefile to support PLUTO builds +* 871701e add link for new icon +* 6fb4f0c update binaries +* cd0bfd3 [Trivial] Fixed broken reference to Main Activity in WALKTHROUGH +* 0cde639 fix translations for common issues +* 2acdd29 update localizations for strings and app description + /** 15.0.1-RC-2-PIE / 13-July-2015 / 30e37993bbfc248eea0476af01e91ef8126e88d9 */ 256ecc4 update tor version constant to 0.2.6.10

1 0