June 2015 - tor-commits - lists.torproject.org

[orbot/master] add custom ant rules for automating the release process
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 6775f86b6537d4485964f48f0a8c4aa22700e9b5 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jun 4 15:21:00 2015 -0400 add custom ant rules for automating the release process --- custom_rules.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/custom_rules.xml b/custom_rules.xml new file mode 100644 index 0000000..5f473de --- /dev/null +++ b/custom_rules.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + + <target name="-getgitdetails" > + <exec executable="git" outputproperty="git.describe"> + <arg value="describe"/> + </exec> + <exec executable="git" outputproperty="git.revision"> + <arg value="rev-parse"/> + <arg value="HEAD"/> + </exec> + </target> + + <target name="rename-release-with-version-number" depends="-getgitdetails"> + <xmlproperty file="AndroidManifest.xml" + prefix="themanifest" + collapseAttributes="true"/> +  + <property name="out.packaged.file" + location="${out.absolute.dir}/${ant.project.name}-v${git.describe}-unsigned.apk" /> + <property name="out.final.file" + location="${out.absolute.dir}/${ant.project.name}-v${git.describe}.apk" /> + </target> + + <target name="-set-release-mode" + depends="rename-release-with-version-number,android_rules.-set-release-mode"> + <echo message="target: ${build.target}"></echo> + </target> + + <target name="-post-package" depends="-getgitdetails"> + <property file="${sdk.dir}/tools/source.properties"/> + <property name="meta.inf.dir" value="${out.dir}/META-INF"/> + <property name="build.manifest.file" value="${meta.inf.dir}/BUILD.MF"/> + <mkdir dir="${meta.inf.dir}"/> + <manifest file="${build.manifest.file}"> + <attribute name="Implementation-Package-Name" value="${themanifest.manifest.package}"/> + <attribute name="Implementation-Version-Name" value="${themanifest.manifest.android:versionName}"/> + <attribute name="Implementation-Version-Code" value="${themanifest.manifest.android:versionCode}"/> + <attribute name="Git-Revision" value="${git.revision}"/> + <attribute name="Android-SDK-Release" value="${Pkg.Revision}"/> + <attribute name="Android-SDK-Host-OS" value="${Archive.HostOs}"/> + <attribute name="Android-SDK-aapt" value="${aapt}"/> + <attribute name="Android-SDK-zipalign" value="${zipalign}"/> + </manifest> + <condition property="build.is.debug" value="true" else="false"> + <equals arg1="${build.target}" arg2="debug" /> + </condition> +  + <if condition="${build.is.debug}"> + <else> + <jar update="true" destfile="${out.packaged.file}"> + <fileset dir="${out.dir}" includes="META-INF/BUILD.MF"/> + </jar> + </else> + </if> + </target> +</project>

1 0

[orbot/master] Add support for variable arch builds to support mips & 64-bit archs
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit adb9a193672fa7970969a5fae44ca40cd78bf3f0 Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy(a)users.sourceforge.net> Date: Mon Apr 27 17:58:57 2015 +0200 Add support for variable arch builds to support mips & 64-bit archs --- external/Makefile | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/external/Makefile b/external/Makefile index b9cd735..9a31f4f 100644 --- a/external/Makefile +++ b/external/Makefile @@ -24,17 +24,37 @@ endif # Android NDK setup NDK_BASE ?= /opt/android-ndk NDK_PLATFORM_LEVEL ?= 16 -NDK_ABI ?= arm NDK_TOOLCHAIN_VERSION=4.8 APP_ABI ?= armeabi + +NDK_ABI := $(APP_ABI) +ifneq ($(filter arm%, $(APP_ABI)),) + NDK_ABI := arm +endif +ifneq ($(filter arm64%, $(APP_ABI)),) + NDK_ABI := arm64 +endif NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') -ifeq ($(NDK_ABI),x86) - HOST = i686-linux-android - NDK_TOOLCHAIN = $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION) -else - HOST = $(NDK_ABI)-linux-androideabi - NDK_TOOLCHAIN = $(HOST)-$(NDK_TOOLCHAIN_VERSION) +ifneq ($(filter mips%, $(NDK_ABI)),) + HOST := $(NDK_ABI)el-linux-android +endif +ifneq ($(filter arm64, $(NDK_ABI)),) + HOST := aarch64-linux-android +endif +ifneq ($(filter arm, $(NDK_ABI)),) + HOST := arm-linux-androideabi +endif +ifneq ($(filter x86, $(NDK_ABI)),) + HOST := i686-linux-android +endif +ifneq ($(filter x86_64, $(NDK_ABI)),) + HOST := x86_64-linux-android +endif + +NDK_TOOLCHAIN := $(HOST)-$(NDK_TOOLCHAIN_VERSION) +ifneq ($(filter x86%, $(NDK_ABI)),) + NDK_TOOLCHAIN := $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION) endif NDK_TOOLCHAIN_BASE=$(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR)

