From d8b06ba5f9018572bc331bc6a94c2eac4a77160e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 3 Jun 2015 09:52:21 +0200 Subject: Remove ics-openvpn dependencies in files needed by Bitmask --- .../src/main/java/de/blinkt/openvpn/LaunchVPN.java | 25 ++++++++- .../de/blinkt/openvpn/core/OpenVPNService.java | 5 +- .../de/blinkt/openvpn/fragments/LogFragment.java | 59 +++++++++++----------- main/src/main/res/menu/logmenu.xml | 8 +-- 4 files changed, 61 insertions(+), 36 deletions(-) diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java index df19565c..77a78333 100644 --- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -170,6 +170,7 @@ public class LaunchVPN extends Activity { }); dialog.setNegativeButton(android.R.string.cancel, + new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -178,9 +179,31 @@ public class LaunchVPN extends Activity { finish(); } }); + dialog.create().show(); - dialog.create().show(); + } + @Override + protected void onActivityResult (int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + if(requestCode==START_VPN_PROFILE) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean showLogWindow = prefs.getBoolean("showlogwindow", true); + + if(!mhideLog && showLogWindow) + showLogWindow(); + new startOpenVpnThread().start(); + } else if (resultCode == Activity.RESULT_CANCELED) { + // User does not want us to start, so we just vanish + VpnStatus.updateStateString("USER_VPN_PERMISSION_CANCELLED", "", R.string.state_user_vpn_permission_cancelled, + ConnectionStatus.LEVEL_NOTCONNECTED); + + finish(); + } + } + void showLogWindow() { + dialog.create().show(); } @Override diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index 536abdc2..b778f4c9 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -47,7 +47,6 @@ import de.blinkt.openvpn.BuildConfig; import de.blinkt.openvpn.R; import de.blinkt.openvpn.VpnProfile; import de.blinkt.openvpn.activities.DisconnectVPN; -import de.blinkt.openvpn.activities.LogWindow; import de.blinkt.openvpn.core.VpnStatus.ByteCountListener; import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus; import de.blinkt.openvpn.core.VpnStatus.StateListener; @@ -57,6 +56,8 @@ import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTED; import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTING_NO_SERVER_REPLY_YET; import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT; +import se.leap.bitmaskclient.Dashboard; + public class OpenVPNService extends VpnService implements StateListener, Callback, ByteCountListener { public static final String START_SERVICE = "de.blinkt.openvpn.START_SERVICE"; public static final String START_SERVICE_STICKY = "de.blinkt.openvpn.START_SERVICE_STICKY"; @@ -282,7 +283,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac PendingIntent getLogPendingIntent() { // Let the configure Button show the Log - Intent intent = new Intent(getBaseContext(), LogWindow.class); + Intent intent = new Intent(getBaseContext(), Dashboard.class); intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); PendingIntent startLW = PendingIntent.getActivity(this, 0, intent, 0); intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java index 3c68fd87..bd39d55f 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java @@ -56,8 +56,6 @@ import de.blinkt.openvpn.LaunchVPN; import de.blinkt.openvpn.R; import de.blinkt.openvpn.VpnProfile; import de.blinkt.openvpn.activities.DisconnectVPN; -import de.blinkt.openvpn.activities.MainActivity; -import de.blinkt.openvpn.activities.VPNPreferences; import de.blinkt.openvpn.core.OpenVPNManagement; import de.blinkt.openvpn.core.OpenVPNService; import de.blinkt.openvpn.core.ProfileManager; @@ -69,6 +67,8 @@ import de.blinkt.openvpn.core.VpnStatus.StateListener; import static de.blinkt.openvpn.core.OpenVPNService.humanReadableByteCount; +import se.leap.bitmaskclient.Dashboard; + public class LogFragment extends ListFragment implements StateListener, SeekBar.OnSeekBarChangeListener, RadioGroup.OnCheckedChangeListener, VpnStatus.ByteCountListener { private static final String LOGTIMEFORMAT = "logtimeformat"; private static final int START_VPN_CONFIG = 0; @@ -429,34 +429,33 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. Intent intent = new Intent(getActivity(), DisconnectVPN.class); startActivity(intent); return true; - } else if (item.getItemId() == R.id.send) { - ladapter.shareLog(); - } else if (item.getItemId() == R.id.edit_vpn) { - VpnProfile lastConnectedprofile = ProfileManager.getLastConnectedVpn(); - - if (lastConnectedprofile != null) { - Intent vprefintent = new Intent(getActivity(), VPNPreferences.class) - .putExtra(VpnProfile.EXTRA_PROFILEUUID, lastConnectedprofile.getUUIDString()); - startActivityForResult(vprefintent, START_VPN_CONFIG); - } else { - Toast.makeText(getActivity(), R.string.log_no_last_vpn, Toast.LENGTH_LONG).show(); - } - } else if (item.getItemId() == R.id.toggle_time) { - showHideOptionsPanel(); - } else if (item.getItemId() == android.R.id.home) { - // This is called when the Home (Up) button is pressed - // in the Action Bar. - Intent parentActivityIntent = new Intent(getActivity(), MainActivity.class); - parentActivityIntent.addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TOP | - Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(parentActivityIntent); - getActivity().finish(); - return true; - - } - return super.onOptionsItemSelected(item); - + } else if(item.getItemId()==R.id.send) { + ladapter.shareLog(); + } else if(item.getItemId()==R.id.edit_vpn) { + VpnProfile lastConnectedprofile = ProfileManager.getLastConnectedVpn(); + + if(lastConnectedprofile!=null) { + Intent vprefintent = new Intent(getActivity(),Dashboard.class) + .putExtra(VpnProfile.EXTRA_PROFILEUUID,lastConnectedprofile.getUUIDString()); + startActivityForResult(vprefintent,START_VPN_CONFIG); + } else { + Toast.makeText(getActivity(), R.string.log_no_last_vpn, Toast.LENGTH_LONG).show(); + } + } else if(item.getItemId() == R.id.toggle_time) { + showHideOptionsPanel(); + } else if(item.getItemId() == android.R.id.home) { + // This is called when the Home (Up) button is pressed + // in the Action Bar. + Intent parentActivityIntent = new Intent(getActivity(), Dashboard.class); + parentActivityIntent.addFlags( + Intent.FLAG_ACTIVITY_CLEAR_TOP | + Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(parentActivityIntent); + getActivity().finish(); + return true; + + } + return super.onOptionsItemSelected(item); } private void showHideOptionsPanel() { diff --git a/main/src/main/res/menu/logmenu.xml b/main/src/main/res/menu/logmenu.xml index 90eba679..2709b723 100644 --- a/main/src/main/res/menu/logmenu.xml +++ b/main/src/main/res/menu/logmenu.xml @@ -37,6 +37,8 @@ android:id="@+id/edit_vpn" android:alphabeticShortcut="e" android:icon="@drawable/ic_menu_edit" - android:showAsAction="ifRoom" - android:title="@string/edit_vpn"/> - \ No newline at end of file + android:showAsAction="withText|ifRoom" + android:title="@string/edit_vpn" + android:visible="false"/> + + -- cgit v1.2.3 From a50b5921c035780e29256216baa6f1f03d923c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:17:29 +0200 Subject: Remove unused images from refs.xml, method from LaunchVPN The LaunchVPN method is askForPW. --- .../src/main/java/de/blinkt/openvpn/LaunchVPN.java | 106 +-------------------- main/src/main/res/values-v21/refs.xml | 28 ++---- main/src/main/res/values/refs.xml | 29 ++---- 3 files changed, 21 insertions(+), 142 deletions(-) diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java index 77a78333..67d577cc 100644 --- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -114,74 +114,6 @@ public class LaunchVPN extends Activity { } } - private void askForPW(final int type) { - - final EditText entry = new EditText(this); - final View userpwlayout = getLayoutInflater().inflate(R.layout.userpass, null, false); - - entry.setSingleLine(); - entry.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); - entry.setTransformationMethod(new PasswordTransformationMethod()); - - AlertDialog.Builder dialog = new AlertDialog.Builder(this); - dialog.setTitle(getString(R.string.pw_request_dialog_title, getString(type))); - dialog.setMessage(getString(R.string.pw_request_dialog_prompt, mSelectedProfile.mName)); - - if (type == R.string.password) { - ((EditText) userpwlayout.findViewById(R.id.username)).setText(mSelectedProfile.mUsername); - ((EditText) userpwlayout.findViewById(R.id.password)).setText(mSelectedProfile.mPassword); - ((CheckBox) userpwlayout.findViewById(R.id.save_password)).setChecked(!TextUtils.isEmpty(mSelectedProfile.mPassword)); - ((CheckBox) userpwlayout.findViewById(R.id.show_password)).setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) - ((EditText) userpwlayout.findViewById(R.id.password)).setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD); - else - ((EditText) userpwlayout.findViewById(R.id.password)).setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); - } - }); - - dialog.setView(userpwlayout); - } else { - dialog.setView(entry); - } - - AlertDialog.Builder builder = dialog.setPositiveButton(android.R.string.ok, - new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - if (type == R.string.password) { - mSelectedProfile.mUsername = ((EditText) userpwlayout.findViewById(R.id.username)).getText().toString(); - - String pw = ((EditText) userpwlayout.findViewById(R.id.password)).getText().toString(); - if (((CheckBox) userpwlayout.findViewById(R.id.save_password)).isChecked()) { - mSelectedProfile.mPassword = pw; - } else { - mSelectedProfile.mPassword = null; - mSelectedProfile.mTransientPW = pw; - } - } else { - mSelectedProfile.mTransientPCKS12PW = entry.getText().toString(); - } - onActivityResult(START_VPN_PROFILE, Activity.RESULT_OK, null); - - } - - }); - dialog.setNegativeButton(android.R.string.cancel, - - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - VpnStatus.updateStateString("USER_VPN_PASSWORD_CANCELLED", "", R.string.state_user_vpn_password_cancelled, - ConnectionStatus.LEVEL_NOTCONNECTED); - finish(); - } - }); - dialog.create().show(); - - } @Override protected void onActivityResult (int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -192,7 +124,9 @@ public class LaunchVPN extends Activity { if(!mhideLog && showLogWindow) showLogWindow(); - new startOpenVpnThread().start(); + + VPNLaunchHelper.startOpenVpn(mSelectedProfile, getBaseContext()); + finish(); } else if (resultCode == Activity.RESULT_CANCELED) { // User does not want us to start, so we just vanish VpnStatus.updateStateString("USER_VPN_PERMISSION_CANCELLED", "", R.string.state_user_vpn_permission_cancelled, @@ -202,40 +136,6 @@ public class LaunchVPN extends Activity { } } - void showLogWindow() { - dialog.create().show(); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (requestCode == START_VPN_PROFILE) { - if (resultCode == Activity.RESULT_OK) { - int needpw = mSelectedProfile.needUserPWInput(false); - if (needpw != 0) { - VpnStatus.updateStateString("USER_VPN_PASSWORD", "", R.string.state_user_vpn_password, - ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT); - askForPW(needpw); - } else { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean showLogWindow = prefs.getBoolean("showlogwindow", true); - - if (!mhideLog && showLogWindow) - showLogWindow(); - VPNLaunchHelper.startOpenVpn(mSelectedProfile, getBaseContext()); - finish(); - } - } else if (resultCode == Activity.RESULT_CANCELED) { - // User does not want us to start, so we just vanish - VpnStatus.updateStateString("USER_VPN_PERMISSION_CANCELLED", "", R.string.state_user_vpn_permission_cancelled, - ConnectionStatus.LEVEL_NOTCONNECTED); - - finish(); - } - } - } - void showLogWindow() { Intent startLW = new Intent(getBaseContext(), LogWindow.class); diff --git a/main/src/main/res/values-v21/refs.xml b/main/src/main/res/values-v21/refs.xml index 10ff5197..f3f43692 100644 --- a/main/src/main/res/values-v21/refs.xml +++ b/main/src/main/res/values-v21/refs.xml @@ -5,23 +5,13 @@ --> - @drawable/ic_close_white_24dp - @drawable/ic_play_arrow_white_24dp - @drawable/ic_pause_white_24dp - @drawable/ic_share_white_24dp - @drawable/ic_check_white_24dp - @drawable/ic_filter_list_white_24dp - @drawable/ic_delete_white_24dp - @drawable/ic_content_copy_white_24dp - @drawable/ic_delete_grey600_24dp + @drawable/ic_close_white_24dp + @drawable/ic_play_arrow_white_24dp + @drawable/ic_pause_white_24dp + @drawable/ic_share_white_24dp + @drawable/ic_check_white_24dp + @drawable/ic_filter_list_white_24dp + @drawable/ic_delete_white_24dp + @drawable/ic_delete_grey600_24dp + - @drawable/ic_edit_white_24dp - @drawable/ic_archive_white_24dp - @drawable/ic_edit_grey600_24dp - @drawable/ic_add_circle_outline_white_24dp - @drawable/ic_warning_black_36dp - @drawable/ic_add_circle_outline_grey600_24dp - @drawable/ic_archive_grey600_24dp - @drawable/ic_receipt_white_24dp - - \ No newline at end of file diff --git a/main/src/main/res/values/refs.xml b/main/src/main/res/values/refs.xml index 9d7d3201..4d3c257a 100644 --- a/main/src/main/res/values/refs.xml +++ b/main/src/main/res/values/refs.xml @@ -5,23 +5,12 @@ --> - @android:drawable/ic_menu_close_clear_cancel - @android:drawable/ic_media_play - @android:drawable/ic_media_pause - @android:drawable/ic_menu_share - @android:drawable/ic_menu_save - @android:drawable/ic_menu_view - @android:drawable/ic_menu_delete - @android:drawable/ic_menu_edit - @drawable/ic_menu_archive - @drawable/vpn_item_settings - @android:drawable/ic_menu_add - @android:drawable/ic_dialog_alert - @android:drawable/ic_menu_add - @drawable/ic_menu_archive - @android:drawable/ic_menu_delete - @drawable/ic_menu_copy_holo_light - @drawable/ic_menu_log - - - \ No newline at end of file + @android:drawable/ic_menu_close_clear_cancel + @android:drawable/ic_media_play + @android:drawable/ic_media_pause + @android:drawable/ic_menu_share + @android:drawable/ic_menu_save + @android:drawable/ic_menu_view + @android:drawable/ic_menu_delete + @android:drawable/ic_menu_edit + -- cgit v1.2.3 From 2ae1824801e47def4fb78008c9fb3fb2e5e89e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 20:15:12 +0200 Subject: Don't show two notifications --- .../src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index b778f4c9..291bedfe 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -185,7 +185,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac mNotificationManager.notify(OPENVPN_STATUS, notification); - startForeground(OPENVPN_STATUS, notification); + // startForeground(OPENVPN_STATUS, notification); // Check if running on a TV if (runningOnAndroidTV() && !lowpriority) @@ -937,6 +937,10 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac mConnecttime = System.currentTimeMillis(); if (!runningOnAndroidTV()) lowpriority = true; + + String ns = Context.NOTIFICATION_SERVICE; + NotificationManager mNotificationManager = (NotificationManager) getSystemService(ns); + mNotificationManager.cancel(OPENVPN_STATUS); } else { mDisplayBytecount = false; } @@ -946,8 +950,8 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac // CONNECTED // Does not work :( String msg = getString(resid); - showNotification(VpnStatus.getLastCleanLogMessage(this), - msg, lowpriority, 0, level); + // showNotification(VpnStatus.getLastCleanLogMessage(this), + // msg, lowpriority, 0, level); } } @@ -970,7 +974,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac humanReadableByteCount(diffOut / OpenVPNManagement.mBytecountInterval, true)); boolean lowpriority = !mNotificationAlwaysVisible; - showNotification(netstat, null, lowpriority, mConnecttime, LEVEL_CONNECTED); + //showNotification(netstat, null, lowpriority, mConnecttime, LEVEL_CONNECTED); } } -- cgit v1.2.3 From 3de37eb944140d385d381523d6207d4200207ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 10 Jun 2015 19:31:45 +0200 Subject: Fix wrongly deleted line from ics-openvpn Commit e154650bda257cf1a1399b6feeaa5d9da4f29761 did remove a line which was causing Bitmask to ignore the "Cancel" button of the Android VPN permission dialog. --- main/openssl | 2 +- main/openvpn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/openssl b/main/openssl index f6da7c53..00a8f82a 160000 --- a/main/openssl +++ b/main/openssl @@ -1 +1 @@ -Subproject commit f6da7c53fd01990e8e039dbfd5e9ea87e50d1d44 +Subproject commit 00a8f82a71d642557dcac8b158290b01328e3702 diff --git a/main/openvpn b/main/openvpn index a6eda60c..16ecc6b7 160000 --- a/main/openvpn +++ b/main/openvpn @@ -1 +1 @@ -Subproject commit a6eda60c1e79b5c994b78a4998d8ea2405e12001 +Subproject commit 16ecc6b792258c35f311607fe8338cf5f125bd60 -- cgit v1.2.3 From 111cfcf8e42febb5f38d3f31ef6bd6b0474b49c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 16 Jun 2015 11:59:17 +0200 Subject: Submodules as https --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 944fbabf..1c9297b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "main/openvpn"] path = main/openvpn - url = git@github.com:schwabe/openvpn.git + url = https://github.com/schwabe/openvpn.git [submodule "main/openssl"] path = main/openssl - url = git@github.com:schwabe/platform_external_openssl.git + url = https://github.com/schwabe/platform_external_openssl.git -- cgit v1.2.3 From ed730602635d3890eb167f15f09a827e38582256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 17 Jun 2015 08:57:44 +0200 Subject: Saving some time, only compile mips Reproducible build fails only with mips architecture, so I disable everything else to shorten waiting time between fixes. --- main/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/jni/Application.mk b/main/jni/Application.mk index 9ecbf2e1..149418f8 100644 --- a/main/jni/Application.mk +++ b/main/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := arm64-v8a armeabi armeabi-v7a mips x86 x86_64 +APP_ABI := mips APP_PLATFORM := android-14 APP_STL:=stlport_static @@ -8,4 +8,4 @@ APP_STL:=stlport_static #LOCAL_ARM_MODE := arm -#NDK_TOOLCHAIN_VERSION=clang \ No newline at end of file +#NDK_TOOLCHAIN_VERSION=clang -- cgit v1.2.3 From 387aaea1fe454992570fc7237db84ca74dfa2993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 17 Jun 2015 11:48:28 +0200 Subject: minivpn.c and dummy.cpp introduce randomness into nopievpn --- main/jni/Android.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main/jni/Android.mk b/main/jni/Android.mk index c61db83e..8d2d0219 100644 --- a/main/jni/Android.mk +++ b/main/jni/Android.mk @@ -65,8 +65,13 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDLIBS := -lz -lc LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn + LOCAL_SRC_FILES:= minivpn.c dummy.cpp LOCAL_MODULE = nopie_openvpn +# ======= +# LOCAL_SRC_FILES:= # minivpn.c dummy.cpp +# LOCAL_MODULE = nopievpn +# >>>>>>> minivpn.c and dummy.cpp introduce randomness into nopievpn include $(BUILD_EXECUTABLE) @@ -78,5 +83,9 @@ LOCAL_LDFLAGS = -fPIE -pie LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn LOCAL_SRC_FILES:= minivpn.c dummy.cpp LOCAL_MODULE = pie_openvpn +# ======= +# LOCAL_SRC_FILES:= # minivpn.c dummy.cpp +# LOCAL_MODULE = pievpn +# >>>>>>> minivpn.c and dummy.cpp introduce randomness into nopievpn include $(BUILD_EXECUTABLE) -- cgit v1.2.3 From 977833c2a38bbc7c9b6c31b62cbf931c3949d44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 17 Jun 2015 12:48:09 +0200 Subject: remove duplicated local_cflags for pie --- main/jni/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/main/jni/Android.mk b/main/jni/Android.mk index 8d2d0219..22ba4c7f 100644 --- a/main/jni/Android.mk +++ b/main/jni/Android.mk @@ -78,7 +78,6 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_LDLIBS := -lz -lc LOCAL_CFLAGS= -fPIE -pie -LOCAL_CFLAGS = -fPIE LOCAL_LDFLAGS = -fPIE -pie LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn LOCAL_SRC_FILES:= minivpn.c dummy.cpp -- cgit v1.2.3 From fa3ec1e18415e87ab050b8aa4dc9d749edf49f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 23 Jun 2015 13:26:04 +0200 Subject: Revert "Saving some time, only compile mips" This reverts commit dabccaea04e8ed37dacef626135cbd6d2557b319. --- main/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/jni/Application.mk b/main/jni/Application.mk index 149418f8..9ecbf2e1 100644 --- a/main/jni/Application.mk +++ b/main/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := mips +APP_ABI := arm64-v8a armeabi armeabi-v7a mips x86 x86_64 APP_PLATFORM := android-14 APP_STL:=stlport_static @@ -8,4 +8,4 @@ APP_STL:=stlport_static #LOCAL_ARM_MODE := arm -#NDK_TOOLCHAIN_VERSION=clang +#NDK_TOOLCHAIN_VERSION=clang \ No newline at end of file -- cgit v1.2.3 From 7dbaa266ed2aac4ab82672955282a6bfb43008b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sat, 2 Apr 2016 12:20:40 +0200 Subject: Update openssl and openvpn submodules --- main/openssl | 2 +- main/openvpn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/openssl b/main/openssl index 00a8f82a..f6da7c53 160000 --- a/main/openssl +++ b/main/openssl @@ -1 +1 @@ -Subproject commit 00a8f82a71d642557dcac8b158290b01328e3702 +Subproject commit f6da7c53fd01990e8e039dbfd5e9ea87e50d1d44 diff --git a/main/openvpn b/main/openvpn index 16ecc6b7..f950206d 160000 --- a/main/openvpn +++ b/main/openvpn @@ -1 +1 @@ -Subproject commit 16ecc6b792258c35f311607fe8338cf5f125bd60 +Subproject commit f950206d3f6d181eea5a267548e793c2429aace4 -- cgit v1.2.3