From ccba4a2784c9c4997526cda8244bead703f3b382 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 31 Oct 2018 18:05:04 +0100 Subject: Support new version of management-external-key --- .../java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 bfc91d90..afc22183 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -194,7 +194,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { // Closing one of the two sockets also closes the other //mServerSocketLocal.close(); - managmentCommand("version 2\n"); + managmentCommand("version 3\n"); while (true) { @@ -290,7 +290,6 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { String cmd = parts[0].substring(1); String argument = parts[1]; - switch (cmd) { case "INFO": /* Ignore greeting from management */ @@ -749,9 +748,12 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { releaseHold(); } - private void processSignCommand(String b64data) { + private void processSignCommand(String argument) { + + String[] arguments = argument.split(","); - String signed_string = mProfile.getSignedData(mOpenVPNService, b64data, false); + boolean pkcs1padding = arguments[1].equals("PKCS1"); + String signed_string = mProfile.getSignedData(mOpenVPNService, arguments[0], pkcs1padding); if (signed_string == null) { managmentCommand("pk-sig\n"); -- cgit v1.2.3