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

Removed a redundant method.

Browse Source
This commit is contained in:
akwizgran
2012-01-19 23:34:58 +00:00
parent e43ffe1ab4
commit 92b67d9881
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/net/sf/briar/transport/HeaderEncoder.java
View File

@@ -1,8 +1,6 @@
package net.sf.briar.transport; package net.sf.briar.transport;
import static net.sf.briar.api.transport.TransportConstants.FRAME_HEADER_LENGTH; import static net.sf.briar.api.transport.TransportConstants.FRAME_HEADER_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAX_FRAME_LENGTH;
import net.sf.briar.util.ByteUtils; import net.sf.briar.util.ByteUtils;
class HeaderEncoder { class HeaderEncoder {
@@ -22,15 +20,6 @@ class HeaderEncoder {
ByteUtils.writeUint16(padding, header, 6); ByteUtils.writeUint16(padding, header, 6);
} }
static boolean validateHeader(byte[] header) {
if(header.length < FRAME_HEADER_LENGTH) return false;
int payload = ByteUtils.readUint16(header, 4);
int padding = ByteUtils.readUint16(header, 6);
int frameLength = FRAME_HEADER_LENGTH + payload + padding + MAC_LENGTH;
if(frameLength > MAX_FRAME_LENGTH) return false;
return true;
}
static long getFrameNumber(byte[] header) { static long getFrameNumber(byte[] header) {
if(header.length < FRAME_HEADER_LENGTH) if(header.length < FRAME_HEADER_LENGTH)
throw new IllegalArgumentException(); throw new IllegalArgumentException();

14
components/net/sf/briar/transport/IncomingAuthenticationLayerImpl.java
View File

@@ -2,6 +2,7 @@ package net.sf.briar.transport;
import static net.sf.briar.api.transport.TransportConstants.FRAME_HEADER_LENGTH; import static net.sf.briar.api.transport.TransportConstants.FRAME_HEADER_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH; import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAX_FRAME_LENGTH;
import java.io.IOException; import java.io.IOException;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
@@ -35,19 +36,22 @@ class IncomingAuthenticationLayerImpl implements IncomingAuthenticationLayer {
// Read a frame // Read a frame
if(!in.readFrame(f, window)) return false; if(!in.readFrame(f, window)) return false;
// Check that the length is legal // Check that the length is legal
byte[] buf = f.getBuffer(); int length = f.getLength();
if(!HeaderEncoder.validateHeader(buf)) throw new InvalidDataException(); if(length < FRAME_HEADER_LENGTH + MAC_LENGTH)
throw new InvalidDataException();
if(length > MAX_FRAME_LENGTH) throw new InvalidDataException();
// Check that the payload and padding lengths are correct // Check that the payload and padding lengths are correct
byte[] buf = f.getBuffer();
int payload = HeaderEncoder.getPayloadLength(buf); int payload = HeaderEncoder.getPayloadLength(buf);
int padding = HeaderEncoder.getPaddingLength(buf); int padding = HeaderEncoder.getPaddingLength(buf);
if(f.getLength() != FRAME_HEADER_LENGTH + payload + padding if(length != FRAME_HEADER_LENGTH + payload + padding + MAC_LENGTH)
+ MAC_LENGTH) throw new InvalidDataException(); throw new InvalidDataException();
// Check that the padding is all zeroes // Check that the padding is all zeroes
int paddingStart = FRAME_HEADER_LENGTH + payload; int paddingStart = FRAME_HEADER_LENGTH + payload;
for(int i = paddingStart; i < paddingStart + padding; i++) { for(int i = paddingStart; i < paddingStart + padding; i++) {
if(buf[i] != 0) throw new InvalidDataException(); if(buf[i] != 0) throw new InvalidDataException();
} }
// Check the MAC // Verify the MAC
int macStart = FRAME_HEADER_LENGTH + payload + padding; int macStart = FRAME_HEADER_LENGTH + payload + padding;
mac.update(buf, 0, macStart); mac.update(buf, 0, macStart);
byte[] expectedMac = mac.doFinal(); byte[] expectedMac = mac.doFinal();