Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 20:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Updated TestStreamEncrypter/Decrypter.

Browse Source
This commit is contained in:
akwizgran
2015-12-14 17:29:28 +00:00
parent e6eb1707a9
commit ad0972877b
3 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
briar-tests/src/org/briarproject/transport/TestStreamDecrypter.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.transport;
import org.briarproject.api.FormatException;
import org.briarproject.api.crypto.StreamDecrypter;
import org.briarproject.util.ByteUtils;
@@ -11,35 +10,52 @@ import java.io.InputStream;
import static org.briarproject.api.transport.TransportConstants.FRAME_HEADER_LENGTH;
import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
import static org.briarproject.api.transport.TransportConstants.MAX_FRAME_LENGTH;
import static org.briarproject.api.transport.TransportConstants.STREAM_HEADER_LENGTH;
class TestStreamDecrypter implements StreamDecrypter {
private final InputStream in;
private final byte[] frame;
private boolean readStreamHeader = true, finalFrame = false;
TestStreamDecrypter(InputStream in) {
this.in = in;
frame = new byte[MAX_FRAME_LENGTH];
}
public int readFrame(byte[] payload) throws IOException {
if (finalFrame) return -1;
if (readStreamHeader) readStreamHeader();
int offset = 0;
while (offset < FRAME_HEADER_LENGTH) {
int read = in.read(frame, offset, FRAME_HEADER_LENGTH - offset);
if (read == -1) throw new EOFException();
offset += read;
}
boolean finalFrame = (frame[0] & 0x80) == 0x80;
finalFrame = (frame[0] & 0x80) == 0x80;
int payloadLength = ByteUtils.readUint16(frame, 0) & 0x7FFF;
while (offset < frame.length) {
int read = in.read(frame, offset, frame.length - offset);
if (read == -1) break;
int paddingLength = ByteUtils.readUint16(frame, 2);
int frameLength = FRAME_HEADER_LENGTH + payloadLength + paddingLength
+ MAC_LENGTH;
while (offset < frameLength) {
int read = in.read(frame, offset, frameLength - offset);
if (read == -1) throw new EOFException();
offset += read;
}
if (!finalFrame && offset < frame.length) throw new EOFException();
if (offset < FRAME_HEADER_LENGTH + payloadLength + MAC_LENGTH)
throw new FormatException();
System.arraycopy(frame, FRAME_HEADER_LENGTH, payload, 0, payloadLength);
return payloadLength;
}
private void readStreamHeader() throws IOException {
byte[] streamHeader = new byte[STREAM_HEADER_LENGTH];
int offset = 0;
while (offset < STREAM_HEADER_LENGTH) {
int read = in.read(streamHeader, offset,
STREAM_HEADER_LENGTH - offset);
if (read == -1) throw new EOFException();
offset += read;
}
readStreamHeader = false;
}
}