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

[orbot/master] remove ABS dependency (no longer used)
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 3a1c603e5d3460141354d820613f17ee68e46a52 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 18 21:20:03 2015 -0400 remove ABS dependency (no longer used) --- .gitmodules | 3 --- external/ActionBarSherlock | 1 - 2 files changed, 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index aa48602..37b5026 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "external/jtorctl"] path = external/jtorctl url = https://github.com/guardianproject/jtorctl -[submodule "external/ActionBarSherlock"] - path = external/ActionBarSherlock - url = https://github.com/JakeWharton/ActionBarSherlock.git [submodule "external/openssl"] path = external/openssl url = git://git.openssl.org/openssl diff --git a/external/ActionBarSherlock b/external/ActionBarSherlock deleted file mode 160000 index c0d437c..0000000 --- a/external/ActionBarSherlock +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0d437ce4c47cb344e5d96414ffbf5f1a85c26d0

1 0

[orbot/master] use LOLLIPOP constant instead of L
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 33acf2475723dbe49459725fb3755239445af7b2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Mar 19 09:14:02 2015 -0400 use LOLLIPOP constant instead of L --- src/org/torproject/android/vpn/OrbotVpnService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index ae40fa9..46c6efc 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -208,7 +208,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { mThreadVPN.start(); } - @TargetApi(Build.VERSION_CODES.L) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void doLollipopAppRouting (Builder builder) throws NameNotFoundException {

1 0

[orbot/master] update Makefile for building tor 0.2.6.4 with patch for Android
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 84e97e6c71258791c4fd048b683b3aeb05a1b56f Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 18 21:20:20 2015 -0400 update Makefile for building tor 0.2.6.4 with patch for Android --- external/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/external/Makefile b/external/Makefile index 9d5e114..ecaecbe 100644 --- a/external/Makefile +++ b/external/Makefile @@ -180,6 +180,9 @@ tor/configure: ./autogen.sh tor/Makefile: tor/configure + cp fix_android_0.2.6.4rc_build.patch tor + cd tor && \ + git apply fix_android_0.2.6.4rc_build.patch cp config.sub tor cp config.guess tor cd tor && \ @@ -205,6 +208,8 @@ tor-clean: -rm -f tor-build-stamp -cd tor && \ git clean -fdx + -cd tor && \ + git reset HEAD --hard #------------------------------------------------------------------------------# # polipo

1 0

[orbot/master] revert to old logic for opening/showing browser
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 5e8272dcc86c2ad2fa192dc019145d9c6445552e Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 18 22:00:27 2015 -0400 revert to old logic for opening/showing browser --- AndroidManifest.xml | 73 +------------------ src/org/torproject/android/OrbotMainActivity.java | 78 +++++++++++++-------- 2 files changed, 51 insertions(+), 100 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4503f8a..084fb65 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -94,77 +94,6 @@ <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".settings.AppManager" android:label="@string/app_name"/> - <activity android:name="info.guardianproject.browser.Browser" - android:label="@string/app_name_orweb" - android:icon="@drawable/icon_orweb" - android:configChanges="locale|orientation|screenSize" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.SEARCH" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - <data android:scheme="http" /> - <data android:scheme="https" /> - <data android:scheme="about" /> - </intent-filter> -  - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - - <category android:name="android.intent.category.BROWSABLE" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:scheme="http" /> --> - <data android:scheme="https" /> - <data android:mimeType="text/html"/> - <data android:mimeType="text/plain"/> - <data android:mimeType="application/xhtml+xml"/> - <data android:mimeType="application/vnd.wap.xhtml+xml"/> - </intent-filter> - <meta-data android:name="android.app.searchable" - android:resource="@xml/searchable"/> - </activity> - <activity android:label="@string/app_name" android:name="info.guardianproject.browser.EditPreferences"></activity> - - - <service android:enabled="true" - android:name=".service.TorService" - android:permission="org.torproject.android.MANAGE_TOR" - android:stopWithTask="false" - > - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> - - <receiver android:name="org.torproject.android.service.OnBootReceiver"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - <action android:name="android.intent.action.MEDIA_MOUNTED"/> - </intent-filter> - </receiver> - - - <service android:name="org.torproject.android.vpn.OrbotVpnService" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService"/> - </intent-filter> - </service> - - </application> - - +</application> </manifest> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 62cec03..9f38be4 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -3,8 +3,6 @@ package org.torproject.android; -import info.guardianproject.browser.Browser; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; @@ -18,10 +16,12 @@ import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.ui.ChooseLocaleWizardActivity; import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.Rotate3dAnimation; +import org.torproject.android.ui.TipsAndTricks; import android.annotation.TargetApi; import android.app.Activity; import android.app.AlertDialog; +import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -652,21 +652,6 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC Editor pEdit = mPrefs.edit(); - /* - String bridges = "";//let's override, not add // mPrefs.getString(TorConstants.PREF_BRIDGES_LIST, null); - - - if (bridges != null && bridges.trim().length() > 0) - { - if (bridges.indexOf('\n')!=-1) - bridges += '\n' + newBridgeValue; - else - bridges += ',' + newBridgeValue; - } - else - bridges = newBridgeValue; - */ - pEdit.putString(TorConstants.PREF_BRIDGES_LIST,newBridgeValue); //set the string to a preference pEdit.putBoolean(TorConstants.PREF_BRIDGES_ENABLED,true); @@ -692,31 +677,68 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC /* * Launch the system activity for Uri viewing with the provided url */ - private void openBrowser(String browserLaunchUrl) + private void openBrowser(final String browserLaunchUrl) { - //startIntent("info.guardianproject.browser.Browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); - - if (mBtnVPN.isChecked()) + boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser"); + boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false); + + + if (isOrwebInstalled) + { + startIntent("info.guardianproject.browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); + } + else if (mBtnVPN.isChecked()) { //use the system browser since VPN is on Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); } + else if (isTransProxy) + { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } else { - - //use the built-in browser - Intent intentBrowser = new Intent(this, Browser.class); - intentBrowser.setAction(Intent.ACTION_VIEW); - intentBrowser.setData(Uri.parse(browserLaunchUrl)); - startActivity(intentBrowser); + AlertDialog aDialog = new AlertDialog.Builder(OrbotMainActivity.this) + .setIcon(R.drawable.onion32) + .setTitle(R.string.install_apps_) + .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) + .setPositiveButton(android.R.string.ok, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + + //prompt to install Orweb + Intent intent = new Intent(OrbotMainActivity.this,TipsAndTricks.class); + startActivity(intent); + + } + + }) + .setNegativeButton(android.R.string.no, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + + } + + }) + .show(); + } - } + private void startIntent (String pkg, String action, Uri data)

1 0

[orbot/master] udpate proguard config
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 736e32e22177d3de7480158acaaa265b249e0a1a Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 18 22:00:56 2015 -0400 udpate proguard config --- proguard-project.txt | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/proguard-project.txt b/proguard-project.txt index 7d2b51f..f2fe155 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -1,32 +1,20 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --dontobfuscate --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native <methods>; -} - --keepclasseswithmembernames class * { - public <init>(android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembernames class * { - public <init>(android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} +# Add any project specific keep options here: +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#}

1 0

[orbot/master] add libs and vpn libraries (binaries for now...)
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 3286bb77018e3a171c0a2fb963ed7a339728484d Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Mar 19 08:48:59 2015 -0400 add libs and vpn libraries (binaries for now...) .so's can be built form external/badvpn source project, but we haven't integrated them in Makefile yet --- libs/armeabi-v7a/libtun2socks.so | Bin 0 -> 121220 bytes libs/armeabi/libtun2socks.so | Bin 0 -> 125312 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/armeabi-v7a/libtun2socks.so b/libs/armeabi-v7a/libtun2socks.so new file mode 100755 index 0000000..4b21a81 Binary files /dev/null and b/libs/armeabi-v7a/libtun2socks.so differ diff --git a/libs/armeabi/libtun2socks.so b/libs/armeabi/libtun2socks.so new file mode 100755 index 0000000..f15c6e3 Binary files /dev/null and b/libs/armeabi/libtun2socks.so differ

1 0

[orbot/master] update external dependencies, add patch for tor build
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 7557ad5d7122d31d28389f60ae48017dcf14bfa3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 18 21:20:39 2015 -0400 update external dependencies, add patch for tor build --- external/fix_android_0.2.6.4rc_build.patch | 77 ++++++++++++++++++++++++++++ external/liballium | 1 - external/libevent | 2 +- external/obfsclient | 1 - external/tor | 2 +- 5 files changed, 79 insertions(+), 4 deletions(-) diff --git a/external/fix_android_0.2.6.4rc_build.patch b/external/fix_android_0.2.6.4rc_build.patch new file mode 100644 index 0000000..b7cb1cd --- /dev/null +++ b/external/fix_android_0.2.6.4rc_build.patch @@ -0,0 +1,77 @@ +From ed6a98b39661a204eb0186267bf406469b4e51ba Mon Sep 17 00:00:00 2001 +From: n8fr8 <nathan(a)freitas.net> +Date: Wed, 18 Mar 2015 17:07:49 -0400 +Subject: [PATCH 1/2] disable setting of MONOTONIC time on Android (it doesn't + work) + +--- + src/common/compat_pthreads.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c +index f4a6cad..ccacef1 100644 +--- a/src/common/compat_pthreads.c ++++ b/src/common/compat_pthreads.c +@@ -181,6 +181,7 @@ tor_cond_init(tor_cond_t *cond) + return -1; + } + ++#ifndef __ANDROID_API__ + #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) + /* Use monotonic time so when we timedwait() on it, any clock adjustment + * won't affect the timeout value. */ +@@ -188,6 +189,7 @@ tor_cond_init(tor_cond_t *cond) + return -1; + } + #endif ++#endif + if (pthread_cond_init(&cond->cond, &condattr)) { + return -1; + } +-- +1.9.1 + + +From 4257a9f1fbbc05413077b7b70215622099f667df Mon Sep 17 00:00:00 2001 +From: n8fr8 <nathan(a)freitas.net> +Date: Wed, 18 Mar 2015 17:08:14 -0400 +Subject: [PATCH 2/2] you must explicitly include limits.h on Android + +--- + src/ext/trunnel/trunnel.c | 1 + + src/trunnel/trunnel-local.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c +index 7353237..1d4403c 100644 +--- a/src/ext/trunnel/trunnel.c ++++ b/src/ext/trunnel/trunnel.c +@@ -13,6 +13,7 @@ + #include <stdlib.h> + #include <string.h> + #include "trunnel-impl.h" ++#include "limits.h" + + #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ + __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h +index b7c2ab9..e55cf3c 100644 +--- a/src/trunnel/trunnel-local.h ++++ b/src/trunnel/trunnel-local.h +@@ -5,6 +5,7 @@ + #include "util.h" + #include "compat.h" + #include "crypto.h" ++#include "limits.h" + + #define trunnel_malloc tor_malloc + #define trunnel_calloc tor_calloc +@@ -15,4 +16,5 @@ + #define trunnel_assert tor_assert + #define trunnel_memwipe(mem, len) memwipe((mem), 0, (len)) + ++ + #endif +-- +1.9.1 + diff --git a/external/liballium b/external/liballium deleted file mode 160000 index 5272de7..0000000 --- a/external/liballium +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5272de7361897ee6b5c969fd1eec6609d64ac13a diff --git a/external/libevent b/external/libevent index 6417777..c51b159 160000 --- a/external/libevent +++ b/external/libevent @@ -1 +1 @@ -Subproject commit 64177777165d9684bafbfa946abd126f7ebff11f +Subproject commit c51b159cff9f5e86696f5b9a4c6f517276056258 diff --git a/external/obfsclient b/external/obfsclient deleted file mode 160000 index 9c164b2..0000000 --- a/external/obfsclient +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9c164b2afb666d0bcd26ba3eeb6da07a9fff551c diff --git a/external/tor b/external/tor index 42b4260..0c2e4ae 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 42b42605f8d8eac25361be229354f6393967df4f +Subproject commit 0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70

1 0

[orbot/master] add PT builds based on external/pluto golang build system
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 0bf26b296a418604041d4c64de25f80e96cec0fe Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Mar 19 09:12:33 2015 -0400 add PT builds based on external/pluto golang build system this will be added into the Makefile but it isn't there yet and our build server doesn't have the golang support on it yet --- res/raw/meek.mp3 | Bin 0 -> 1846201 bytes res/raw/obfs4proxy.mp3 | Bin 0 -> 2062869 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/meek.mp3 b/res/raw/meek.mp3 new file mode 100644 index 0000000..3b79ca5 Binary files /dev/null and b/res/raw/meek.mp3 differ diff --git a/res/raw/obfs4proxy.mp3 b/res/raw/obfs4proxy.mp3 new file mode 100644 index 0000000..dd8a463 Binary files /dev/null and b/res/raw/obfs4proxy.mp3 differ

1 0

[orbot/master] remove dependencies no longer needed
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit ebb5750a57d277a6a069b89a35878dbfb0def234 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 18 22:00:44 2015 -0400 remove dependencies no longer needed --- project.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/project.properties b/project.properties index 7300f9d..4e5c361 100644 --- a/project.properties +++ b/project.properties @@ -12,5 +12,3 @@ target=android-21 android.library.reference.1=external/appcompat android.library.reference.2=external/superuser-commands/RootCommands-Library -android.library.reference.3=../Orweb -android.library.reference.4=../OnionKit/libnetcipher

1 0

[orbot/master] re-add accidentally removed manifest entries!
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 5bd55f915218f2993ee1cf1aeab4ccbe8972caac Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Mar 19 09:56:15 2015 -0400 re-add accidentally removed manifest entries! --- AndroidManifest.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 084fb65..398446e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -94,6 +94,32 @@ <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".settings.AppManager" android:label="@string/app_name"/> + <service android:enabled="true" + android:name=".service.TorService" + android:permission="org.torproject.android.MANAGE_TOR" + android:stopWithTask="false" + > + <intent-filter> + <action android:name="org.torproject.android.service.ITorService" /> + <action android:name="org.torproject.android.service.TOR_SERVICE" /> + </intent-filter> + </service> + + <receiver android:name="org.torproject.android.service.OnBootReceiver"> + <intent-filter> + <action android:name="android.intent.action.BOOT_COMPLETED" /> + <action android:name="android.intent.action.QUICKBOOT_POWERON" /> + <action android:name="android.intent.action.MEDIA_MOUNTED"/> + </intent-filter> + </receiver> + + + <service android:name="org.torproject.android.vpn.OrbotVpnService" + android:permission="android.permission.BIND_VPN_SERVICE"> + <intent-filter> + <action android:name="android.net.VpnService"/> + </intent-filter> + </service> </application> </manifest>

1 0