1 0

[orbot/master] Add iptables-clean prerequisite to clean target
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit ebe85e55bced81db0ce6f27d2f2f6c952a74b60a Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy(a)users.sourceforge.net> Date: Tue Apr 28 17:13:06 2015 +0200 Add iptables-clean prerequisite to clean target --- external/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 9a31f4f..90e80e2 100644 --- a/external/Makefile +++ b/external/Makefile @@ -298,7 +298,7 @@ assets-clean: # cleanup, cleanup, put the toys away ##clean: openssl-clean libevent-clean tor-clean polipo-clean jtorctl-clean assets-clean -clean: openssl-clean libevent-clean tor-clean polipo-clean jtorctl-clean assets-clean +clean: openssl-clean libevent-clean tor-clean polipo-clean iptables-clean jtorctl-clean assets-clean #------------------------------------------------------------------------------# # debugging stuff

1 0

[orbot/master] Patch libevent to compile for 64-bit archs.
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 81a945e6326f32b47895cf71db595736ce934f72 Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy(a)users.sourceforge.net> Date: Wed Apr 29 15:29:28 2015 +0200 Patch libevent to compile for 64-bit archs. --- external/Makefile | 3 +++ external/libevent-patch-1 | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/external/Makefile b/external/Makefile index 90e80e2..d9a3443 100644 --- a/external/Makefile +++ b/external/Makefile @@ -132,6 +132,9 @@ openssl-clean: libevent/Makefile: sed -i 's@$SUBDIRS = . include$ sample test@\1@' libevent/Makefile.am + cp libevent-patch-1 libevent + -cd libevent && \ + patch -N -p1 --reject-file=- < libevent-patch-1 ##sed -i 's@$AC_OUTPUT(Makefile include/Makefile$ test/Makefile sample/Makefile)@\1)@' libevent/configure.in cd libevent && ./autogen.sh cp config.sub libevent diff --git a/external/libevent-patch-1 b/external/libevent-patch-1 new file mode 100644 index 0000000..babcf9e --- /dev/null +++ b/external/libevent-patch-1 @@ -0,0 +1,29 @@ +For some reason arc4random_addrandom isn't present in 64-bit android archs. ! + +diff --git a/configure.ac b/configure.ac +index d42edd8..c511be7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -290,7 +290,7 @@ AC_HEADER_TIME + + dnl Checks for library functions. + AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep]) +-AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl]) ++AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf arc4random_addrandom issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl]) + AC_CHECK_FUNCS([umask]) + + AC_CACHE_CHECK( +diff --git a/evutil_rand.c b/evutil_rand.c +index 284341c..97161e4 100644 +--- a/evutil_rand.c ++++ b/evutil_rand.c +@@ -174,7 +174,9 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) + void + evutil_secure_rng_add_bytes(const char *buf, size_t n) + { ++#ifdef _EVENT_HAVE_ARC4RANDOM_ADDRANDOM + arc4random_addrandom((unsigned char*)buf, + n>(size_t)INT_MAX ? INT_MAX : (int)n); ++#endif + } +

1 0

