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

Check that padding is set to zero.

Browse Source
This commit is contained in:
akwizgran
2011-12-02 16:21:20 +00:00
parent 4ab5dfcac0
commit 726799d848
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,10 @@ implements ConnectionReader {
int read = in.read(payload, offset,
payloadLen + paddingLen - offset);
if(read == -1) throw new EOFException(); // Unexpected EOF
// The padding must be set to zero
for(int i = offset; i < offset + read; i++) {
if(payload[i] != 0) throw new FormatException();
}
mac.update(payload, offset, read);
offset += read;
}

23
test/net/sf/briar/transport/ConnectionReaderImplTest.java
View File

@@ -121,6 +121,29 @@ public class ConnectionReaderImplTest extends TransportTest {
} catch(FormatException expected) {}
}
@Test
public void testNonZeroPadding() throws Exception {
int payloadLength = 10, paddingLength = 10;
byte[] frame = new byte[FRAME_HEADER_LENGTH + payloadLength
+ paddingLength + macLength];
HeaderEncoder.encodeHeader(frame, 0, payloadLength, paddingLength);
// Set a byte of the padding to a non-zero value
frame[FRAME_HEADER_LENGTH + payloadLength] = 1;
mac.init(macKey);
mac.update(frame, 0, FRAME_HEADER_LENGTH + payloadLength
+ paddingLength);
mac.doFinal(frame, FRAME_HEADER_LENGTH + payloadLength + paddingLength);
// Read the frame
ByteArrayInputStream in = new ByteArrayInputStream(frame);
ConnectionDecrypter d = new NullConnectionDecrypter(in);
ConnectionReader r = new ConnectionReaderImpl(d, mac, macKey);
// The non-zero padding should be rejected
try {
r.getInputStream().read();
fail();
} catch(FormatException expected) {}
}
@Test
public void testMultipleFrames() throws Exception {
// First frame: 123-byte payload