From 8a50651212f4682d9725f515ffd61d47132e2dbf Mon Sep 17 00:00:00 2001
From: Markus Pfeiffer <markus.pfeiffer@relution.io>
Date: Tue, 21 Nov 2023 15:37:23 +0100
Subject: [PATCH] android: Add password for client certificate to managed
 config

---
 .../org/strongswan/android/data/VpnProfileDataSource.java  | 1 +
 .../src/main/res/values/strings_managed_configuration.xml  | 2 ++
 .../android/app/src/main/res/xml/managed_configuration.xml | 7 +++++++
 3 files changed, 10 insertions(+)

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 48aa58c35..f95ce4734 100644
--- 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 573a50706..6a58f62ad 100644
--- 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 425758b20..105b3f839 100644
--- 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"