WolfSSL
/
wolfssljni
mirror of https://github.com/wolfSSL/wolfssljni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

rename jni shared library from libwolfssl to libwolfssljni

pull/23/head
Chris Conlon 2019-04-15 14:05:41 -07:00
parent 0a39a8d0a3
commit 79aae16993
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.xml
View File

@ -55,6 +55,7 @@
<delete dir="${reports.dir}"/> <delete dir="${reports.dir}"/>
<delete> <delete>
<fileset dir="${lib.dir}" includes="wolfssl.jar" /> <fileset dir="${lib.dir}" includes="wolfssl.jar" />
<fileset dir="${lib.dir}" includes="wolfssl-jsse.jar" />
</delete> </delete>
</target> </target>

4
java.sh
View File

@ -9,7 +9,7 @@ if [ "$OS" == "Darwin" ] ; then
javaHome=`/usr/libexec/java_home` javaHome=`/usr/libexec/java_home`
javaIncludes="-I$javaHome/include -I$javaHome/include/darwin" javaIncludes="-I$javaHome/include -I$javaHome/include/darwin"
javaLibs="-dynamiclib -framework JavaVM" javaLibs="-dynamiclib -framework JavaVM"
jniLibName="libwolfssl.jnilib" jniLibName="libwolfssljni.jnilib"
cflags="-DHAVE_ECC" cflags="-DHAVE_ECC"
elif [ "$OS" == "Linux" ] ; then elif [ "$OS" == "Linux" ] ; then
javaHome=`echo $(dirname $(dirname $(readlink -f $(which java))))` javaHome=`echo $(dirname $(dirname $(readlink -f $(which java))))`
@ -19,7 +19,7 @@ elif [ "$OS" == "Linux" ] ; then
fi fi
javaIncludes="-I$javaHome/include -I$javaHome/include/linux" javaIncludes="-I$javaHome/include -I$javaHome/include/linux"
javaLibs="-shared" javaLibs="-shared"
jniLibName="libwolfSSL.so" jniLibName="libwolfssljni.so"
cflags="-DHAVE_ECC -DUSE_FAST_MATH" cflags="-DHAVE_ECC -DUSE_FAST_MATH"
if [ "$ARCH" == "x86_64" ] ; then if [ "$ARCH" == "x86_64" ] ; then
fpic="-fPIC" fpic="-fPIC"

4
src/java/com/wolfssl/WolfSSL.java
View File

@ -283,13 +283,13 @@ public class WolfSSL {
/** /**
* Loads JNI library; must be called prior to any other calls in this class. * Loads JNI library; must be called prior to any other calls in this class.
* *
* The native library is expected to be be called "wolfssl", and must be * The native library is expected to be be called "wolfssljni", and must be
* on the system library search path. * on the system library search path.
* *
* @throws UnsatisfiedLinkError if the library is not found. * @throws UnsatisfiedLinkError if the library is not found.
*/ */
public static void loadLibrary() throws UnsatisfiedLinkError { public static void loadLibrary() throws UnsatisfiedLinkError {
System.loadLibrary("wolfSSL"); System.loadLibrary("wolfssljni");
} }
/** /**