diff options
Diffstat (limited to 'main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java')
-rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java index 58f1458b..70e2d1f6 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -148,6 +148,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { // Closing one of the two sockets also closes the other
//mServerSocketLocal.close();
+ managmentCommand("version 2\n"); while (true) {
@@ -259,8 +260,8 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { case "LOG":
processLogMessage(argument);
break;
- case "RSA_SIGN":
- processSignCommand(argument);
+ case "PK_SIGN": + processSignCommand(argument); break;
default:
VpnStatus.logWarning("MGMT: Got unrecognized command" + command);
@@ -606,7 +607,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { if (mWaitingForRelease)
releaseHold();
else if (samenetwork)
- managmentCommand("network-change\n");
+ managmentCommand("network-change samenetwork\n");
else
managmentCommand("network-change\n");
}
@@ -631,16 +632,17 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { releaseHold();
}
- private void processSignCommand(String b64data) {
+ private void processSignCommand(String b64data) { +
+ String signed_string = mProfile.getSignedData(b64data); - String signed_string = mProfile.getSignedData(b64data);
if (signed_string == null) {
- managmentCommand("rsa-sig\n");
+ managmentCommand("pk-sig\n"); managmentCommand("\nEND\n");
stopOpenVPN();
return;
}
- managmentCommand("rsa-sig\n");
+ managmentCommand("pk-sig\n"); managmentCommand(signed_string);
managmentCommand("\nEND\n");
}
|