[orbot/master] Update OpenSSL to 1.0.2a
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 8d7c32c84b94d242f86ed09d60a5064d4b868c72 Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy(a)users.sourceforge.net> Date: Wed Apr 29 16:08:02 2015 +0200 Update OpenSSL to 1.0.2a Also, disable rc4 cipher for 64-bit archs, to avoid this link error for tor: external/lib/libcrypto.a(e_rc4_hmac_md5.o):e_rc4_hmac_md5.c:function rc4_hmac_md5_cipher: error: undefined reference to 'rc4_md5_enc' --- external/Makefile | 13 +++++++++++-- external/openssl | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/external/Makefile b/external/Makefile index d9a3443..f499ff5 100644 --- a/external/Makefile +++ b/external/Makefile @@ -97,16 +97,25 @@ all: assets #------------------------------------------------------------------------------# # openssl +# Disable rc4 cipher for 64-bit archs, to avoid this link error for tor: +# external/lib/libcrypto.a(e_rc4_hmac_md5.o):e_rc4_hmac_md5.c:function rc4_hmac_md5_cipher: error: undefined reference to 'rc4_md5_enc' +OPENSSL_CONF_FLAG= +ifneq ($(findstring 64, $(NDK_ABI)),) + OPENSSL_CONF_FLAG=no-rc4 +endif + lib/libcrypto.a: cd openssl && \ - ./Configure android -DL_ENDIAN && \ + ./Configure android -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \ + make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \ make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs lib/libssl.a: cp config.sub openssl cp config.guess openssl cd openssl && \ - ./Configure android -DL_ENDIAN && \ + ./Configure android -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \ + make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \ make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs openssl-build-stamp: lib/libcrypto.a lib/libssl.a diff --git a/external/openssl b/external/openssl index 2b45603..3df69d3 160000 --- a/external/openssl +++ b/external/openssl @@ -1 +1 @@ -Subproject commit 2b456034457b58454aae3998a2765b6a5b9bc837 +Subproject commit 3df69d3aefde7671053d4e3c242b228e5d79c83f

1 0

[orbot/master] Merge branch 'build_system' of https://github.com/aelmahmoudy/orbot into aelmahmoudy-build_system
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 4163fc14d758cbcb110de2b4871a57efaa987bce Merge: fa533e9 d5e937d Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon May 11 15:44:29 2015 -0400 Merge branch 'build_system' of https://github.com/aelmahmoudy/orbot into aelmahmoudy-build_system external/Makefile | 61 +++++++++++++++++++++++++++++++++++++-------- external/libevent-patch-1 | 29 +++++++++++++++++++++ external/openssl | 2 +- 3 files changed, 81 insertions(+), 11 deletions(-)

1 0

[orbot/master] Fix build for mips* archs.
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit d5e937d2a0d1ab07cdff1f10ee375181d7d9478a Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy(a)users.sourceforge.net> Date: Wed Apr 29 22:57:13 2015 +0200 Fix build for mips* archs. OpenSSL's 'make depend' fails if _MIPS_SZLONG is not set --- external/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index f499ff5..22af090 100644 --- a/external/Makefile +++ b/external/Makefile @@ -101,7 +101,16 @@ all: assets # external/lib/libcrypto.a(e_rc4_hmac_md5.o):e_rc4_hmac_md5.c:function rc4_hmac_md5_cipher: error: undefined reference to 'rc4_md5_enc' OPENSSL_CONF_FLAG= ifneq ($(findstring 64, $(NDK_ABI)),) - OPENSSL_CONF_FLAG=no-rc4 + OPENSSL_CONF_FLAG+=no-rc4 +endif + +# OpenSSL's 'make depend' fails if _MIPS_SZLONG is not set: +ifneq ($(filter mips%, $(NDK_ABI)),) + ifneq ($(findstring 64, $(NDK_ABI)),) + OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=64 + else + OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=32 + endif endif lib/libcrypto.a:

1 0

