diff options
| -rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java b/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java index 13b4952..9909905 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.CertTool; +import android.security.Credentials; import java.io.IOException; @@ -30,16 +30,18 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> { @Override protected void connect(String serverIp, String username, String password) throws IOException { + L2tpIpsecProfile p = getProfile(); // IPSEC DaemonProxy ipsec = startDaemon(IPSEC); ipsec.sendCommand(serverIp, L2tpService.L2TP_PORT, - getUserkeyPath(), getUserCertPath(), getCaCertPath()); + Credentials.USER_PRIVATE_KEY + p.getUserCertificate(), + Credentials.USER_CERTIFICATE + p.getUserCertificate(), + Credentials.CA_CERTIFICATE + p.getCaCertificate()); ipsec.closeControlSocket(); sleep(2000); // 2 seconds // L2TP - L2tpIpsecProfile p = getProfile(); MtpdHelper.sendCommand(this, L2tpService.L2TP_DAEMON, serverIp, L2tpService.L2TP_PORT, (p.isSecretEnabled() ? p.getSecretString() : null), @@ -51,19 +53,4 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> { stopDaemon(IPSEC); stopDaemon(MtpdHelper.MTPD); } - - private String getCaCertPath() { - return CertTool.getInstance().getCaCertificate( - getProfile().getCaCertificate()); - } - - private String getUserCertPath() { - return CertTool.getInstance().getUserCertificate( - getProfile().getUserCertificate()); - } - - private String getUserkeyPath() { - return CertTool.getInstance().getUserPrivateKey( - getProfile().getUserCertificate()); - } } |