cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls-psk: properly set timeout while connecting

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-06-12 21:21:39 +02:00
parent 34a466622e
commit dc350cff50
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java
View File

@@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.net.Socket; import java.net.Socket;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
@@ -82,7 +83,7 @@ public class KeyTransferInteractor {
private static final int CONNECTION_ERROR_LISTEN = 8; private static final int CONNECTION_ERROR_LISTEN = 8;
private static final String QRCODE_URI_FORMAT = "PGP+TRANSFER://%s@%s:%s"; private static final String QRCODE_URI_FORMAT = "PGP+TRANSFER://%s@%s:%s";
private static final int TIMEOUT_CONNECTING = 2500; private static final int TIMEOUT_CONNECTING = 1500;
private static final int TIMEOUT_RECEIVING = 2000; private static final int TIMEOUT_RECEIVING = 2000;
private static final int TIMEOUT_WAITING = 500; private static final int TIMEOUT_WAITING = 500;
private static final int PSK_BYTE_LENGTH = 16; private static final int PSK_BYTE_LENGTH = 16;
@@ -209,13 +210,13 @@ public class KeyTransferInteractor {
} }
} else { } else {
try { try {
SSLSocket sslSocket = (SSLSocket) sslContext.getSocketFactory() SSLSocket sslSocket = (SSLSocket) sslContext.getSocketFactory().createSocket();
.createSocket(InetAddress.getByName(clientHost), clientPort);
String[] supportedCipherSuites = sslSocket.getSupportedCipherSuites(); String[] supportedCipherSuites = sslSocket.getSupportedCipherSuites();
String[] enabledCipherSuites = intersectArrays(supportedCipherSuites, ALLOWED_CIPHERSUITES); String[] enabledCipherSuites = intersectArrays(supportedCipherSuites, ALLOWED_CIPHERSUITES);
sslSocket.setEnabledCipherSuites(enabledCipherSuites); sslSocket.setEnabledCipherSuites(enabledCipherSuites);
socket = sslSocket; socket = sslSocket;
socket.connect(new InetSocketAddress(InetAddress.getByName(clientHost), clientPort), TIMEOUT_CONNECTING);
} catch (IOException e) { } catch (IOException e) {
Log.e(Constants.TAG, "error while connecting!", e); Log.e(Constants.TAG, "error while connecting!", e);
invokeListener(CONNECTION_ERROR_CONNECT, null); invokeListener(CONNECTION_ERROR_CONNECT, null);
@@ -238,8 +239,6 @@ public class KeyTransferInteractor {
} }
private void handleOpenConnection(Socket socket) throws IOException { private void handleOpenConnection(Socket socket) throws IOException {
socket.setSoTimeout(TIMEOUT_CONNECTING);
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream())); BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
OutputStream outputStream = new BufferedOutputStream(socket.getOutputStream()); OutputStream outputStream = new BufferedOutputStream(socket.getOutputStream());