android: Add password for client certificate to managed config

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
index 48aa58c35c55cff77ed0e6b48a6f8382ce9d3835..f95ce4734d76ed4595861395b3d9425406dcd93c 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
@@ -35,6 +35,7 @@ public interface VpnProfileDataSource
        String KEY_PASSWORD = "password";
        String KEY_CERTIFICATE = "certificate";
        String KEY_USER_CERTIFICATE = "user_certificate";
+       String KEY_USER_CERTIFICATE_PASSWORD = "user_certificate_password";
        String KEY_MTU = "mtu";
        String KEY_PORT = "port";
        String KEY_SPLIT_TUNNELING = "split_tunneling";

diff --git a/src/frontends/android/app/src/main/res/values/strings_managed_configuration.xml b/src/frontends/android/app/src/main/res/values/strings_managed_configuration.xml
index 573a507062118d437fae657d6a8ed812e5cea75e..6a58f62adae173368003a75e1c071aa98fb12422 100644 (file)
--- a/src/frontends/android/app/src/main/res/values/strings_managed_configuration.xml
+++ b/src/frontends/android/app/src/main/res/values/strings_managed_configuration.xml
@@ -89,6 +89,8 @@
     <string name="managed_config_local_id_description">@string/profile_local_id_hint_user</string>
     <string name="managed_config_local_p12_title">@string/profile_user_certificate_label</string>
     <string name="managed_config_local_p12_description">Base64-encoded PKCS#12-container with the client certificate and private key and optional certificate chain (the latter might cause warnings on older Android releases, see Android VPN client configuration for details). Not necessary for username/password-based EAP authentication or if the user already has the certificate/key installed as it may be selected while importing the profile</string>
+    <string name="managed_config_local_p12_password_title">User certificate password (Optional)</string>
+    <string name="managed_config_local_p12_password_description">Password required to extract the private key of the PKCS#12-container for installation</string>
     <string name="managed_config_local_rsa_pss_title">@string/profile_rsa_pss_label</string>
     <string name="managed_config_local_rsa_pss_description">@string/profile_rsa_pss_hint</string>
 

diff --git a/src/frontends/android/app/src/main/res/xml/managed_configuration.xml b/src/frontends/android/app/src/main/res/xml/managed_configuration.xml
index 425758b2055f4c8956b55b4e24cdb78c71d4422a..105b3f83980ce36a28206817daf724f148724616 100644 (file)
--- a/src/frontends/android/app/src/main/res/xml/managed_configuration.xml
+++ b/src/frontends/android/app/src/main/res/xml/managed_configuration.xml
@@ -190,6 +190,13 @@
                     android:restrictionType="string"
                     android:title="@string/managed_config_local_p12_title" />
 
+                <restriction
+                    android:defaultValue=""
+                    android:description="@string/managed_config_local_p12_password_description"
+                    android:key="user_certificate_password"
+                    android:restrictionType="string"
+                    android:title="@string/managed_config_local_p12_password_title" />
+
                 <restriction
                     android:defaultValue="false"
                     android:description="@string/managed_config_local_rsa_pss_description"