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

am 2cf3971e: Merge change 4460 into donut

Browse Source 
Merge commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09'

* commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09':
  Use the new keystore API in vpn service.
This commit is contained in:
Android (Google) Code Review
2009-06-17 15:38:47 -07:00
committed by The Android Open Source Project
parent dd34fb0529 2cf3971ea4
commit 5bba52f617
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() {
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());
}
}