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

[orbot/master] added obfsproxy support in Makefile and libevent2
by n8fr8＠torproject.org 05 May '12

05 May '12

commit 35f35abce23faf8ca5b8cde8eb1957042e00c86a Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 4 17:00:17 2012 -0400 added obfsproxy support in Makefile and libevent2 --- external/Makefile | 64 ++++++++++++++++++++++++++++++++++++++--------------- external/libevent | 2 +- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/external/Makefile b/external/Makefile index f24d7d2..c2c33ed 100644 --- a/external/Makefile +++ b/external/Makefile @@ -13,7 +13,7 @@ export ac_cv_func_setpgrp_void=yes CWD = $(shell pwd) PROJECT_ROOT = $(CWD)/.. -EXTERNAL_ROOT = $(PROJECT_ROOT)/external +EXTERNAL_ROOT = $(CWD) # Android NDK setup: NDK_BASE ?= /usr/local/android-ndk @@ -30,7 +30,7 @@ HOST := arm-linux-androideabi # install root for built files DESTDIR = $(EXTERNAL_ROOT) # TODO try adding the Android-style /data/app.name here -prefix = /data/data/org.torproject.android +prefix = LOCAL := $(DESTDIR)$(prefix) export PATH := ${PATH}:$(NDK_TOOLCHAIN)/bin:$(LOCAL)/bin @@ -44,8 +44,8 @@ RANLIB := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-ranlib STRIP := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-strip \ --strip-unneeded -R .note -R .comment -CFLAGS = -DANDROID -I$(LOCAL)/include -LDFLAGS = -L$(LOCAL)/lib +CFLAGS = -DANDROID -I$(LOCAL)/include -I$(NDK_SYSROOT)/usr/include +LDFLAGS = -L$(LOCAL)/lib -L$(NDK_SYSROOT)/usr/lib # build as small as possible, mostly useful for static binaries CFLAGS += -fdata-sections -ffunction-sections -Os @@ -79,24 +79,24 @@ openssl-static: openssl-static-build-stamp openssl-static-clean: -cd openssl-static && \ ndk-build clean - -rm openssl-static/openssl-static-build-stamp + -rm openssl-static-build-stamp -rm lib/libcrypto.a -rm lib/libssl.a + -cd openssl-static && \ + git clean -fdx #------------------------------------------------------------------------------# # libevent -libevent/configure: +libevent/Makefile: cd libevent && ./autogen.sh - -libevent/Makefile: libevent/configure cp config.sub libevent cp config.guess libevent cd libevent && \ CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure \ --host=$(HOST) \ - --prefix=$(NDK_TOOLCHAIN) + --disable-shared libevent-build-stamp: libevent/Makefile $(MAKE) -C libevent @@ -106,15 +106,14 @@ libevent: libevent-build-stamp test -d lib || mkdir lib test -d include || mkdir include cp libevent/.libs/libevent.a lib - cp libevent/*.h include + cp -R libevent/include/* include libevent-clean: -rm -f include/*.h -rm -f lib/libevent.a -rm -f libevent-build-stamp - -rm -f libevent/config.status - -rm -f libevent/config.log - -rm -f libevent/Makefile + -cd libevent && \ + git clean -fdx #------------------------------------------------------------------------------# # tor @@ -122,8 +121,6 @@ libevent-clean: tor/configure: cd tor && \ ./autogen.sh - cp config.sub tor - cp config.guess tor tor/Makefile: tor/configure cp config.sub tor @@ -148,9 +145,40 @@ tor: libevent openssl-static tor-build-stamp tor-clean: -rm -f bin/tor -rm -f tor-build-stamp - -rm -f tor/config.status - -rm -f tor/config.log - -rm -f tor/Makefile + -cd tor && \ + git clean -fdx + + +#------------------------------------------------------------------------------# +# obfsproxy + + +obfsproxy/Makefile: + cd obfsproxy && \ + ./autogen.sh + cp config.sub obfsproxy + cp config.guess obfsproxy + cd obfsproxy && \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIE -fwrapv -fno-strict-aliasing -fno-strict-overflow" LDFLAGS="$(LDFLAGS)" \ + libevent_LIBS="-L$(EXTERNAL_ROOT)/lib -levent" libevent_CFLAGS="-I$(EXTERNAL_ROOT)/include" \ + libcrypto_LIBS="-L$(EXTERNAL_ROOT)/lib -lcrypto" libcrypto_CFLAGS="-I$(EXTERNAL_ROOT)/include" \ + ./configure \ + --host=$(HOST) \ + --prefix=$(NDK_TOOLCHAIN) \ + +obfsproxy-build-stamp: obfsproxy/Makefile + $(MAKE) -C obfsproxy + touch obfsproxy-build-stamp + +obfsproxy: openssl-static libevent obfsproxy-build-stamp + test -d bin || mkdir bin + cp obfsproxy/obfsproxy bin + +obfsproxy-clean: + -rm -f bin/obfsproxy + -rm -f obfsproxy-build-stamp + -cd obfsproxy && \ + git clean -fdx #------------------------------------------------------------------------------# # privoxy diff --git a/external/libevent b/external/libevent index b3360c1..6f2337d 160000 --- a/external/libevent +++ b/external/libevent @@ -1 +1 @@ -Subproject commit b3360c16025760a8751cbbfa31857eeb735861e1 +Subproject commit 6f2337dd0e3ec6aec54a4694f1b59e0262623d8e

