diff options
author | Hung-ying Tyan <tyanh@google.com> | 2009-07-06 17:12:53 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2009-07-06 17:12:53 +0800 |
commit | 7d22e15e1b0d64d38928a927189df5a1e4f1c590 (patch) | |
tree | 27483d5357febae451c4961d402514161e119953 /packages/VpnServices | |
parent | 699ca3f2518360ea3250ff5a0e5d39e122c64a91 (diff) | |
download | frameworks_base-7d22e15e1b0d64d38928a927189df5a1e4f1c590.zip frameworks_base-7d22e15e1b0d64d38928a927189df5a1e4f1c590.tar.gz frameworks_base-7d22e15e1b0d64d38928a927189df5a1e4f1c590.tar.bz2 |
Migrate to new keystore with the CertTool lib.
Diffstat (limited to 'packages/VpnServices')
-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()); } } |