diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/tlsremote.xml | 38 | ||||
| -rwxr-xr-x | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 2 | ||||
| -rw-r--r-- | res/xml/vpn_authentification.xml | 3 |
4 files changed, 44 insertions, 6 deletions
diff --git a/res/layout/tlsremote.xml b/res/layout/tlsremote.xml new file mode 100644 index 00000000..3c16566a --- /dev/null +++ b/res/layout/tlsremote.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <TextView + android:id="@+id/dialogHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:text="@string/enter_tlscn_dialog" /> + + <Spinner + android:id="@+id/x509verifytype" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/dialogHeader" + android:layout_toRightOf="@+id/textView1" /> + + <EditText + android:id="@+id/tlsremotecn" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/x509verifytype" + android:layout_marginTop="20dp" + android:ems="10" + android:inputType="text" /> + + <TextView + android:id="@+id/textView2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@+id/textView1" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index ed8e3b1d..07589382 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -63,10 +63,10 @@ <string name="remove_vpn">Remove VPN</string> <string name="check_remote_tlscert">Checks whether the server uses a TLS Server Certificate</string> <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_summary">Checks the Remote Server Certificate Subject DN</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_title">Remote Hostname(CN)</string> + <string name="enter_tlscn_dialog">Specify the check used to verify the remote certificate DN\n\Specify the complete DN (e.g. C=DE, L=Paderborn, OU=Avian IP Carriers, CN=openvpn.blinkt.de) or the RDN (openvpn.blinkt.de in the DN example) or an RDN prefix for verification.\n\nRDN prefix will use prefix matching. \"Server\" matches \"Server-1\" and \"Server-2\"\nLeaving the text field empty will check the RDN against the server hostname.\nFor more details see the OpenVPN 2.3 manpage under --x509-verify-name</string> + <string name="enter_tlscn_title">Remote certificate subject</string> <string name="tls_key_auth">Enables the TLS Key Authentication</string> <string name="tls_auth_file">TLS Auth File</string> <string name="pull_on_summary">Requests IP addresses, routes and timing options from the server.</string> @@ -271,5 +271,6 @@ <string name="crashdump">Crashdump</string> <string name="add">Add</string> <string name="send_config">Send config file</string> + <string name="complete_dn">Complete DN</string> </resources>
\ No newline at end of file diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml index 37c01064..1c858363 100644 --- a/res/values/untranslatable.xml +++ b/res/values/untranslatable.xml @@ -43,4 +43,4 @@ <item>-1</item> </string-array> -</resources>
\ No newline at end of file +</resources> diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml index 619890c7..727cae40 100644 --- a/res/xml/vpn_authentification.xml +++ b/res/xml/vpn_authentification.xml @@ -10,9 +10,8 @@ android:summary="@string/remote_tlscn_check_summary" android:title="@string/remote_tlscn_check_title" /> - <EditTextPreference + <de.blinkt.openvpn.RemoteCNPreference android:dependency="checkRemoteCN" - android:dialogMessage="@string/enter_tlscn_dialog" android:key="remotecn" android:title="@string/enter_tlscn_title" /> |