Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4460 into donut

Browse Source 
* changes:
  Use the new keystore API in vpn service.
This commit is contained in:
Android (Google) Code Review
2009-06-17 06:34:48 -07:00
parent bf23fe062a 68fdd3d4cd
commit 2cf3971ea4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,16 +50,17 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> {
} }
private String getCaCertPath() { private String getCaCertPath() {
return Keystore.getInstance().getCertificate( return Keystore.getInstance().getCaCertificate(
getProfile().getCaCertificate()); getProfile().getCaCertificate());
} }
private String getUserCertPath() { private String getUserCertPath() {
return Keystore.getInstance().getCertificate( return Keystore.getInstance().getUserCertificate(
getProfile().getUserCertificate()); getProfile().getUserCertificate());
} }
private String getUserkeyPath() { private String getUserkeyPath() {
return Keystore.getInstance().getUserkey(getProfile().getUserkey()); return Keystore.getInstance().getUserPrivateKey(
getProfile().getUserCertificate());
} }
} }