From 951bc8dd9532a772db610aff59af2d96a6ab05db Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 10 Jul 2012 23:00:52 +0200
Subject: Fine tune config convert messages Import tls-auth [inline] dir
 correctly (closes issue #55)

---
 src/de/blinkt/openvpn/ConfigParser.java | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 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 1b07178e..e1b426fa 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/de/blinkt/openvpn/ConfigParser.java
@@ -279,14 +279,19 @@ public class ConfigParser {
 			}
 			np.mCustomRoutes=routeopt;
 		}
-		
-		Vector<String> tlsauth = getOption("tls-auth", 1, 2);
-		if(tlsauth!=null) 
-		{
-			np.mUseTLSAuth=true;
-			np.mTLSAuthFilename=tlsauth.get(1);
-			if(tlsauth.size()==3)
-				np.mTLSAuthDirection=tlsauth.get(2);
+
+		// Also recognize tls-auth [inline] direction ... 
+		Vector<Vector<String>> tlsauthoptions = getAllOption("tls-auth", 1, 2);
+		for(Vector<String> tlsauth:tlsauthoptions) {
+			if(tlsauth!=null) 
+			{
+				if(!tlsauth.get(1).equals("[inline]")) {
+					np.mTLSAuthFilename=tlsauth.get(1);
+					np.mUseTLSAuth=true;
+				}
+				if(tlsauth.size()==3)
+					np.mTLSAuthDirection=tlsauth.get(2);
+			}
 		}
 
 		Vector<String> direction = getOption("key-direction", 1, 1);
-- 
cgit v1.2.3