From c89fd2f73f8a84f9ef7742e39476a9645e6d3863 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 1 Feb 2018 15:30:39 +0100
Subject: #8832 add all ics-openvpn code changes

---
 .../blinkt/openvpn/core/OpenVpnManagementThread.java  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java')

diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 492e8913..1124c5b7 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -260,7 +260,10 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
                     processLogMessage(argument);
                     break;
                 case "RSA_SIGN":
-                    processSignCommand(argument);
+                    processSignCommand(argument, false);
+                    break;
+                case "ECDSA_SIGN":
+                    processSignCommand(argument, true);
                     break;
                 default:
                     VpnStatus.logWarning("MGMT: Got unrecognized command" + command);
@@ -606,7 +609,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 +634,20 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
         releaseHold();
     }
 
-    private void processSignCommand(String b64data) {
+    private void processSignCommand(String b64data, boolean ecdsa) {
+
+        String signed_string = mProfile.getSignedData(b64data, ecdsa);
+        String signcmd = "rsa-sig\n";
+        if (ecdsa)
+            signcmd = "ecdsa-sig\n";
 
-        String signed_string = mProfile.getSignedData(b64data);
         if (signed_string == null) {
-            managmentCommand("rsa-sig\n");
+            managmentCommand(signcmd);
             managmentCommand("\nEND\n");
             stopOpenVPN();
             return;
         }
-        managmentCommand("rsa-sig\n");
+        managmentCommand(signcmd);
         managmentCommand(signed_string);
         managmentCommand("\nEND\n");
     }
-- 
cgit v1.2.3


From d4633f0549b3c3c23e27fba3ab14d1a1a62978af Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 6 Feb 2018 14:09:37 +0100
Subject: #8832 more upsteam changes

---
 .../blinkt/openvpn/core/OpenVpnManagementThread.java  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java')

diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 1124c5b7..2b6df9af 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/app/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,11 +260,8 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
                 case "LOG":
                     processLogMessage(argument);
                     break;
-                case "RSA_SIGN":
-                    processSignCommand(argument, false);
-                    break;
-                case "ECDSA_SIGN":
-                    processSignCommand(argument, true);
+                case "PK_SIGN":
+                    processSignCommand(argument);
                     break;
                 default:
                     VpnStatus.logWarning("MGMT: Got unrecognized command" + command);
@@ -634,20 +632,17 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
         releaseHold();
     }
 
-    private void processSignCommand(String b64data, boolean ecdsa) {
+    private void processSignCommand(String b64data) {
 
-        String signed_string = mProfile.getSignedData(b64data, ecdsa);
-        String signcmd = "rsa-sig\n";
-        if (ecdsa)
-            signcmd = "ecdsa-sig\n";
+        String signed_string = mProfile.getSignedData(b64data);
 
         if (signed_string == null) {
-            managmentCommand(signcmd);
+            managmentCommand("pk-sig\n");
             managmentCommand("\nEND\n");
             stopOpenVPN();
             return;
         }
-        managmentCommand(signcmd);
+        managmentCommand("pk-sig\n");
         managmentCommand(signed_string);
         managmentCommand("\nEND\n");
     }
-- 
cgit v1.2.3