diff options
author | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
---|---|---|
committer | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
commit | ac4047ce11c91a752c910f4afcd24f69a1621ef3 (patch) | |
tree | 044b866f2bd9a83246a6128c0e6f8afc4ce5a9d0 /app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java | |
parent | 66c79953db6876ec17a7ebf50dc4fd07d24fae37 (diff) | |
parent | 59985587c758f93844df7600f18c0837c672f259 (diff) |
Merge branch 'develop' move to 'master-'based development
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java b/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java index f67b7730..ea003d41 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java +++ b/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java @@ -1,19 +1,26 @@ /* - * Copyright (c) 2012-2014 Arne Schwabe + * Copyright (c) 2012-2016 Arne Schwabe * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; +import android.os.Build; + import java.security.InvalidKeyException; public class NativeUtils { - public static native byte[] rsasign(byte[] input,int pkey) throws InvalidKeyException; - public static native String[] getIfconfig() throws IllegalArgumentException; - static native void jniclose(int fdint); - - static { - System.loadLibrary("stlport_shared"); - System.loadLibrary("opvpnutil"); - } + public static native byte[] rsasign(byte[] input, int pkey) throws InvalidKeyException; + + public static native String[] getIfconfig() throws IllegalArgumentException; + + static native void jniclose(int fdint); + + public static native String getNativeAPI(); + + static { + System.loadLibrary("opvpnutil"); + if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN) + System.loadLibrary("jbcrypto"); + } } |