moparisthebest/SSLDroid
1
0
Fork 0
mirror of https://github.com/moparisthebest/SSLDroid synced 2024-11-23 09:22:16 -05:00
Code Issues Releases Wiki Activity

Fix a race condition in TcpServerThread

Browse Source 
Signed-off-by: Balint Kovacs <blint@blint.hu>
This commit is contained in:
Balint Kovacs 2014-02-03 15:49:49 +01:00
parent a76eff7188
commit 42c6f7df96
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="hu.blint.ssldroid" android:versionCode="5" package="hu.blint.ssldroid" android:versionCode="6"
android:versionName="1.2.2"> android:versionName="1.2.3">
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" /> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
<permission android:name="hu.blint.ssldroid.permission.startstop" android:protectionLevel="normal" android:label="Start and stop the SSLDroid service" /> <permission android:name="hu.blint.ssldroid.permission.startstop" android:protectionLevel="normal" android:label="Start and stop the SSLDroid service" />
<uses-permission android:name="hu.blint.ssldroid.permission.startstop" /> <uses-permission android:name="hu.blint.ssldroid.permission.startstop" />

3
src/hu/blint/ssldroid/TcpProxyServerThread.java
View File

@ -34,6 +34,7 @@ public class TcpProxyServerThread extends Thread {
Relay inRelay, outRelay; Relay inRelay, outRelay;
ServerSocket ss = null; ServerSocket ss = null;
int sessionid = 0; int sessionid = 0;
private SSLSocketFactory sslSocketFactory;
public TcpProxyServerThread(ServerSocket ss,String tunnelName, int listenPort, String tunnelHost, int tunnelPort, String keyFile, String keyPass) { public TcpProxyServerThread(ServerSocket ss,String tunnelName, int listenPort, String tunnelHost, int tunnelPort, String keyFile, String keyPass) {
this.tunnelName = tunnelName; this.tunnelName = tunnelName;
@ -62,8 +63,6 @@ public class TcpProxyServerThread extends Thread {
} }
}; };
private static SSLSocketFactory sslSocketFactory;
public final SSLSocketFactory getSocketFactory(String pkcsFile, public final SSLSocketFactory getSocketFactory(String pkcsFile,
String pwd, int sessionid) { String pwd, int sessionid) {
if (sslSocketFactory == null) { if (sslSocketFactory == null) {