Rename openssl libs. ZRTP API and makefiles.

diff --git a/LinphoneCallImpl.java b/LinphoneCallImpl.java
index 653bd157eebf1e5fba4677ba8afdbaa6e6971e70..55d3baedf1d24822cbc7bf054dc97e38e233ca58 100644 (file)
--- a/LinphoneCallImpl.java
+++ b/LinphoneCallImpl.java
@@ -39,6 +39,9 @@ class LinphoneCallImpl implements LinphoneCall {
        private native int getDuration(long nativePtr);
        private native float getCurrentQuality(long nativePtr);
        private native float getAverageQuality(long nativePtr);
+       private native String getAuthenticationToken(long nativePtr);
+       private native boolean isAuthenticationTokenVerified(long nativePtr);
+       private native boolean areStreamsEncrypted(long nativePtr);
 
        protected LinphoneCallImpl(long aNativePtr)  {
                nativePtr = aNativePtr;
@@ -109,5 +112,14 @@ class LinphoneCallImpl implements LinphoneCall {
        public float getCurrentQuality() {
                return getCurrentQuality(nativePtr);
        }
-       
+
+       public String getAuthenticationToken(){
+               return getAuthenticationToken(nativePtr);
+       }
+       public boolean isAuthenticationTokenVerified(){
+               return isAuthenticationTokenVerified(nativePtr);
+       }
+       public boolean areStreamsEncrypted() {
+               return areStreamsEncrypted(nativePtr);
+       }
 }

diff --git a/LinphoneCoreFactoryImpl.java b/LinphoneCoreFactoryImpl.java
index a2800be92194d55bffc071174cec64cac62040bf..6301c5c70a4a7bca7780fb79dca0b38699474f6e 100644 (file)
--- a/LinphoneCoreFactoryImpl.java
+++ b/LinphoneCoreFactoryImpl.java
@@ -32,10 +32,22 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
        }
 
        static {
+               // FFMPEG (audio/video)
                loadOptionalLibrary("avutil");
                loadOptionalLibrary("swscale");
                loadOptionalLibrary("avcore");
                loadOptionalLibrary("avcodec");
+
+               // OPENSSL (cryptography)
+               // lin prefix avoids collision with libs in /system/lib
+               loadOptionalLibrary("lincrypto");
+               loadOptionalLibrary("linssl");
+
+               // Secure RTP and key negotiation
+               loadOptionalLibrary("srtp");
+               loadOptionalLibrary("zrtpcpp"); // GPLv3+
+
+               //Main library
                System.loadLibrary("linphone");
        }
        @Override

diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java
index b68d9c6763a05d0964e9c92e35cd871e396070bf..b8fddda20e4d016d026eed48b112a4bd3138bdbb 100644 (file)
--- a/LinphoneCoreImpl.java
+++ b/LinphoneCoreImpl.java
@@ -101,7 +101,8 @@ class LinphoneCoreImpl implements LinphoneCore {
        private native int resumeCall(long nativePtr, long callPtr);
        private native void setUploadPtime(long nativePtr, int ptime);
        private native void setDownloadPtime(long nativePtr, int ptime);
-       
+       private native void setZrtpSecretsCache(long nativePtr, String file);
+
        LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig,File factoryConfig,Object  userdata) throws IOException {
                mListener=listener;
                nativePtr = newLinphoneCore(listener,userConfig.getCanonicalPath(),factoryConfig.getCanonicalPath(),userdata);
@@ -493,4 +494,8 @@ class LinphoneCoreImpl implements LinphoneCore {
        public void setUploadPtime(int ptime) {
                setUploadPtime(nativePtr,ptime);
        }
+
+       public void setZrtpSecretsCache(String file) {
+               setZrtpSecretsCache(nativePtr,file);
+       }
 }

diff --git a/Version.java b/Version.java
index 61a92b40bd0b3b4845633d9bcf85d129f2f11e6b..14dff0c278b341e8012eb7fe16569b047fe17e83 100644 (file)
--- a/Version.java
+++ b/Version.java
@@ -34,6 +34,7 @@ public class Version {
        public static final int API09_GINGERBREAD_23 = 9;
        public static final int API11_HONEYCOMB_30 = 11;
 
+       private static native boolean nativeHasZrtp();
        private static native boolean nativeHasNeon();
        private static Boolean hasNeon;
 
@@ -69,4 +70,7 @@ public class Version {
                return !Version.sdkStrictlyBelow(5) && Version.hasNeon() && Hacks.hasCamera();
        }
 
+       public static boolean hasZrtp(){
+               return nativeHasZrtp();
+       }
 }