From 68fdd3d4cd709d858fd5d5f2a050e71d02fbd821 Mon Sep 17 00:00:00 2001 From: Chung-yih Wang Date: Wed, 17 Jun 2009 18:25:02 +0800 Subject: [PATCH] Use the new keystore API in vpn service. --- .../VpnServices/src/com/android/server/vpn/L2tpIpsecService.java | 7 ++++--- 1 file 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 ce5692149421..8358c5cf33eb 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 { } 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()); } } -- 2.11.0