From 4eb83bcf13d2d9a25709d6f5887f14388c9c98f0 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Fri, 22 Jul 2011 11:43:05 +0200
Subject: [PATCH] Updated Android implementation to support new trusted root CA
 option

---
 LinphoneCoreFactoryImpl.java | 14 ++++++++++++++
 LinphoneCoreImpl.java        |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/LinphoneCoreFactoryImpl.java b/LinphoneCoreFactoryImpl.java
index 7e8f6e5de..f92dd6c86 100644
--- a/LinphoneCoreFactoryImpl.java
+++ b/LinphoneCoreFactoryImpl.java
@@ -19,7 +19,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone.core;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.util.Iterator;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
 
 public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 
diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java
index b8fddda20..f09c5f9ee 100644
--- a/LinphoneCoreImpl.java
+++ b/LinphoneCoreImpl.java
@@ -87,6 +87,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native int[] getPreferredVideoSize(long nativePtr);
 	private native void setRing(long nativePtr, String path);
 	private native String getRing(long nativePtr);
+	private native void setRootCA(long nativePtr, String path);
 	private native long[] listVideoPayloadTypes(long nativePtr);
 	private native long[] listAudioPayloadTypes(long nativePtr);
 	private native void enableKeepAlive(long nativePtr,boolean enable);
@@ -420,6 +421,10 @@ class LinphoneCoreImpl implements LinphoneCore {
 		return getRing(nativePtr);
 	}
 	
+	public void setRootCA(String path) {
+		setRootCA(nativePtr, path);
+	}
+	
 	public PayloadType[] getVideoCodecs() {
 		long[] typesPtr = listVideoPayloadTypes(nativePtr);
 		if (typesPtr == null) return null;