Use the new keystore API in vpn service.

1 files changed, 4 insertions, 3 deletions

diff --git a/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java b/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java
index ce56921..8358c5c 100644
--- a/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java
+++ b/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java
@@ -50,16 +50,17 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> {
     }
 
     private String getCaCertPath() {
-        return Keystore.getInstance().getCertificate(
+        return Keystore.getInstance().getCaCertificate(
                 getProfile().getCaCertificate());
     }
 
     private String getUserCertPath() {
-        return Keystore.getInstance().getCertificate(
+        return Keystore.getInstance().getUserCertificate(
                 getProfile().getUserCertificate());
     }
 
     private String getUserkeyPath() {
-        return Keystore.getInstance().getUserkey(getProfile().getUserkey());
+        return Keystore.getInstance().getUserPrivateKey(
+                getProfile().getUserCertificate());
     }
 }