From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 30 May 2014 09:22:19 +0000 (+0200)
Subject: android: Remove unused hash argument from getTrustedCertificates()
X-Git-Tag: 5.2.1dr1~117^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d994ba5eaa0f92ecaa6ff95d0b133307312fc8f;p=thirdparty%2Fstrongswan.git

android: Remove unused hash argument from getTrustedCertificates()
---

diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c
index 707bb3df0a..32bf28f098 100644
--- a/src/frontends/android/jni/libandroidbridge/charonservice.c
+++ b/src/frontends/android/jni/libandroidbridge/charonservice.c
@@ -299,12 +299,12 @@ METHOD(charonservice_t, get_trusted_certificates, linked_list_t*,
 
 	method_id = (*env)->GetMethodID(env,
 						android_charonvpnservice_class,
-						"getTrustedCertificates", "(Ljava/lang/String;)[[B");
+						"getTrustedCertificates", "()[[B");
 	if (!method_id)
 	{
 		goto failed;
 	}
-	jcerts = (*env)->CallObjectMethod(env, this->vpn_service, method_id, NULL);
+	jcerts = (*env)->CallObjectMethod(env, this->vpn_service, method_id);
 	if (!jcerts || androidjni_exception_occurred(env))
 	{
 		goto failed;
diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index e45a7d9bd3..31172ab44e 100644
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -419,25 +419,19 @@ public class CharonVpnService extends VpnService implements Runnable
 	 * Function called via JNI to generate a list of DER encoded CA certificates
 	 * as byte array.
 	 *
-	 * @param hash optional alias (only hash part), if given matching certificates are returned
 	 * @return a list of DER encoded CA certificates
 	 */
-	private byte[][] getTrustedCertificates(String hash)
+	private byte[][] getTrustedCertificates()
 	{
 		ArrayList<byte[]> certs = new ArrayList<byte[]>();
 		TrustedCertificateManager certman = TrustedCertificateManager.getInstance();
 		try
 		{
-			if (hash != null)
+			String alias = this.mCurrentCertificateAlias;
+			if (alias != null)
 			{
-				String alias = "user:" + hash + ".0";
 				X509Certificate cert = certman.getCACertificateFromAlias(alias);
 				if (cert == null)
-				{
-					alias = "system:" + hash + ".0";
-					cert = certman.getCACertificateFromAlias(alias);
-				}
-				if (cert == null)
 				{
 					return null;
 				}
@@ -445,23 +439,10 @@ public class CharonVpnService extends VpnService implements Runnable
 			}
 			else
 			{
-				String alias = this.mCurrentCertificateAlias;
-				if (alias != null)
+				for (X509Certificate cert : certman.getAllCACertificates().values())
 				{
-					X509Certificate cert = certman.getCACertificateFromAlias(alias);
-					if (cert == null)
-					{
-						return null;
-					}
 					certs.add(cert.getEncoded());
 				}
-				else
-				{
-					for (X509Certificate cert : certman.getAllCACertificates().values())
-					{
-						certs.add(cert.getEncoded());
-					}
-				}
 			}
 		}
 		catch (CertificateEncodingException e)