From 0681b469fe26a431437cea1449f42850abb1f545 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 26 Nov 2012 19:00:33 +0100
Subject: The fcafb74a08aa58152b6bd9eb6e4c7dc6ea783c3b was wrong commit.
 Version 4.2 behaves like ICS. (from a programming perspective not from what
 it really does)

---
 src/de/blinkt/openvpn/OpenVpnManagementThread.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
index 24537732..d15e6a33 100644
--- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
@@ -473,11 +473,12 @@ public class OpenVpnManagementThread implements Runnable {
 
 		PrivateKey privkey = mProfile.getKeystoreKey();
 		Exception err =null;
-		// The Jelly Bean *evil* Hack
 
 		byte[] data = Base64.decode(b64data, Base64.DEFAULT);
 
-		if(Build.VERSION.SDK_INT>=16){
+		// The Jelly Bean *evil* Hack
+		// 4.2 implements the RSA/ECB/PKCS1PADDING in the OpenSSLprovider
+		if(Build.VERSION.SDK_INT==16){
 			processSignJellyBeans(privkey,data);
 			return;
 		}
-- 
cgit v1.2.3


From 192410e3f1d5588712a85bbd7e9fd801dc5a0989 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 24 Dec 2012 07:47:50 +0100
Subject: Make send mini dump work with non Gmail Mail app, make google sending
 better placed

---
 src/de/blinkt/openvpn/OpenVpnManagementThread.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
index d15e6a33..9926ba13 100644
--- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
@@ -39,7 +39,8 @@ public class OpenVpnManagementThread implements Runnable {
 	private long mLastOut=0;
 	private LocalServerSocket mServerSocket;
 	private boolean mReleaseHold=true;
-	private boolean mWaitingForRelease=false; 
+	private boolean mWaitingForRelease=false;
+	private long mLastHoldRelease=0; 
 
 	private static Vector<OpenVpnManagementThread> active=new Vector<OpenVpnManagementThread>();
 
@@ -223,8 +224,15 @@ public class OpenVpnManagementThread implements Runnable {
 		}
 	}
 	private void releaseHoldCmd() {
+		if ((System.currentTimeMillis()- mLastHoldRelease) < 5000) {
+			try {
+				Thread.sleep(3000);
+			} catch (InterruptedException e) {}
+			
+		}
 		mWaitingForRelease=false;
 		mReleaseHold=true;
+		mLastHoldRelease  = System.currentTimeMillis();
 		managmentCommand("hold release\n");
 		managmentCommand("bytecount " + mBytecountinterval + "\n");
 		managmentCommand("state on\n");
-- 
cgit v1.2.3


From 809e278681e3a1f526db94bf09ecf364bb4bfb82 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 24 Dec 2012 14:24:01 +0100
Subject: =?UTF-8?q?Reconnect=20USR1,=20still=20strange=20=E2=80=A6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/de/blinkt/openvpn/OpenVpnManagementThread.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
index 9926ba13..4e26c44b 100644
--- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
@@ -231,7 +231,6 @@ public class OpenVpnManagementThread implements Runnable {
 			
 		}
 		mWaitingForRelease=false;
-		mReleaseHold=true;
 		mLastHoldRelease  = System.currentTimeMillis();
 		managmentCommand("hold release\n");
 		managmentCommand("bytecount " + mBytecountinterval + "\n");
@@ -239,10 +238,10 @@ public class OpenVpnManagementThread implements Runnable {
 	}
 	
 	public void releaseHold() {
+		mReleaseHold=true;
 		if(mWaitingForRelease)
 			releaseHoldCmd();
-		else	
-			mReleaseHold=true;
+			
 	}
 
 	private void processProxyCMD(String argument) {
@@ -467,9 +466,9 @@ public class OpenVpnManagementThread implements Runnable {
 	}
 
 	public void signalusr1() {
+		mReleaseHold=false;
 		if(!mWaitingForRelease)
 			managmentCommand("signal SIGUSR1\n");
-		mReleaseHold=false;
 	}
 
 	public void reconnect() {
-- 
cgit v1.2.3