1 0

[orbot/master] added obfsproxy submodule
by n8fr8＠torproject.org 05 May '12

05 May '12

commit 6ade9ccf10af375fdde7fd23fb9ffb06334ecdfe Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 4 10:59:50 2012 -0400 added obfsproxy submodule --- .gitmodules | 3 +++ external/obfsproxy | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.gitmodules b/.gitmodules index ccaac46..e2b481e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "external/jtorctl"] path = external/jtorctl url = git://git.torproject.org/git/jtorctl +[submodule "external/obfsproxy"] + path = external/obfsproxy + url = git://git.torproject.org/obfsproxy.git diff --git a/external/obfsproxy b/external/obfsproxy new file mode 160000 index 0000000..94ebc4c --- /dev/null +++ b/external/obfsproxy @@ -0,0 +1 @@ +Subproject commit 94ebc4c3edf1e3e5f313444e59981ac557578df5

1 0

[orbot/master] added cleanup and build fixes
by n8fr8＠torproject.org 05 May '12

05 May '12

commit 2240c31d5f943f518d3d9f9b31956c968be647c1 Author: n8fr8 <nathan(a)freitas.net> Date: Thu May 3 19:10:41 2012 -0400 added cleanup and build fixes --- external/Makefile | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/external/Makefile b/external/Makefile index 66ea64a..f24d7d2 100644 --- a/external/Makefile +++ b/external/Makefile @@ -61,6 +61,8 @@ openssl-static/obj/local/armeabi/libcrypto.a: ndk-build openssl-static/obj/local/armeabi/libssl.a: + cp config.sub openssl-static + cp config.guess openssl-static cd openssl-static && \ ndk-build @@ -86,10 +88,10 @@ openssl-static-clean: libevent/configure: cd libevent && ./autogen.sh - cp config.sub libevent - cp config.guess libevent libevent/Makefile: libevent/configure + cp config.sub libevent + cp config.guess libevent cd libevent && \ CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure \ @@ -124,6 +126,8 @@ tor/configure: cp config.guess tor tor/Makefile: tor/configure + cp config.sub tor + cp config.guess tor cd tor && \ CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure \ @@ -155,10 +159,10 @@ privoxy/configure: cd privoxy && \ ./autoheader ./autoconf - cp config.sub privoxy - cp config.guess privoxy privoxy/Makefile: privoxy/configure + cp config.sub privoxy + cp config.guess privoxy cd privoxy && \ CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ ./configure \ @@ -173,6 +177,7 @@ privoxy: privoxy-build-stamp cp privoxy/privoxy bin privoxy-clean: + $(MAKE) -C privoxy clean -rm -f bin/privoxy -rm -f privoxy-build-stamp -rm -f privoxy/config.status @@ -202,9 +207,13 @@ assets: tor privoxy jtorctrl install bin/tor ../res/raw install bin/privoxy ../res/raw install bin/jtorctrl.jar ../libs - + +assets-clean: + -rm ../res/raw/tor + -rm ../res/raw/privoxy + -rm ../libs/jtorctrl.jar #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctrl-clean +clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctrl-clean assets-clean

1 0

[orbot/master] removes default compiler hardening flags that break Android
by n8fr8＠torproject.org 05 May '12

05 May '12