[orbot/master] fix handle intent for hidden service API request
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit fa533e9d5240ab2eb26af7b37f59452be0f28bf5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon May 11 15:41:43 2015 -0400 fix handle intent for hidden service API request --- src/org/torproject/android/OrbotMainActivity.java | 105 +++++++++++++-------- 1 file changed, 66 insertions(+), 39 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 26750ea..bf9791f 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -499,45 +499,67 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } - private void enableHiddenServicePort (int hsPort) + private void enableHiddenServicePort (int hsPort) throws RemoteException, InterruptedException { Editor pEdit = mPrefs.edit(); String hsPortString = mPrefs.getString("pref_hs_ports", ""); - - if (hsPortString.length() > 0 && hsPortString.indexOf(hsPort+"")==-1) - hsPortString += ',' + hsPort; - else - hsPortString = hsPort + ""; - - pEdit.putString("pref_hs_ports", hsPortString); - pEdit.putBoolean("pref_hs_enable", true); - - pEdit.commit(); - String onionHostname = mPrefs.getString("pref_hs_hostname",""); + + if (hsPortString.indexOf(hsPort+"")==-1) + { + if (hsPortString.length() > 0 && hsPortString.indexOf(hsPort+"")==-1) + hsPortString += ',' + hsPort; + else + hsPortString = hsPort + ""; + + pEdit.putString("pref_hs_ports", hsPortString); + pEdit.putBoolean("pref_hs_enable", true); + + pEdit.commit(); + } - while (onionHostname.length() == 0) + if (onionHostname == null || onionHostname.length() == 0) { - //we need to stop and start Tor - try { - stopTor(); - - Thread.sleep(3000); //wait three seconds + stopTor(); + startTor(); + + new Thread () { - startTor(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - onionHostname = mPrefs.getString("pref_hs_hostname",""); - } + + public void run () + { + String onionHostname = mPrefs.getString("pref_hs_hostname",""); + + while (onionHostname.length() == 0) + { + //we need to stop and start Tor + try { + Thread.sleep(3000); //wait three seconds + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + onionHostname = mPrefs.getString("pref_hs_hostname",""); + } + + Intent nResult = new Intent(); + nResult.putExtra("hs_host", onionHostname); + setResult(RESULT_OK, nResult); + finish(); + } + }.start(); - Intent nResult = new Intent(); - nResult.putExtra("hs_host", onionHostname); - setResult(RESULT_OK, nResult); + } + else + { + Intent nResult = new Intent(); + nResult.putExtra("hs_host", onionHostname); + setResult(RESULT_OK, nResult); + finish(); + } } @@ -557,20 +579,26 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon if (action.equals("org.torproject.android.REQUEST_HS_PORT")) { - + final int hiddenServicePortRequest = getIntent().getIntExtra("hs_port", -1); + DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { switch (which){ case DialogInterface.BUTTON_POSITIVE: - int hsPort = getIntent().getIntExtra("hs_port", -1); - - enableHiddenServicePort (hsPort); - - finish(); + try { + enableHiddenServicePort (hiddenServicePortRequest); + + } catch (RemoteException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + - break; case DialogInterface.BUTTON_NEGATIVE: @@ -581,14 +609,13 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } }; - int hsPort = getIntent().getIntExtra("hs_port", -1); - String requestMsg = getString(R.string.hidden_service_request, hsPort); + String requestMsg = getString(R.string.hidden_service_request, hiddenServicePortRequest); AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(requestMsg).setPositiveButton("Allow", dialogClickListener) .setNegativeButton("Deny", dialogClickListener).show(); - + return; //don't null the setIntent() as we need it later } else if (action.equals("org.torproject.android.START_TOR")) {

1 0

[orbot/master] Merge branch 'aelmahmoudy-build_system'
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 3a3f701441966ad3d9db5ef2c10960cfc8786962 Merge: fa533e9 4163fc1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon May 11 15:46:51 2015 -0400 Merge branch 'aelmahmoudy-build_system' external/Makefile | 61 +++++++++++++++++++++++++++++++++++++-------- external/libevent-patch-1 | 29 +++++++++++++++++++++ external/openssl | 2 +- 3 files changed, 81 insertions(+), 11 deletions(-)

1 0

[tor/master] Remove janky getpass implementations
by nickm＠torproject.org 25 Jun '15

25 Jun '15

commit 272229ff5d3828eb2f51b93a0079a8e86d1ec5af Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 11:52:54 2015 -0400 Remove janky getpass implementations --- src/common/compat.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 4a35183..6e46f27 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3321,22 +3321,7 @@ tor_getpass(const char *prompt, char *output, size_t buflen) SecureZeroMemory(buf, sizeof(wchar_t)*buflen); tor_free(buf); return r; -#elif defined(HAVE_GETPASS) - /* XXX We shouldn't actually use this; it's deprecated to hell and back */ - memset(output, 0, buflen); - char *pwd = getpass(prompt); - if (pwd == NULL) - return -1; - ssize_t len = (ssize_t)strlen(pwd); - strlcpy(output, pwd, buflen); - memset(pwd, 0, len); - return len; #else - /* XXX This is even worse. */ - puts(prompt); - ssize_t n = read(STDIN_FILENO, output, buflen); - if (n < 0) - return -1; - return n; +#error "No implementation for tor_getpass found!" #endif }

1 0