Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Removed redundant frame number from header.

Browse Source
This commit is contained in:
akwizgran
2011-09-01 11:11:31 +01:00
parent 928ae6288f
commit 472dff3d61
7 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/net/sf/briar/transport/ConnectionReaderImpl.java
View File

@@ -31,8 +31,8 @@ implements ConnectionReader {
super(decrypter.getInputStream());
this.decrypter = decrypter;
this.mac = mac;
maxPayloadLength = MAX_FRAME_LENGTH - 8 - mac.getMacLength();
header = new byte[8];
maxPayloadLength = MAX_FRAME_LENGTH - 4 - mac.getMacLength();
header = new byte[4];
payload = new byte[maxPayloadLength];
footer = new byte[mac.getMacLength()];
}
@@ -69,8 +69,10 @@ implements ConnectionReader {
private boolean readFrame() throws IOException {
assert betweenFrames;
// Read the header
// Don't allow more than 2^32 frames to be read
if(frame > MAX_32_BIT_UNSIGNED) throw new IllegalStateException();
frame++;
// Read the header
int offset = 0;
while(offset < header.length) {
int read = in.read(header, offset, header.length - offset);
@@ -80,16 +82,12 @@ implements ConnectionReader {
if(offset == 0) return false; // EOF between frames
if(offset < header.length) throw new EOFException(); // Unexpected EOF
mac.update(header);
// Check that the frame has the expected frame number
if(ByteUtils.readUint32(header, 0) != frame)
throw new FormatException();
// Check that the payload and padding lengths are legal
payloadLen = ByteUtils.readUint16(header, 4);
int paddingLen = ByteUtils.readUint16(header, 6);
payloadLen = ByteUtils.readUint16(header, 0);
int paddingLen = ByteUtils.readUint16(header, 2);
if(payloadLen + paddingLen == 0) throw new FormatException();
if(payloadLen + paddingLen > maxPayloadLength)
throw new FormatException();
frame++;
// Read the payload
offset = 0;
while(offset < payloadLen) {

7
components/net/sf/briar/transport/ConnectionWriterImpl.java
View File

@@ -32,9 +32,9 @@ implements ConnectionWriter {
super(encrypter.getOutputStream());
this.encrypter = encrypter;
this.mac = mac;
maxPayloadLength = MAX_FRAME_LENGTH - 8 - mac.getMacLength();
maxPayloadLength = MAX_FRAME_LENGTH - 4 - mac.getMacLength();
buf = new ByteArrayOutputStream(maxPayloadLength);
header = new byte[8];
header = new byte[4];
}
public OutputStream getOutputStream() {
@@ -75,8 +75,7 @@ implements ConnectionWriter {
if(frame > MAX_32_BIT_UNSIGNED) throw new IllegalStateException();
byte[] payload = buf.toByteArray();
if(payload.length > maxPayloadLength) throw new IllegalStateException();
ByteUtils.writeUint32(frame, header, 0);
ByteUtils.writeUint16(payload.length, header, 4);
ByteUtils.writeUint16(payload.length, header, 0);
out.write(header);
mac.update(header);
out.write(payload);

9
components/net/sf/briar/transport/PaddedConnectionWriter.java
View File

@@ -36,9 +36,9 @@ implements ConnectionWriter {
super(encrypter.getOutputStream());
this.encrypter = encrypter;
this.mac = mac;
maxPayloadLength = MAX_FRAME_LENGTH - 8 - mac.getMacLength();
maxPayloadLength = MAX_FRAME_LENGTH - 4 - mac.getMacLength();
buf = new ByteArrayOutputStream(maxPayloadLength);
header = new byte[8];
header = new byte[4];
padding = new byte[maxPayloadLength];
}
@@ -109,9 +109,8 @@ implements ConnectionWriter {
byte[] payload = buf.toByteArray();
if(payload.length > maxPayloadLength) throw new IllegalStateException();
int paddingLength = pad ? maxPayloadLength - payload.length : 0;
ByteUtils.writeUint32(frame, header, 0);
ByteUtils.writeUint16(payload.length, header, 4);
ByteUtils.writeUint16(paddingLength, header, 6);
ByteUtils.writeUint16(payload.length, header, 0);
ByteUtils.writeUint16(paddingLength, header, 2);
out.write(header);
mac.update(header);
out.write(payload);