sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-03 00:00:24 -04:00
Code Issues Projects Releases Wiki Activity

android: Add password for client certificate to managed config

Browse Source
This commit is contained in:
Markus Pfeiffer 2023-11-21 15:37:23 +01:00 committed by Tobias Brunner
parent 9a917252e2
commit 8a50651212
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
View File

@ -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";

2
src/frontends/android/app/src/main/res/values/strings_managed_configuration.xml
View File

@ -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>

7
src/frontends/android/app/src/main/res/xml/managed_configuration.xml
View File

@ -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"