From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 9 Dec 2016 10:16:42 +0000 (+0100)
Subject: android: Make sure libtpmtss is loaded on older systems
X-Git-Tag: 5.5.2dr3~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9920824e70009bb1cfac012b600ffcf7671a3b5b;p=thirdparty%2Fstrongswan.git

android: Make sure libtpmtss is loaded on older systems

On newer Android systems this seems to happen automatically (or does at
least not cause crashes if the library is not loaded).
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
index 0048a2daf1..9e9b6733a7 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -943,6 +943,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 
 			if (MainActivity.USE_BYOD)
 			{
+				System.loadLibrary("tpmtss");
 				System.loadLibrary("tncif");
 				System.loadLibrary("tnccs");
 				System.loadLibrary("imcv");
diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
index 8c4224e56a..c37210d49a 100644
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
@@ -57,7 +57,7 @@ LOCAL_LDLIBS := -llog
 LOCAL_SHARED_LIBRARIES := libstrongswan libipsec libcharon
 
 ifneq ($(strongswan_USE_BYOD),)
-LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs
+LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs libtpmtss
 endif
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
index eaba85d4ed..fb973a8df4 100644
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
@@ -33,6 +33,7 @@ static struct {
 } libs[] = {
 	{ "libstrongswan.so", NULL },
 #ifdef USE_BYOD
+	{ "libtpmtss.so", NULL },
 	{ "libtncif.so", NULL },
 	{ "libtnccs.so", NULL },
 	{ "libimcv.so", NULL },