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

Unit tests for segmented encrypter and decrypter.

Browse Source
This commit is contained in:
akwizgran
2012-01-13 13:06:43 +00:00
parent 90e54d94e6
commit d0e402062a
8 changed files with 189 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/net/sf/briar/api/plugins/duplex/DuplexSegmentedTransportConnection.java
View File

@@ -11,6 +11,9 @@ import net.sf.briar.api.plugins.FrameSource;
public interface DuplexSegmentedTransportConnection extends FrameSource,
FrameSink {
/** Returns the maximum length of a segment in bytes. */
int getMaximumSegmentLength();
/**
* Returns true if the output stream should be flushed after each packet.
*/

7
api/net/sf/briar/api/plugins/simplex/SimplexSegmentedTransportWriter.java
View File

@@ -1,14 +1,19 @@
package net.sf.briar.api.plugins.simplex;
import net.sf.briar.api.plugins.FrameSink;
/**
* An interface for writing data to a simplex segmented transport. The writer is
* not responsible for authenticating or encrypting the data before writing it.
*/
public interface SimplexSegmentedTransportWriter {
public interface SimplexSegmentedTransportWriter extends FrameSink {
/** Returns the capacity of the transport in bytes. */
long getCapacity();
/** Returns the maximum length of a segment in bytes. */
int getMaximumSegmentLength();
/**
* Returns true if the output stream should be flushed after each packet.
*/

2
components/net/sf/briar/transport/SegmentedConnectionDecrypter.java
View File

@@ -56,7 +56,7 @@ class SegmentedConnectionDecrypter implements FrameSource {
throw new FormatException();
// Decrypt the frame
try {
int decrypted = frameCipher.update(b, 0, length, b);
int decrypted = frameCipher.doFinal(b, 0, length, b);
assert decrypted == length;
} catch(GeneralSecurityException badCipher) {
throw new RuntimeException(badCipher);

2
test/build.xml
View File

@@ -58,6 +58,8 @@
<test name='net.sf.briar.transport.ConnectionWriterImplTest'/>
<test name='net.sf.briar.transport.ConnectionWriterTest'/>
<test name='net.sf.briar.transport.FrameReadWriteTest'/>
<test name='net.sf.briar.transport.SegmentedConnectionDecrypterTest'/>
<test name='net.sf.briar.transport.SegmentedConnectionEncrypterTest'/>
<test name='net.sf.briar.util.ByteUtilsTest'/>
<test name='net.sf.briar.util.FileUtilsTest'/>
<test name='net.sf.briar.util.StringUtilsTest'/>

18
test/net/sf/briar/transport/ConnectionDecrypterImplTest.java
View File

@@ -36,32 +36,22 @@ public class ConnectionDecrypterImplTest extends BriarTestCase {
}
@Test
public void testInitiatorDecryption() throws Exception {
testDecryption(true);
}
@Test
public void testResponderDecryption() throws Exception {
testDecryption(false);
}
private void testDecryption(boolean initiator) throws Exception {
public void testDecryption() throws Exception {
// Calculate the ciphertext for the first frame
byte[] plaintext = new byte[FRAME_HEADER_LENGTH + 123 + MAC_LENGTH];
HeaderEncoder.encodeHeader(plaintext, 0L, 123, 0);
byte[] iv = IvEncoder.encodeIv(0L, frameCipher.getBlockSize());
IvParameterSpec ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext = new byte[plaintext.length];
frameCipher.doFinal(plaintext, 0, plaintext.length, ciphertext);
byte[] ciphertext = frameCipher.doFinal(plaintext, 0, plaintext.length);
// Calculate the ciphertext for the second frame
byte[] plaintext1 = new byte[FRAME_HEADER_LENGTH + 1234 + MAC_LENGTH];
HeaderEncoder.encodeHeader(plaintext1, 1L, 1234, 0);
IvEncoder.updateIv(iv, 1L);
ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext1 = new byte[plaintext1.length];
frameCipher.doFinal(plaintext1, 0, plaintext1.length, ciphertext1);
byte[] ciphertext1 = frameCipher.doFinal(plaintext1, 0,
plaintext1.length);
// Concatenate the ciphertexts
ByteArrayOutputStream out = new ByteArrayOutputStream();
out.write(ciphertext);

11
test/net/sf/briar/transport/ConnectionEncrypterImplTest.java
View File

@@ -35,16 +35,7 @@ public class ConnectionEncrypterImplTest extends BriarTestCase {
}
@Test
public void testInitiatorEncryption() throws Exception {
testEncryption(true);
}
@Test
public void testResponderEncryption() throws Exception {
testEncryption(false);
}
private void testEncryption(boolean initiator) throws Exception {
public void testEncryption() throws Exception {
// Calculate the expected tag
byte[] tag = TagEncoder.encodeTag(0, tagCipher, tagKey);
// Calculate the expected ciphertext for the first frame

88
test/net/sf/briar/transport/SegmentedConnectionDecrypterTest.java Normal file
View File

@@ -0,0 +1,88 @@
package net.sf.briar.transport;
import static net.sf.briar.api.transport.TransportConstants.FRAME_HEADER_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAX_FRAME_LENGTH;
import java.io.IOException;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import net.sf.briar.BriarTestCase;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.plugins.FrameSource;
import net.sf.briar.crypto.CryptoModule;
import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class SegmentedConnectionDecrypterTest extends BriarTestCase {
private static final int MAC_LENGTH = 32;
private final Cipher frameCipher;
private final ErasableKey frameKey;
public SegmentedConnectionDecrypterTest() {
super();
Injector i = Guice.createInjector(new CryptoModule());
CryptoComponent crypto = i.getInstance(CryptoComponent.class);
frameCipher = crypto.getFrameCipher();
frameKey = crypto.generateTestKey();
}
@Test
public void testDecryption() throws Exception {
// Calculate the ciphertext for the first frame
byte[] plaintext = new byte[FRAME_HEADER_LENGTH + 123 + MAC_LENGTH];
HeaderEncoder.encodeHeader(plaintext, 0L, 123, 0);
byte[] iv = IvEncoder.encodeIv(0L, frameCipher.getBlockSize());
IvParameterSpec ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext = frameCipher.doFinal(plaintext, 0, plaintext.length);
// Calculate the ciphertext for the second frame
byte[] plaintext1 = new byte[FRAME_HEADER_LENGTH + 1234 + MAC_LENGTH];
HeaderEncoder.encodeHeader(plaintext1, 1L, 1234, 0);
IvEncoder.updateIv(iv, 1L);
ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext1 = frameCipher.doFinal(plaintext1, 0,
plaintext1.length);
// Use a connection decrypter to decrypt the ciphertext
byte[][] frames = new byte[][] { ciphertext, ciphertext1 };
FrameSource in = new ByteArrayFrameSource(frames);
FrameSource decrypter = new SegmentedConnectionDecrypter(in,
frameCipher, frameKey, MAC_LENGTH);
// First frame
byte[] decrypted = new byte[MAX_FRAME_LENGTH];
assertEquals(plaintext.length, decrypter.readFrame(decrypted));
for(int i = 0; i < plaintext.length; i++) {
assertEquals(plaintext[i], decrypted[i]);
}
// Second frame
assertEquals(plaintext1.length, decrypter.readFrame(decrypted));
for(int i = 0; i < plaintext1.length; i++) {
assertEquals(plaintext1[i], decrypted[i]);
}
}
private static class ByteArrayFrameSource implements FrameSource {
private final byte[][] frames;
private int frame = 0;
private ByteArrayFrameSource(byte[][] frames) {
this.frames = frames;
}
public int readFrame(byte[] b) throws IOException {
byte[] src = frames[frame++];
System.arraycopy(src, 0, b, 0, src.length);
return src.length;
}
}
}

84
test/net/sf/briar/transport/SegmentedConnectionEncrypterTest.java Normal file
View File

@@ -0,0 +1,84 @@
package net.sf.briar.transport;
import static org.junit.Assert.assertArrayEquals;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import net.sf.briar.BriarTestCase;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.ErasableKey;
import net.sf.briar.api.plugins.FrameSink;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
import net.sf.briar.crypto.CryptoModule;
import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class SegmentedConnectionEncrypterTest extends BriarTestCase {
private static final int MAC_LENGTH = 32;
private final Cipher tagCipher, frameCipher;
private final ErasableKey tagKey, frameKey;
public SegmentedConnectionEncrypterTest() {
super();
Injector i = Guice.createInjector(new CryptoModule());
CryptoComponent crypto = i.getInstance(CryptoComponent.class);
tagCipher = crypto.getTagCipher();
frameCipher = crypto.getFrameCipher();
tagKey = crypto.generateTestKey();
frameKey = crypto.generateTestKey();
}
@Test
public void testEncryption() throws Exception {
// Calculate the expected tag
byte[] tag = TagEncoder.encodeTag(0, tagCipher, tagKey);
// Calculate the expected ciphertext for the first frame
byte[] iv = new byte[frameCipher.getBlockSize()];
byte[] plaintext = new byte[123 + MAC_LENGTH];
IvParameterSpec ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext = frameCipher.doFinal(plaintext);
// Calculate the expected ciphertext for the second frame
byte[] plaintext1 = new byte[1234 + MAC_LENGTH];
IvEncoder.updateIv(iv, 1L);
ivSpec = new IvParameterSpec(iv);
frameCipher.init(Cipher.ENCRYPT_MODE, frameKey, ivSpec);
byte[] ciphertext1 = frameCipher.doFinal(plaintext1);
// Concatenate the ciphertexts
ByteArrayOutputStream out = new ByteArrayOutputStream();
out.write(tag);
out.write(ciphertext);
out.write(ciphertext1);
byte[] expected = out.toByteArray();
// Use a connection encrypter to encrypt the plaintext
ByteArrayFrameSink sink = new ByteArrayFrameSink();
ConnectionEncrypter e = new SegmentedConnectionEncrypter(sink,
Long.MAX_VALUE, tagCipher, frameCipher, tagKey, frameKey);
// The first frame's buffer must have enough space for the tag
byte[] b = new byte[TAG_LENGTH + plaintext.length];
System.arraycopy(plaintext, 0, b, 0, plaintext.length);
e.writeFrame(b, plaintext.length);
e.writeFrame(plaintext1, plaintext1.length);
byte[] actual = out.toByteArray();
// Check that the actual ciphertext matches the expected ciphertext
assertArrayEquals(expected, actual);
assertEquals(Long.MAX_VALUE - actual.length, e.getRemainingCapacity());
}
private static class ByteArrayFrameSink extends ByteArrayOutputStream
implements FrameSink {
public void writeFrame(byte[] b, int len) throws IOException {
write(b, 0, len);
}
}
}