commit 51cb3530f64be4e4770e0ef25f73f4e66c8db66c Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 4 17:38:37 2012 -0400 removes default compiler hardening flags that break Android --- external/Makefile | 5 ++++- external/obfsproxy_android_no_hardening.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/external/Makefile b/external/Makefile index c2c33ed..aec1c67 100644 --- a/external/Makefile +++ b/external/Makefile @@ -154,8 +154,11 @@ tor-clean: obfsproxy/Makefile: + cp obfsproxy_android_no_hardening.patch obfsproxy cd obfsproxy && \ - ./autogen.sh + patch -N -p1 --reject-file=- < obfsproxy_android_no_hardening.patch + cd obfsproxy && \ + ./autogen.sh cp config.sub obfsproxy cp config.guess obfsproxy cd obfsproxy && \ diff --git a/external/obfsproxy_android_no_hardening.patch b/external/obfsproxy_android_no_hardening.patch new file mode 100644 index 0000000..58425be --- /dev/null +++ b/external/obfsproxy_android_no_hardening.patch @@ -0,0 +1,19 @@ +commit d42eec7683ce9d47fc846e511e815ec1b2950c27 +Author: n8fr8 <nathan(a)freitas.net> +Date: Fri May 4 17:32:51 2012 -0400 + + remove hardening for android + +diff --git a/configure.ac b/configure.ac +index facd3c6..ad405ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ AC_CHECK_HEADERS([sys/types.h]) + AC_CHECK_HEADERS([netinet/in.h]) + + ### Compiler Hardening ### +-AX_ENABLE_HARDENING ++##AX_ENABLE_HARDENING + + ### Libraries ### +

1 0

[orbot/master] adds obfsproxy to make all
by n8fr8＠torproject.org 05 May '12

05 May '12

commit a5ad212ceaee3f933d95d982c501d2aa9437836e Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 4 18:03:18 2012 -0400 adds obfsproxy to make all --- external/Makefile | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/external/Makefile b/external/Makefile index aec1c67..ff420c6 100644 --- a/external/Makefile +++ b/external/Makefile @@ -186,12 +186,12 @@ obfsproxy-clean: #------------------------------------------------------------------------------# # privoxy -privoxy/configure: - cd privoxy && \ - ./autoheader - ./autoconf -privoxy/Makefile: privoxy/configure +privoxy/Makefile: + cd privoxy && \ + autoheader + cd privoxy && \ + autoconf cp config.sub privoxy cp config.guess privoxy cd privoxy && \ @@ -232,17 +232,19 @@ jtorctrl-clean: #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -assets: tor privoxy jtorctrl +assets: tor privoxy jtorctrl obfsproxy install -d ../res/raw install -d ../libs install bin/tor ../res/raw install bin/privoxy ../res/raw + install bin/obfsproxy ../res/raw install bin/jtorctrl.jar ../libs assets-clean: -rm ../res/raw/tor -rm ../res/raw/privoxy -rm ../libs/jtorctrl.jar + -rm ../res/raw/obfsproxy #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 05 May '12

05 May '12

commit df0f2368584702f642c50b7cd5a34e3ff7cb90fc Author: n8fr8 <nathan(a)freitas.net> Date: Fri May 4 18:15:24 2012 -0400 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 05491f8..5ca9ead 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.11-alpha-1.0.8-RC1" + android:versionName="0.2.3.15-alpha-1.0.8-RC1" android:versionCode="37" android:installLocation="auto" >

1 0

[orbot/master] removed binaries
by n8fr8＠torproject.org 05 May '12

05 May '12

commit 14eb59b70518126e27573a282ee784ef5ad07887 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 2 13:39:40 2012 -0400 removed binaries --- libs/jtorctrl.jar | Bin 14082 -> 0 bytes res/raw/tor.mp3 | Bin 1732881 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/jtorctrl.jar b/libs/jtorctrl.jar deleted file mode 100755 index 586859e..0000000 Binary files a/libs/jtorctrl.jar and /dev/null differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 deleted file mode 100644 index 01dc695..0000000 Binary files a/res/raw/tor.mp3 and /dev/null differ

1 0

[orbot/master] new 'one click' build script for NDK and SDK
by n8fr8＠torproject.org 05 May '12

05 May '12

