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 0048a2daf1939020669cdf68d0ad4d640c0b7644..9e9b6733a7b6106528819bb46013e9fee182800d 100644 (file)
--- 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 8c4224e56a1d77c149bfd30f0159c1217cda3ab5..c37210d49adea5be18ac4a9e3a3b155e52f8495d 100644 (file)
--- 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 eaba85d4ed7a7cbb96011184ad43ad234919f73d..fb973a8df437aa888a0eef0395074108619122be 100644 (file)
--- 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 },