Use the new keystore API in vpn service.

2009-06-17 18:25:02 +08:00
parent 5c1c40d28c
commit 68fdd3d4cd
1 changed files with 4 additions and 3 deletions
--- 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());
    }
 }