commit 0d0b325b1ddc024ce4f337ff889af4799de834f2 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 2 23:35:29 2012 -0400 new 'one click' build script for NDK and SDK --- Makefile.sh | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/Makefile.sh b/Makefile.sh new file mode 100755 index 0000000..e1fc1de --- /dev/null +++ b/Makefile.sh @@ -0,0 +1,121 @@ +#!/bin/sh + +# begin by testing NDK_ROOT +if test -z $NDK_ROOT; then echo "NDK_ROOT is not exported, do so by something close to this: export NDK_ROOT=/path/to/android-ndk-r5"; exit; fi + +#clean +rm -rf native +rm res/raw/privoxy +rm res/raw/tor +rm -rf libs/jtorctrl +rm libs/jtorctrl.jar + +#create the native folder if it doesn't exist +mkdir native +mkdir native/lib +mkdir native/include +cd native + +#Build openssl using default ndk-build +echo "BUILDING OPENSSL STATIC..." +git clone git://github.com/guardianproject/android-external-openssl-ndk-static.git +cd android-external-openssl-ndk-static + +ndk-build +cp obj/local/armeabi/*.a ../lib +cp -R include/openssl ../include +cd ../.. + +echo "SETTING UP NDK CROSS COMPILER..." +# export needed variables +export NDK_TOOLCHAIN=$NDK_ROOT/my-android-toolchain + +# remove the old toolchain +rm -rf $NDK_TOOLCHAIN/* + +# create the toolchain +$NDK_ROOT/build/tools/make-standalone-toolchain.sh --platform=android-9 --install-dir=$NDK_TOOLCHAIN + +# export needed variables for crosscompile +export PATH="$NDK_TOOLCHAIN/bin/:$PATH" + +export HOST=arm-linux-androideabi + +export CC=$HOST-gcc +export CXX=$HOST-g++ +export AR=$HOST-ar +export LD=$HOST-ld +export AS=$HOST-as +export NM=$HOST-nm +export STRIP=$HOST-strip +export RANLIB=$HOST-ranlib +export OBJDUMP=$HOST-objdump + +export CPPFLAGS="--sysroot=$NDK_TOOLCHAIN/sysroot -I$NDK_TOOLCHAIN/sysroot/usr/include -I$NDK_TOOLCHAIN/include" +export LDFLAGS="-L$NDK_TOOLCHAIN/sysroot/usr/lib -L$NDK_TOOLCHAIN/lib" + + +#Build libevent +echo "BUILDING LIBEVENT..." +mkdir native/libevent +cd native/libevent +svn co https://levent.svn.sourceforge.net/svnroot/levent/tags/release-1.4.13-stabl… . +./autogen.sh +./configure --host=arm-linux-eabi --build=$BUILD --prefix=$NDK_TOOLCHAIN +make clean +make +cp .libs/libevent.a ../lib +cp *.h ../include +cd ../.. + +#Build Tor +echo "BUILDING TOR..." +cd native +git clone git://git.torproject.org/git/tor.git +cd tor/ +./autogen.sh +./configure --host=arm-linux-eabi --disable-asciidoc --prefix=$NDK_TOOLCHAIN --with-libevent-dir=$PWD/../ --enable-static-libevent --with-openssl-dir=$PWD/../ --enable-static-openssl +make clean +make +cd ../.. + +#Build JTorControl +echo "BUILDING JTORCTRL..." +cd libs +git clone git://git.torproject.org/git/jtorctl +cd jtorctl +mkdir bin +javac net/freehaven/tor/control/TorControlConnection.java -d bin +cd bin +jar cvf jtorctrl.jar * +cp jtorctrl.jar ../.. +cd ../../.. + +#BUILD privoxy +echo "BUILDING PRIVOXY..." +mkdir native/privoxy +cd native/privoxy +rm download* +wget http://sourceforge.net/projects/ijbswa/files/Sources/3.0.12%20%28stable%29/… +tar xzvf download +cd privoxy-3.0.12-stable +autoheader +autoconf +#need to disable setpgrp check in configure +export ac_cv_func_setpgrp_void=yes +./configure --host=arm-linux-eabi --build=$BUILD --prefix=$NDK_TOOLCHAIN --disable-pthread +make clean +make +cd ../../.. + +#create assets folder and put the binaries in it +echo "MOVING BINARIES TO ANDROID RESOURCES..." +mkdir res/raw +cp native/privoxy/privoxy-3.0.12-stable/privoxy res/raw +cp native/tor/src/or/tor res/raw + +echo "BUILD ANDROID APP" +android update project --name Orbot --target 9 --path . +ant debug + +echo "BUILD COMPLETE"

1 0

[orbot/master] removing binary privoxy
by n8fr8＠torproject.org 05 May '12

05 May '12

commit 7f57a91d51e1d44983e18b51669ebc3ab2c75b9c Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 2 23:35:57 2012 -0400 removing binary privoxy --- res/raw/privoxy | Bin 300143 -> 0 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/privoxy b/res/raw/privoxy deleted file mode 100755 index e5c1153..0000000 Binary files a/res/raw/privoxy and /dev/null differ

1 0

[orbot/master] clean libs directory
by n8fr8＠torproject.org 05 May '12

05 May '12

commit ca9ac3a9218c1be9630085dc7eca8f9730d24484 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 2 23:36:31 2012 -0400 clean libs directory --- Makefile.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.sh b/Makefile.sh index e1fc1de..afce08b 100755 --- a/Makefile.sh +++ b/Makefile.sh @@ -7,13 +7,13 @@ if test -z $NDK_ROOT; then echo "NDK_ROOT is not exported, do so by something cl rm -rf native rm res/raw/privoxy rm res/raw/tor -rm -rf libs/jtorctrl -rm libs/jtorctrl.jar +rm -rf libs #create the native folder if it doesn't exist mkdir native mkdir native/lib mkdir native/include +mkdir libs cd native #Build openssl using default ndk-build

1 0