From 174a0c8a3807df22ebd5731e139c0f0bb511f85b Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 23 Dec 2012 01:07:51 +0100
Subject: Fix importing of embedded PKCS12 files

---
 src/de/blinkt/openvpn/ConfigParser.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/de/blinkt/openvpn/ConfigParser.java')

diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java
index 7d93a94e..f2814f7e 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/de/blinkt/openvpn/ConfigParser.java
@@ -235,8 +235,9 @@ public class ConfigParser {
 			"status",
 			"suppress-timestamps",
 			"tmp-dir",
+			"tun-ipv6",
 			"topology",
-			"win-sys"
+			"win-sys",
 	};
 	
 	
@@ -451,9 +452,9 @@ public class ConfigParser {
 		if(connectretrymax!=null)
 			np.mConnectRetryMax =connectretrymax.get(1);
 		
-		Vector<Vector<String>> remotetls = getAllOption("remote-tls", 1, 1);
+		Vector<Vector<String>> remotetls = getAllOption("remote-cert-tls", 1, 1);
 		if(remotetls!=null)
-			if(remotetls.get(1).equals("server"))
+			if(remotetls.get(0).get(1).equals("server"))
 				np.mExpectTLSCert=true;
 			else
 				options.put("remotetls",remotetls);
-- 
cgit v1.2.3