diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 03:55:07 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 03:55:07 -0700 |
commit | 1f2bb46b9a2762a6f57ca8801d91e9dee002158f (patch) | |
tree | 4f6f08617199b28b7b9682540a2e9de469591f39 /packages | |
parent | 3383df385e208807b1dc5f2956f82a7f75f65fd8 (diff) | |
parent | 7d22e15e1b0d64d38928a927189df5a1e4f1c590 (diff) | |
download | frameworks_base-1f2bb46b9a2762a6f57ca8801d91e9dee002158f.zip frameworks_base-1f2bb46b9a2762a6f57ca8801d91e9dee002158f.tar.gz frameworks_base-1f2bb46b9a2762a6f57ca8801d91e9dee002158f.tar.bz2 |
Merge change 6204 into donut
* changes:
Migrate to new keystore with the CertTool lib.
Diffstat (limited to 'packages')
-rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java b/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java index bd14110..825953c 100644 --- a/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java +++ b/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java @@ -17,7 +17,7 @@ package com.android.server.vpn; import android.net.vpn.L2tpIpsecProfile; -import android.security.Keystore; +import android.security.CertTool; import java.io.IOException; @@ -48,17 +48,17 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> { } private String getCaCertPath() { - return Keystore.getInstance().getCaCertificate( + return CertTool.getInstance().getCaCertificate( getProfile().getCaCertificate()); } private String getUserCertPath() { - return Keystore.getInstance().getUserCertificate( + return CertTool.getInstance().getUserCertificate( getProfile().getUserCertificate()); } private String getUserkeyPath() { - return Keystore.getInstance().getUserPrivateKey( + return CertTool.getInstance().getUserPrivateKey( getProfile().getUserCertificate()); } } |