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

tls-psk: allow passing more than one key

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-30 17:11:27 +02:00
parent 9b20c97e01
commit fd34740c1a
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,15 +171,12 @@ public class KeyTransferInteractor {
private void handleOpenConnection(Socket socket) throws IOException { private void handleOpenConnection(Socket socket) throws IOException {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream())); BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
OutputStream outputStream = new BufferedOutputStream(socket.getOutputStream());
socket.setSoTimeout(500); socket.setSoTimeout(500);
while (!isInterrupted() && socket.isConnected()) { while (!isInterrupted() && socket.isConnected()) {
if (sendDataIfAvailable(socket)) { sendDataIfAvailable(socket, outputStream);
return; receiveDataIfAvailable(socket, bufferedReader);
}
if (receiveDataIfAvailable(socket, bufferedReader)) {
return;
}
} }
Log.d(Constants.TAG, "disconnected"); Log.d(Constants.TAG, "disconnected");
invokeListener(CONNECTION_LOST, null); invokeListener(CONNECTION_LOST, null);
@@ -200,17 +197,23 @@ public class KeyTransferInteractor {
socket.setSoTimeout(2000); socket.setSoTimeout(2000);
String receivedData = receiveAfterFirstLineAndClose(bufferedReader, firstLine); String receivedData = receiveAfterFirstLineAndClose(bufferedReader, firstLine);
socket.setSoTimeout(500);
invokeListener(CONNECTION_RECEIVE_OK, receivedData); invokeListener(CONNECTION_RECEIVE_OK, receivedData);
return true; return true;
} }
private boolean sendDataIfAvailable(Socket socket) throws IOException { private boolean sendDataIfAvailable(Socket socket, OutputStream outputStream) throws IOException {
if (dataToSend != null) { if (dataToSend != null) {
byte[] data = dataToSend; byte[] data = dataToSend;
dataToSend = null; dataToSend = null;
socket.setSoTimeout(2000); socket.setSoTimeout(2000);
sendData(socket.getOutputStream(), data); outputStream.write(data);
outputStream.write('\n');
outputStream.write('\n');
socket.setSoTimeout(500);
invokeListener(CONNECTION_SEND_OK, sendPassthrough); invokeListener(CONNECTION_SEND_OK, sendPassthrough);
sendPassthrough = null; sendPassthrough = null;
return true; return true;
@@ -220,20 +223,22 @@ public class KeyTransferInteractor {
private String receiveAfterFirstLineAndClose(BufferedReader bufferedReader, String line) throws IOException { private String receiveAfterFirstLineAndClose(BufferedReader bufferedReader, String line) throws IOException {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
boolean lastLineWasEmpty = "".equals(line);
do { do {
builder.append(line); boolean lineIsEmpty = "".equals(line);
if (lastLineWasEmpty && lineIsEmpty) {
break;
}
builder.append(line).append('\n');
line = bufferedReader.readLine(); line = bufferedReader.readLine();
lastLineWasEmpty = lineIsEmpty;
} while (line != null); } while (line != null);
return builder.toString(); return builder.toString();
} }
private void sendData(OutputStream outputStream, byte[] data) throws IOException {
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream);
bufferedOutputStream.write(data);
bufferedOutputStream.close();
}
private void invokeListener(final int method, final String arg) { private void invokeListener(final int method, final String arg) {
if (handler == null) { if (handler == null) {
return; return;