drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6204 into donut

Browse Source 
* changes:
  Migrate to new keystore with the CertTool lib.
This commit is contained in:
Android (Google) Code Review
2009-07-06 03:55:07 -07:00
parent 3383df385e 7d22e15e1b
commit 1f2bb46b9a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java
View File

@ -17,7 +17,7 @@
package com.android.server.vpn; package com.android.server.vpn;
import android.net.vpn.L2tpIpsecProfile; import android.net.vpn.L2tpIpsecProfile;
import android.security.Keystore; import android.security.CertTool;
import java.io.IOException; import java.io.IOException;
@ -48,17 +48,17 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> {
} }
private String getCaCertPath() { private String getCaCertPath() {
return Keystore.getInstance().getCaCertificate( return CertTool.getInstance().getCaCertificate(
getProfile().getCaCertificate()); getProfile().getCaCertificate());
} }
private String getUserCertPath() { private String getUserCertPath() {
return Keystore.getInstance().getUserCertificate( return CertTool.getInstance().getUserCertificate(
getProfile().getUserCertificate()); getProfile().getUserCertificate());
} }
private String getUserkeyPath() { private String getUserkeyPath() {
return Keystore.getInstance().getUserPrivateKey( return CertTool.getInstance().getUserPrivateKey(
getProfile().getUserCertificate()); getProfile().getUserCertificate());
} }
} }