commit 2cf3971ea4d22f8981ae71e6ba358f19e1628d09
author Android (Google) Code Review <android-gerrit@google.com> Wed Jun 17 06:34:48 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 17 06:34:48 2009 -0700
tree 62888364cdd066365eee5dfa48e22f4a53b6021b
parent bf23fe062ab4321143717c21827d329e087cc72f
parent 68fdd3d4cd709d858fd5d5f2a050e71d02fbd821

Merge change 4460 into donut

* changes:
  Use the new keystore API in vpn service.

packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java

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 @@
     }
 
     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());
     }
 }