diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-24 10:02:19 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-24 10:02:19 +0200 |
| commit | d30bc67738d9c5a61ac319681a55f0f82a4e807f (patch) | |
| tree | 16b6c7cc1d341d68e0d73e2b3f3af9dc01e924c7 | |
| parent | 02fe0dc7261a615c3ed95ea408c9090788638af8 (diff) | |
- fix cn remote string (closes issue #31)
- ignore a few more options in the importer
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/ConfigParser.java | 7 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/OpenVPNThread.java | 5 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/ProfileManager.java | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 623a3cf8..56f736b5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -125,7 +125,7 @@ <string name="check_remote_tlscert_title">Except TLS Server</string> <string name="remote_tlscn_check_summary">Checks the Remote Server Certificate CN against a String</string> <string name="remote_tlscn_check_title">Certificate Hostname Check</string> - <string name="enter_tlscn_dialog">Enter the String against which the remote Server is checked. Openvpn will use prefix matching. "Server" matches "Server-1" and "Server-2"\\nLeave empty to check the CN against the server hostname.</string> + <string name="enter_tlscn_dialog">Enter the string against which the remote Server is checked. Openvpn will use prefix matching. "Server" matches "Server-1" and "Server-2"\nLeave empty to check the CN against the server hostname.</string> <string name="enter_tlscn_title">Remote Hostname(CN)</string> <string name="tls_key_auth">Enables the TLS Key Authentication</string> <string name="tls_auth_file">TLS Auth File</string> diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/de/blinkt/openvpn/ConfigParser.java index 4447eaf9..85107104 100644 --- a/src/de/blinkt/openvpn/ConfigParser.java +++ b/src/de/blinkt/openvpn/ConfigParser.java @@ -220,8 +220,11 @@ public class ConfigParser { "topology", "persist-tun", "route-metric", - "suppress-timestamps" - + "suppress-timestamps", + "management-query-passwords", + "tmp-dir", + "management-hold", + "management" }; diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java index 503f4c4c..fdb0ac02 100644 --- a/src/de/blinkt/openvpn/OpenVPNThread.java +++ b/src/de/blinkt/openvpn/OpenVPNThread.java @@ -10,14 +10,12 @@ import android.util.Log; public class OpenVPNThread implements Runnable {
private static final String TAG = "OpenVPN";
- private OpenVpnService mService;
private String[] mArgv;
private Process mProcess;
private String mNativeDir;
public OpenVPNThread(OpenVpnService service,String[] argv, String nativelibdir)
{
- mService = service;
mArgv = argv;
mNativeDir = nativelibdir;
}
@@ -31,9 +29,6 @@ public class OpenVPNThread implements Runnable { try {
Log.i(TAG, "Starting openvpn");
startOpenVPNThreadArgs(mArgv);
-
-
- //}
Log.i(TAG, "Giving up");
} catch (Exception e) {
Log.e(TAG, "Got " + e.toString());
diff --git a/src/de/blinkt/openvpn/ProfileManager.java b/src/de/blinkt/openvpn/ProfileManager.java index eb94505a..0164fe53 100644 --- a/src/de/blinkt/openvpn/ProfileManager.java +++ b/src/de/blinkt/openvpn/ProfileManager.java @@ -10,8 +10,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import de.blinkt.openvpn.R.string; - import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; |