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

Moved writers into their own package, replaced public static fields in

Browse Source 
CryptoModule with provider methods.
This commit is contained in:
akwizgran
2011-07-23 18:50:40 +01:00
parent 13f18d9e40
commit 65be63dc0c
19 changed files with 205 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -14,13 +14,13 @@ import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.Status;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.AckWriter;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.BatchId;
import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.writers.AckWriter;
import org.jmock.Expectations;
import org.jmock.Mockery;

5
test/net/sf/briar/protocol/BatchReaderTest.java
View File

@@ -38,10 +38,11 @@ public class BatchReaderTest extends TestCase {
public BatchReaderTest() throws Exception {
super();
Injector i = Guice.createInjector(new SerialModule());
Injector i = Guice.createInjector(new SerialModule(),
new CryptoModule());
readerFactory = i.getInstance(ReaderFactory.class);
writerFactory = i.getInstance(WriterFactory.class);
messageDigest = MessageDigest.getInstance(CryptoModule.DIGEST_ALGO);
messageDigest = i.getInstance(MessageDigest.class);
context = new Mockery();
message = context.mock(Message.class);
}

46
test/net/sf/briar/protocol/ConsumersTest.java
View File

@@ -1,7 +1,6 @@
package net.sf.briar.protocol;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.MessageDigest;
import java.security.Signature;
import java.util.Arrays;
@@ -11,48 +10,59 @@ import junit.framework.TestCase;
import net.sf.briar.api.serial.FormatException;
import net.sf.briar.crypto.CryptoModule;
import org.junit.Before;
import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class ConsumersTest extends TestCase {
private Signature signature = null;
private KeyPair keyPair = null;
private MessageDigest messageDigest = null;
@Before
public void setUp() {
Injector i = Guice.createInjector(new CryptoModule());
signature = i.getInstance(Signature.class);
keyPair = i.getInstance(KeyPair.class);
messageDigest = i.getInstance(MessageDigest.class);
}
@Test
public void testSigningConsumer() throws Exception {
Signature s = Signature.getInstance(CryptoModule.SIGNATURE_ALGO);
KeyPairGenerator gen =
KeyPairGenerator.getInstance(CryptoModule.KEY_PAIR_ALGO);
KeyPair k = gen.genKeyPair();
byte[] data = new byte[1234];
// Generate some random data and sign it
new Random().nextBytes(data);
s.initSign(k.getPrivate());
s.update(data);
byte[] sig = s.sign();
signature.initSign(keyPair.getPrivate());
signature.update(data);
byte[] sig = signature.sign();
// Check that feeding a SigningConsumer generates the same signature
s.initSign(k.getPrivate());
SigningConsumer sc = new SigningConsumer(s);
signature.initSign(keyPair.getPrivate());
SigningConsumer sc = new SigningConsumer(signature);
sc.write(data[0]);
sc.write(data, 1, data.length - 2);
sc.write(data[data.length - 1]);
byte[] sig1 = s.sign();
byte[] sig1 = signature.sign();
assertTrue(Arrays.equals(sig, sig1));
}
@Test
public void testDigestingConsumer() throws Exception {
MessageDigest m = MessageDigest.getInstance(CryptoModule.DIGEST_ALGO);
byte[] data = new byte[1234];
// Generate some random data and digest it
new Random().nextBytes(data);
m.reset();
m.update(data);
byte[] dig = m.digest();
messageDigest.reset();
messageDigest.update(data);
byte[] dig = messageDigest.digest();
// Check that feeding a DigestingConsumer generates the same digest
m.reset();
DigestingConsumer dc = new DigestingConsumer(m);
messageDigest.reset();
DigestingConsumer dc = new DigestingConsumer(messageDigest);
dc.write(data[0]);
dc.write(data, 1, data.length - 2);
dc.write(data[data.length - 1]);
byte[] dig1 = m.digest();
byte[] dig1 = messageDigest.digest();
assertTrue(Arrays.equals(dig, dig1));
}

25
test/net/sf/briar/protocol/FileReadWriteTest.java
View File

@@ -4,7 +4,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.MessageDigest;
import java.security.Signature;
import java.util.Arrays;
@@ -15,20 +14,22 @@ import junit.framework.TestCase;
import net.sf.briar.TestUtils;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.AckWriter;
import net.sf.briar.api.protocol.Batch;
import net.sf.briar.api.protocol.BatchId;
import net.sf.briar.api.protocol.BatchWriter;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageEncoder;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.Tags;
import net.sf.briar.api.protocol.UniqueId;
import net.sf.briar.api.protocol.writers.AckWriter;
import net.sf.briar.api.protocol.writers.BatchWriter;
import net.sf.briar.api.protocol.writers.PacketWriterFactory;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.protocol.writers.WritersModule;
import net.sf.briar.serial.SerialModule;
import org.junit.After;
@@ -50,6 +51,7 @@ public class FileReadWriteTest extends TestCase {
private final ReaderFactory readerFactory;
private final WriterFactory writerFactory;
private final PacketWriterFactory packetWriterFactory;
private final Signature signature;
private final MessageDigest messageDigest, batchDigest;
private final KeyParser keyParser;
@@ -58,21 +60,20 @@ public class FileReadWriteTest extends TestCase {
public FileReadWriteTest() throws Exception {
super();
Injector i = Guice.createInjector(new SerialModule(),
new CryptoModule());
new CryptoModule(), new WritersModule());
readerFactory = i.getInstance(ReaderFactory.class);
writerFactory = i.getInstance(WriterFactory.class);
packetWriterFactory = i.getInstance(PacketWriterFactory.class);
keyParser = i.getInstance(KeyParser.class);
signature = Signature.getInstance(CryptoModule.SIGNATURE_ALGO);
messageDigest = MessageDigest.getInstance(CryptoModule.DIGEST_ALGO);
batchDigest = MessageDigest.getInstance(CryptoModule.DIGEST_ALGO);
signature = i.getInstance(Signature.class);
messageDigest = i.getInstance(MessageDigest.class);
batchDigest = i.getInstance(MessageDigest.class);
assertEquals(messageDigest.getDigestLength(), UniqueId.LENGTH);
assertEquals(batchDigest.getDigestLength(), UniqueId.LENGTH);
// Create and encode a test message
MessageEncoder messageEncoder = new MessageEncoderImpl(signature,
messageDigest, writerFactory);
KeyPairGenerator gen =
KeyPairGenerator.getInstance(CryptoModule.KEY_PAIR_ALGO);
KeyPair keyPair = gen.generateKeyPair();
KeyPair keyPair = i.getInstance(KeyPair.class);
message = messageEncoder.encodeMessage(MessageId.NONE, sub, nick,
keyPair, messageBody.getBytes("UTF-8"));
}
@@ -86,11 +87,11 @@ public class FileReadWriteTest extends TestCase {
public void testWriteFile() throws Exception {
FileOutputStream out = new FileOutputStream(file);
AckWriter a = new AckWriterImpl(out, writerFactory);
AckWriter a = packetWriterFactory.createAckWriter(out);
a.addBatchId(ack);
a.finish();
BatchWriter b = new BatchWriterImpl(out, writerFactory, batchDigest);
BatchWriter b = packetWriterFactory.createBatchWriter(out);
b.addMessage(message.getBytes());
b.finish();

43
test/net/sf/briar/protocol/SigningDigestingOutputStreamTest.java
View File

@@ -3,7 +3,6 @@ package net.sf.briar.protocol;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.MessageDigest;
import java.security.Signature;
import java.util.Arrays;
@@ -15,19 +14,21 @@ import net.sf.briar.crypto.CryptoModule;
import org.junit.Before;
import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class SigningDigestingOutputStreamTest extends TestCase {
private Signature signature = null;
private KeyPair keyPair = null;
private Signature sig = null;
private MessageDigest dig = null;
private MessageDigest messageDigest = null;
@Before
public void setUp() throws Exception {
KeyPairGenerator gen =
KeyPairGenerator.getInstance(CryptoModule.KEY_PAIR_ALGO);
keyPair = gen.generateKeyPair();
sig = Signature.getInstance(CryptoModule.SIGNATURE_ALGO);
dig = MessageDigest.getInstance(CryptoModule.DIGEST_ALGO);
Injector i = Guice.createInjector(new CryptoModule());
signature = i.getInstance(Signature.class);
keyPair = i.getInstance(KeyPair.class);
messageDigest = i.getInstance(MessageDigest.class);
}
@Test
@@ -36,9 +37,9 @@ public class SigningDigestingOutputStreamTest extends TestCase {
new Random().nextBytes(input);
ByteArrayOutputStream out = new ByteArrayOutputStream(input.length);
SigningDigestingOutputStream s =
new SigningDigestingOutputStream(out, sig, dig);
sig.initSign(keyPair.getPrivate());
dig.reset();
new SigningDigestingOutputStream(out, signature, messageDigest);
signature.initSign(keyPair.getPrivate());
messageDigest.reset();
// Sign the first 256 bytes, digest all but the last 256 bytes
s.setDigesting(true);
s.setSigning(true);
@@ -49,20 +50,20 @@ public class SigningDigestingOutputStreamTest extends TestCase {
s.write(input, 768, 256);
s.close();
// Get the signature and the digest
byte[] signature = sig.sign();
byte[] digest = dig.digest();
byte[] sig = signature.sign();
byte[] digest = messageDigest.digest();
// Check that the output matches the input
assertTrue(Arrays.equals(input, out.toByteArray()));
// Check that the signature matches a signature over the first 256 bytes
sig.initSign(keyPair.getPrivate());
sig.update(input, 0, 256);
byte[] directSignature = sig.sign();
assertTrue(Arrays.equals(directSignature, signature));
signature.initSign(keyPair.getPrivate());
signature.update(input, 0, 256);
byte[] directSig = signature.sign();
assertTrue(Arrays.equals(directSig, sig));
// Check that the digest matches a digest over all but the last 256
// bytes
dig.reset();
dig.update(input, 0, 768);
byte[] directDigest = dig.digest();
messageDigest.reset();
messageDigest.update(input, 0, 768);
byte[] directDigest = messageDigest.digest();
assertTrue(Arrays.equals(directDigest, digest));
}
@@ -70,7 +71,7 @@ public class SigningDigestingOutputStreamTest extends TestCase {
public void testSignatureExceptionThrowsIOException() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
SigningDigestingOutputStream s =
new SigningDigestingOutputStream(out, sig, dig);
new SigningDigestingOutputStream(out, signature, messageDigest);
s.setSigning(true); // Signature hasn't been initialised yet
try {
s.write((byte) 0);