From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 7 Dec 2016 16:52:33 +0000 (+0100)
Subject: android: Ensure that the certificates are loaded when accessing them via JNI
X-Git-Tag: 5.5.2dr3~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e85b5a492aa001d6064ee7d88feb2e36ad14359;p=thirdparty%2Fstrongswan.git

android: Ensure that the certificates are loaded when accessing them via JNI
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
index d3077f7ff6..0048a2daf1 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
@@ -542,7 +542,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 	private byte[][] getTrustedCertificates()
 	{
 		ArrayList<byte[]> certs = new ArrayList<byte[]>();
-		TrustedCertificateManager certman = TrustedCertificateManager.getInstance();
+		TrustedCertificateManager certman = TrustedCertificateManager.getInstance().load();
 		try
 		{
 			String alias = this.mCurrentCertificateAlias;