Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ce45a6c authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Switch VPN to use keystore ENGINE"

parents 46a0389e 455a911d

src/com/android/settings/vpn2/VpnSettings.java

+6 −3
Original line number Diff line number Diff line
@@ -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()) {