PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch VPN to use keystore ENGINE"

Browse Source
This commit is contained in:
Kenny Root
2012-03-27 20:41:34 -07:00
committed by Android (Google) Code Review
parent 46a0389e07 455a911df3
commit 8ce45a6ccc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -360,9 +360,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements
String caCert = "";
String serverCert = "";
if (!profile.ipsecUserCert.isEmpty()) {
byte[] value = mKeyStore.get(Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert);
privateKey = (value == null) ? null : new String(value, Charsets.UTF_8);
value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
/*
* VPN has a special exception in keystore to allow it to use system
* UID certs.
*/
privateKey = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
userCert = (value == null) ? null : new String(value, Charsets.UTF_8);
}
if (!profile.ipsecCaCert.isEmpty()) {