summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-12-22 23:26:18 +0100
committerArne Schwabe <arne@rfc2549.org>2012-12-22 23:26:18 +0100
commit6ebfab4ffa0fb2d730bc864a24ee0c4b87fc6b88 (patch)
treea115e3ac6ee285c0ae909a775245f39b0b431aa9
parent586b8bd003be24b32b121b320dafe142e74d2752 (diff)
Parse the tls-remote server string, fix import message (Closes Issue #124)
-rwxr-xr-xres/values/strings.xml2
-rw-r--r--src/de/blinkt/openvpn/ConfigParser.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ff0c592c..eea81d8b 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -237,4 +237,4 @@
<string name="connectretrymessage">Number of seconds to wait between connection attempts.</string>
<string name="connectretrywait">Seconds between connections</string>
-</resources> \ No newline at end of file
+</resources>
diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java
index ed8d4724..7d93a94e 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/de/blinkt/openvpn/ConfigParser.java
@@ -451,6 +451,12 @@ public class ConfigParser {
if(connectretrymax!=null)
np.mConnectRetryMax =connectretrymax.get(1);
+ Vector<Vector<String>> remotetls = getAllOption("remote-tls", 1, 1);
+ if(remotetls!=null)
+ if(remotetls.get(1).equals("server"))
+ np.mExpectTLSCert=true;
+ else
+ options.put("remotetls",remotetls);
Vector<String> authuser = getOption("auth-user-pass",0,1);
if(authuser !=null){