Store the incoming and outgoing secrets separately.

2026-02-14 03:39:05 +01:00 · 2011-11-15 16:07:14 +00:00
parent f41d48eb9f
commit 6a15c03e81
26 changed files with 200 additions and 336 deletions
--- a/test/build.xml
+++ b/test/build.xml
@@ -17,8 +17,6 @@
 			<test name='net.sf.briar.LockFairnessTest'/>
 			<test name='net.sf.briar.ProtocolIntegrationTest'/>
 			<test name='net.sf.briar.crypto.CounterModeTest'/>
-			<test name='net.sf.briar.crypto.CryptoComponentTest'/>
-			<test name='net.sf.briar.crypto.SharedSecretTest'/>
 			<test name='net.sf.briar.db.BasicH2Test'/>
 			<test name='net.sf.briar.db.DatabaseCleanerImplTest'/>
 			<test name='net.sf.briar.db.DatabaseComponentImplTest'/>
--- a/test/net/sf/briar/ProtocolIntegrationTest.java
+++ b/test/net/sf/briar/ProtocolIntegrationTest.java
@@ -13,6 +13,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Random;

 import junit.framework.TestCase;
 import net.sf.briar.api.crypto.CryptoComponent;
@@ -56,6 +57,7 @@ import net.sf.briar.transport.TransportModule;
 import net.sf.briar.transport.batch.TransportBatchModule;
 import net.sf.briar.transport.stream.TransportStreamModule;

+import org.bouncycastle.util.Arrays;
 import org.junit.Test;

 import com.google.inject.Guice;
@@ -71,7 +73,7 @@ public class ProtocolIntegrationTest extends TestCase {
 	private final ProtocolReaderFactory protocolReaderFactory;
 	private final ProtocolWriterFactory protocolWriterFactory;
 	private final CryptoComponent crypto;
-	private final byte[] aliceSecret, bobSecret;
+	private final byte[] aliceToBobSecret;
 	private final TransportIndex transportIndex = new TransportIndex(13);
 	private final long connection = 12345L;
 	private final Author author;
@@ -96,10 +98,9 @@ public class ProtocolIntegrationTest extends TestCase {
 		crypto = i.getInstance(CryptoComponent.class);
 		assertEquals(crypto.getMessageDigest().getDigestLength(),
 				UniqueId.LENGTH);
-		// Create matching secrets: one for Alice, one for Bob
-		aliceSecret = new byte[123];
-		aliceSecret[0] = (byte) 1;
-		bobSecret = new byte[123];
+		Random r = new Random();
+		aliceToBobSecret = new byte[123];
+		r.nextBytes(aliceToBobSecret);
 		// Create two groups: one restricted, one unrestricted
 		GroupFactory groupFactory = i.getInstance(GroupFactory.class);
 		group = groupFactory.createGroup("Unrestricted group", null);
@@ -138,9 +139,9 @@ public class ProtocolIntegrationTest extends TestCase {

 	private byte[] write() throws Exception {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		// Use Alice's secret for writing
+		byte[] copyOfSecret = Arrays.clone(aliceToBobSecret);
 		ConnectionWriter w = connectionWriterFactory.createConnectionWriter(out,
-				Long.MAX_VALUE, transportIndex, connection, aliceSecret);
+				Long.MAX_VALUE, transportIndex, connection, copyOfSecret);
 		OutputStream out1 = w.getOutputStream();

 		AckWriter a = protocolWriterFactory.createAckWriter(out1);
@@ -193,9 +194,9 @@ public class ProtocolIntegrationTest extends TestCase {
 			offset += read;
 		}
 		assertEquals(16, offset);
-		// Use Bob's secret for reading
+		byte[] copyOfSecret = Arrays.clone(aliceToBobSecret);
 		ConnectionReader r = connectionReaderFactory.createConnectionReader(in,
-				transportIndex, encryptedIv, bobSecret);
+				transportIndex, encryptedIv, copyOfSecret);
 		in = r.getInputStream();
 		ProtocolReader protocolReader =
 			protocolReaderFactory.createProtocolReader(in);
--- a/test/net/sf/briar/crypto/CryptoComponentTest.java
+++ b/test/net/sf/briar/crypto/CryptoComponentTest.java
@@ -1,49 +0,0 @@
-package net.sf.briar.crypto;
-
-import junit.framework.TestCase;
-import net.sf.briar.api.crypto.CryptoComponent;
-
-import org.junit.Test;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-public class CryptoComponentTest extends TestCase {
-
-	private final CryptoComponent crypto;
-
-	public CryptoComponentTest() {
-		super();
-		Injector i = Guice.createInjector(new CryptoModule());
-		crypto = i.getInstance(CryptoComponent.class);
-	}
-
-	@Test
-	public void testKeyDerivation() {
-		// Create matching secrets: one for Alice, one for Bob
-		byte[] aliceSecret = new byte[123];
-		aliceSecret[0] = (byte) 1;
-		byte[] bobSecret = new byte[123];
-		// Check that Alice's incoming keys match Bob's outgoing keys
-		assertEquals(crypto.deriveIncomingMacKey(aliceSecret),
-				crypto.deriveOutgoingMacKey(bobSecret));
-		assertEquals(crypto.deriveIncomingFrameKey(aliceSecret),
-				crypto.deriveOutgoingFrameKey(bobSecret));
-		assertEquals(crypto.deriveIncomingIvKey(aliceSecret),
-				crypto.deriveOutgoingIvKey(bobSecret));
-		// Check that Alice's outgoing keys match Bob's incoming keys
-		assertEquals(crypto.deriveOutgoingMacKey(aliceSecret),
-				crypto.deriveIncomingMacKey(bobSecret));
-		assertEquals(crypto.deriveOutgoingFrameKey(aliceSecret),
-				crypto.deriveIncomingFrameKey(bobSecret));
-		assertEquals(crypto.deriveOutgoingIvKey(aliceSecret),
-				crypto.deriveIncomingIvKey(bobSecret));
-		// Check that Alice's incoming and outgoing keys are different
-		assertFalse(crypto.deriveIncomingMacKey(aliceSecret).equals(
-				crypto.deriveOutgoingMacKey(aliceSecret)));
-		assertFalse(crypto.deriveIncomingFrameKey(aliceSecret).equals(
-				crypto.deriveOutgoingFrameKey(aliceSecret)));
-		assertFalse(crypto.deriveIncomingIvKey(aliceSecret).equals(
-				crypto.deriveOutgoingIvKey(aliceSecret)));
-	}
-}
--- a/test/net/sf/briar/crypto/SharedSecretTest.java
+++ b/test/net/sf/briar/crypto/SharedSecretTest.java
@@ -1,39 +0,0 @@
-package net.sf.briar.crypto;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-public class SharedSecretTest extends TestCase {
-
-	@Test
-	public void testDecodeAndEncode() {
-		Random random = new Random();
-		byte[] secret = new byte[40];
-		random.nextBytes(secret);
-		secret[0] = (byte) 0;
-		SharedSecret s = new SharedSecret(secret);
-		assertArrayEquals(secret, s.getBytes());
-		secret[0] = (byte) 1;
-		s = new SharedSecret(secret);
-		assertArrayEquals(secret, s.getBytes());
-		// The Alice flag must be either 0 or 1
-		secret[0] = (byte) 2;
-		try {
-			s = new SharedSecret(secret);
-			fail();
-		} catch(IllegalArgumentException expected) {}
-		// The secret must be at least 1 byte long
-		secret = new byte[1];
-		random.nextBytes(secret);
-		secret[0] = (byte) 0;
-		try {
-			s = new SharedSecret(secret);
-			fail();
-		} catch(IllegalArgumentException expected) {}
-	}
-}
--- a/test/net/sf/briar/db/DatabaseComponentTest.java
+++ b/test/net/sf/briar/db/DatabaseComponentTest.java
@@ -5,6 +5,7 @@ import java.util.BitSet;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Random;

 import junit.framework.TestCase;
 import net.sf.briar.TestUtils;
@@ -46,6 +47,7 @@ import net.sf.briar.api.transport.ConnectionWindow;

 import org.jmock.Expectations;
 import org.jmock.Mockery;
+import static org.junit.Assert.assertArrayEquals;
 import org.junit.Test;

 public abstract class DatabaseComponentTest extends TestCase {
@@ -66,7 +68,7 @@ public abstract class DatabaseComponentTest extends TestCase {
 	private final TransportIndex localIndex, remoteIndex;
 	private final Collection<Transport> transports;
 	private final Map<ContactId, TransportProperties> remoteProperties;
-	private final byte[] secret;
+	private final byte[] inSecret, outSecret;

 	public DatabaseComponentTest() {
 		super();
@@ -94,7 +96,11 @@ public abstract class DatabaseComponentTest extends TestCase {
 		Transport transport = new Transport(transportId, localIndex,
 				properties);
 		transports = Collections.singletonList(transport);
-		secret = new byte[123];
+		Random r = new Random();
+		inSecret = new byte[123];
+		r.nextBytes(inSecret);
+		outSecret = new byte[123];
+		r.nextBytes(outSecret);
 	}

 	protected abstract <T> DatabaseComponent createDatabaseComponent(
@@ -132,7 +138,7 @@ public abstract class DatabaseComponentTest extends TestCase {
 			oneOf(database).setRating(txn, authorId, Rating.GOOD);
 			will(returnValue(Rating.GOOD));
 			// addContact()
-			oneOf(database).addContact(txn, secret);
+			oneOf(database).addContact(txn, inSecret, outSecret);
 			will(returnValue(contactId));
 			oneOf(listener).eventOccurred(with(any(ContactAddedEvent.class)));
 			// getContacts()
@@ -143,11 +149,16 @@ public abstract class DatabaseComponentTest extends TestCase {
 			will(returnValue(true));
 			oneOf(database).getConnectionWindow(txn, contactId, remoteIndex);
 			will(returnValue(connectionWindow));
-			// getSharedSecret(contactId)
+			// getSharedSecret(contactId, true)
 			oneOf(database).containsContact(txn, contactId);
 			will(returnValue(true));
-			oneOf(database).getSharedSecret(txn, contactId);
-			will(returnValue(secret));
+			oneOf(database).getSharedSecret(txn, contactId, true);
+			will(returnValue(inSecret));
+			// getSharedSecret(contactId, false)
+			oneOf(database).containsContact(txn, contactId);
+			will(returnValue(true));
+			oneOf(database).getSharedSecret(txn, contactId, false);
+			will(returnValue(outSecret));
 			// getTransportProperties(transportId)
 			oneOf(database).getRemoteProperties(txn, transportId);
 			will(returnValue(remoteProperties));
@@ -198,11 +209,12 @@ public abstract class DatabaseComponentTest extends TestCase {
 		assertEquals(Rating.UNRATED, db.getRating(authorId));
 		db.setRating(authorId, Rating.GOOD); // First time - listeners called
 		db.setRating(authorId, Rating.GOOD); // Second time - not called
-		assertEquals(contactId, db.addContact(secret));
+		assertEquals(contactId, db.addContact(inSecret, outSecret));
 		assertEquals(Collections.singletonList(contactId), db.getContacts());
 		assertEquals(connectionWindow,
 				db.getConnectionWindow(contactId, remoteIndex));
-		assertEquals(secret, db.getSharedSecret(contactId));
+		assertArrayEquals(inSecret, db.getSharedSecret(contactId, true));
+		assertArrayEquals(outSecret, db.getSharedSecret(contactId, false));
 		assertEquals(remoteProperties, db.getRemoteProperties(transportId));
 		db.subscribe(group); // First time - listeners called
 		db.subscribe(group); // Second time - not called
@@ -564,7 +576,7 @@ public abstract class DatabaseComponentTest extends TestCase {
 		} catch(NoSuchContactException expected) {}

 		try {
-			db.getSharedSecret(contactId);
+			db.getSharedSecret(contactId, true);
 			fail();
 		} catch(NoSuchContactException expected) {}

--- a/test/net/sf/briar/db/H2DatabaseTest.java
+++ b/test/net/sf/briar/db/H2DatabaseTest.java
@@ -85,7 +85,7 @@ public class H2DatabaseTest extends TestCase {
 	private final Map<ContactId, TransportProperties> remoteProperties;
 	private final Collection<Transport> remoteTransports;
 	private final Map<Group, Long> subscriptions;
-	private final byte[] secret;
+	private final byte[] inSecret, outSecret;

 	public H2DatabaseTest() throws Exception {
 		super();
@@ -122,7 +122,11 @@ public class H2DatabaseTest extends TestCase {
 				properties);
 		remoteTransports = Collections.singletonList(remoteTransport);
 		subscriptions = Collections.singletonMap(group, 0L);
-		secret = new byte[123];
+		Random r = new Random();
+		inSecret = new byte[123];
+		r.nextBytes(inSecret);
+		outSecret = new byte[123];
+		r.nextBytes(outSecret);
 	}

 	@Before
@@ -136,7 +140,8 @@ public class H2DatabaseTest extends TestCase {
 		Database<Connection> db = open(false);
 		Connection txn = db.startTransaction();
 		assertFalse(db.containsContact(txn, contactId));
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId,
+				db.addContact(txn, inSecret, outSecret));
 		assertTrue(db.containsContact(txn, contactId));
 		assertFalse(db.containsSubscription(txn, groupId));
 		db.addSubscription(txn, group);
@@ -192,20 +197,20 @@ public class H2DatabaseTest extends TestCase {

 		// Create three contacts
 		assertFalse(db.containsContact(txn, contactId));
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		assertTrue(db.containsContact(txn, contactId));
 		assertFalse(db.containsContact(txn, contactId1));
-		assertEquals(contactId1, db.addContact(txn, secret));
+		assertEquals(contactId1, db.addContact(txn, inSecret, outSecret));
 		assertTrue(db.containsContact(txn, contactId1));
 		assertFalse(db.containsContact(txn, contactId2));
-		assertEquals(contactId2, db.addContact(txn, secret));
+		assertEquals(contactId2, db.addContact(txn, inSecret, outSecret));
 		assertTrue(db.containsContact(txn, contactId2));
 		// Delete the contact with the highest ID
 		db.removeContact(txn, contactId2);
 		assertFalse(db.containsContact(txn, contactId2));
 		// Add another contact - a new ID should be created
 		assertFalse(db.containsContact(txn, contactId3));
-		assertEquals(contactId3, db.addContact(txn, secret));
+		assertEquals(contactId3, db.addContact(txn, inSecret, outSecret));
 		assertTrue(db.containsContact(txn, contactId3));

 		db.commitTransaction(txn);
@@ -252,7 +257,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and store a private message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addPrivateMessage(txn, privateMessage, contactId);

 		// Removing the contact should remove the message
@@ -271,7 +276,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and store a private message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addPrivateMessage(txn, privateMessage, contactId);

 		// The message has no status yet, so it should not be sendable
@@ -310,7 +315,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and store a private message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addPrivateMessage(txn, privateMessage, contactId);
 		db.setStatus(txn, contactId, privateMessageId, Status.NEW);

@@ -338,7 +343,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -376,7 +381,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -418,7 +423,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.addGroupMessage(txn, message);
@@ -457,7 +462,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.addGroupMessage(txn, message);
@@ -492,7 +497,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -523,7 +528,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
 		db.addGroupMessage(txn, message);
@@ -556,7 +561,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and some batches to ack
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addBatchToAck(txn, contactId, batchId);
 		db.addBatchToAck(txn, contactId, batchId1);

@@ -583,7 +588,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and receive the same batch twice
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addBatchToAck(txn, contactId, batchId);
 		db.addBatchToAck(txn, contactId, batchId);

@@ -609,7 +614,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.addGroupMessage(txn, message);

@@ -634,8 +639,8 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add two contacts, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
-		ContactId contactId1 = db.addContact(txn, secret);
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
+		ContactId contactId1 = db.addContact(txn, inSecret, outSecret);
 		db.addSubscription(txn, group);
 		db.addGroupMessage(txn, message);

@@ -657,7 +662,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -696,7 +701,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -741,7 +746,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));

 		// Add some outstanding batches, a few ms apart
 		for(int i = 0; i < ids.length; i++) {
@@ -781,7 +786,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));

 		// Add some outstanding batches, a few ms apart
 		for(int i = 0; i < ids.length; i++) {
@@ -1001,7 +1006,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact with a transport
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.setTransports(txn, contactId, remoteTransports, 1);
 		assertEquals(remoteProperties,
 				db.getRemoteProperties(txn, transportId));
@@ -1094,7 +1099,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact with a transport
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.setTransports(txn, contactId, remoteTransports, 1);
 		assertEquals(remoteProperties,
 				db.getRemoteProperties(txn, transportId));
@@ -1138,7 +1143,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact with some subscriptions
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
 		assertEquals(Collections.singletonList(group),
 				db.getSubscriptions(txn, contactId));
@@ -1163,7 +1168,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact with some subscriptions
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.setSubscriptions(txn, contactId, subscriptions, 2);
 		assertEquals(Collections.singletonList(group),
 				db.getSubscriptions(txn, contactId));
@@ -1187,7 +1192,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and subscribe to a group
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setSubscriptions(txn, contactId, subscriptions, 1);

@@ -1205,7 +1210,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
 		db.addGroupMessage(txn, message);
@@ -1228,7 +1233,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
 		db.addGroupMessage(txn, message);
@@ -1251,7 +1256,7 @@ public class H2DatabaseTest extends TestCase {

 		// Add a contact, subscribe to a group and store a message -
 		// the message is older than the contact's subscription
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		Map<Group, Long> subs = Collections.singletonMap(group, timestamp + 1);
@@ -1275,7 +1280,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -1300,7 +1305,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and subscribe to a group
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -1319,7 +1324,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact with a subscription
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);

 		// There's no local subscription for the group
@@ -1336,7 +1341,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.addGroupMessage(txn, message);
 		db.setStatus(txn, contactId, messageId, Status.NEW);
@@ -1355,7 +1360,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.addGroupMessage(txn, message);
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -1375,7 +1380,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -1397,7 +1402,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact, subscribe to a group and store a message
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		db.setVisibility(txn, groupId, Collections.singletonList(contactId));
 		db.setSubscriptions(txn, contactId, subscriptions, 1);
@@ -1418,7 +1423,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and subscribe to a group
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);
 		// The group should not be visible to the contact
 		assertEquals(Collections.emptyList(), db.getVisibility(txn, groupId));
@@ -1441,7 +1446,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		// Get the connection window for a new index
 		ConnectionWindow w = db.getConnectionWindow(txn, contactId,
 				remoteIndex);
@@ -1460,7 +1465,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		// Get the connection window for a new index
 		ConnectionWindow w = db.getConnectionWindow(txn, contactId,
 				remoteIndex);
@@ -1564,7 +1569,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and subscribe to a group
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);

 		// A message with a private parent should return null
@@ -1613,7 +1618,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));

 		// The subscription and transport timestamps should be initialised to 0
 		assertEquals(0L, db.getSubscriptionsModified(txn, contactId));
@@ -1644,7 +1649,7 @@ public class H2DatabaseTest extends TestCase {
 		Connection txn = db.startTransaction();

 		// Add a contact and subscribe to a group
-		assertEquals(contactId, db.addContact(txn, secret));
+		assertEquals(contactId, db.addContact(txn, inSecret, outSecret));
 		db.addSubscription(txn, group);

 		// Store a couple of messages
--- a/test/net/sf/briar/transport/ConnectionRecogniserImplTest.java
+++ b/test/net/sf/briar/transport/ConnectionRecogniserImplTest.java
@@ -4,14 +4,15 @@ import static net.sf.briar.api.transport.TransportConstants.IV_LENGTH;

 import java.util.Collection;
 import java.util.Collections;
+import java.util.Random;

 import javax.crypto.Cipher;
-import net.sf.briar.api.crypto.ErasableKey;

 import junit.framework.TestCase;
 import net.sf.briar.TestUtils;
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.crypto.CryptoComponent;
+import net.sf.briar.api.crypto.ErasableKey;
 import net.sf.briar.api.db.DatabaseComponent;
 import net.sf.briar.api.protocol.Transport;
 import net.sf.briar.api.protocol.TransportId;
@@ -31,7 +32,7 @@ public class ConnectionRecogniserImplTest extends TestCase {

 	private final CryptoComponent crypto;
 	private final ContactId contactId;
-	private final byte[] secret;
+	private final byte[] inSecret;
 	private final TransportId transportId;
 	private final TransportIndex localIndex, remoteIndex;
 	private final Collection<Transport> transports;
@@ -42,7 +43,8 @@ public class ConnectionRecogniserImplTest extends TestCase {
 		Injector i = Guice.createInjector(new CryptoModule());
 		crypto = i.getInstance(CryptoComponent.class);
 		contactId = new ContactId(1);
-		secret = new byte[18];
+		inSecret = new byte[123];
+		new Random().nextBytes(inSecret);
 		transportId = new TransportId(TestUtils.getRandomId());
 		localIndex = new TransportIndex(13);
 		remoteIndex = new TransportIndex(7);
@@ -63,8 +65,8 @@ public class ConnectionRecogniserImplTest extends TestCase {
 			will(returnValue(transports));
 			oneOf(db).getContacts();
 			will(returnValue(Collections.singletonList(contactId)));
-			oneOf(db).getSharedSecret(contactId);
-			will(returnValue(secret));
+			oneOf(db).getSharedSecret(contactId, true);
+			will(returnValue(inSecret));
 			oneOf(db).getRemoteIndex(contactId, transportId);
 			will(returnValue(remoteIndex));
 			oneOf(db).getConnectionWindow(contactId, remoteIndex);
@@ -79,7 +81,7 @@ public class ConnectionRecogniserImplTest extends TestCase {
 	@Test
 	public void testExpectedIv() throws Exception {
 		// Calculate the expected IV for connection number 3
-		ErasableKey ivKey = crypto.deriveIncomingIvKey(secret);
+		ErasableKey ivKey = crypto.deriveIvKey(inSecret, true);
 		Cipher ivCipher = crypto.getIvCipher();
 		ivCipher.init(Cipher.ENCRYPT_MODE, ivKey);
 		byte[] iv = IvEncoder.encodeIv(true, remoteIndex, 3L);
@@ -94,8 +96,8 @@ public class ConnectionRecogniserImplTest extends TestCase {
 			will(returnValue(transports));
 			oneOf(db).getContacts();
 			will(returnValue(Collections.singletonList(contactId)));
-			oneOf(db).getSharedSecret(contactId);
-			will(returnValue(secret));
+			oneOf(db).getSharedSecret(contactId, true);
+			will(returnValue(inSecret));
 			oneOf(db).getRemoteIndex(contactId, transportId);
 			will(returnValue(remoteIndex));
 			oneOf(db).getConnectionWindow(contactId, remoteIndex);
@@ -105,8 +107,8 @@ public class ConnectionRecogniserImplTest extends TestCase {
 			will(returnValue(connectionWindow));
 			oneOf(db).setConnectionWindow(contactId, remoteIndex,
 					connectionWindow);
-			oneOf(db).getSharedSecret(contactId);
-			will(returnValue(secret));
+			oneOf(db).getSharedSecret(contactId, true);
+			will(returnValue(inSecret));
 		}});
 		final ConnectionRecogniserImpl c =
 			new ConnectionRecogniserImpl(crypto, db);
--- a/test/net/sf/briar/transport/ConnectionWriterTest.java
+++ b/test/net/sf/briar/transport/ConnectionWriterTest.java
@@ -4,6 +4,7 @@ import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH;
 import static net.sf.briar.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;

 import java.io.ByteArrayOutputStream;
+import java.util.Random;

 import junit.framework.TestCase;
 import net.sf.briar.TestDatabaseModule;
@@ -26,7 +27,7 @@ import com.google.inject.Injector;
 public class ConnectionWriterTest extends TestCase {

 	private final ConnectionWriterFactory connectionWriterFactory;
-	private final byte[] secret = new byte[100];
+	private final byte[] outSecret;
 	private final TransportIndex transportIndex = new TransportIndex(13);
 	private final long connection = 12345L;

@@ -38,6 +39,8 @@ public class ConnectionWriterTest extends TestCase {
 				new TestDatabaseModule(), new TransportBatchModule(),
 				new TransportModule(), new TransportStreamModule());
 		connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class);
+		outSecret = new byte[123];
+		new Random().nextBytes(outSecret);
 	}

 	@Test
@@ -45,7 +48,7 @@ public class ConnectionWriterTest extends TestCase {
 		ByteArrayOutputStream out =
 			new ByteArrayOutputStream(MIN_CONNECTION_LENGTH);
 		ConnectionWriter w = connectionWriterFactory.createConnectionWriter(out,
-				MIN_CONNECTION_LENGTH, transportIndex, connection, secret);
+				MIN_CONNECTION_LENGTH, transportIndex, connection, outSecret);
 		// Check that the connection writer thinks there's room for a packet
 		long capacity = w.getRemainingCapacity();
 		assertTrue(capacity >= MAX_PACKET_LENGTH);
--- a/test/net/sf/briar/transport/FrameReadWriteTest.java
+++ b/test/net/sf/briar/transport/FrameReadWriteTest.java
@@ -29,10 +29,10 @@ public class FrameReadWriteTest extends TestCase {

 	private final CryptoComponent crypto;
 	private final Cipher ivCipher, frameCipher;
+	private final Random random;
+	private final byte[] outSecret;
 	private final ErasableKey ivKey, frameKey, macKey;
 	private final Mac mac;
-	private final Random random;
-	private final byte[] secret = new byte[100];
 	private final TransportIndex transportIndex = new TransportIndex(13);
 	private final long connection = 12345L;

@@ -42,12 +42,14 @@ public class FrameReadWriteTest extends TestCase {
 		crypto = i.getInstance(CryptoComponent.class);
 		ivCipher = crypto.getIvCipher();
 		frameCipher = crypto.getFrameCipher();
-		// Since we're sending frames to ourselves, we only need outgoing keys
-		ivKey = crypto.deriveOutgoingIvKey(secret);
-		frameKey = crypto.deriveOutgoingFrameKey(secret);
-		macKey = crypto.deriveOutgoingMacKey(secret);
-		mac = crypto.getMac();
 		random = new Random();
+		// Since we're sending frames to ourselves, we only need outgoing keys
+		outSecret = new byte[123];
+		random.nextBytes(outSecret);
+		ivKey = crypto.deriveIvKey(outSecret, true);
+		frameKey = crypto.deriveFrameKey(outSecret, true);
+		macKey = crypto.deriveMacKey(outSecret, true);
+		mac = crypto.getMac();
 	}

 	@Test
--- a/test/net/sf/briar/transport/batch/BatchConnectionReadWriteTest.java
+++ b/test/net/sf/briar/transport/batch/BatchConnectionReadWriteTest.java
@@ -9,6 +9,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Random;

 import junit.framework.TestCase;
 import net.sf.briar.TestDatabaseModule;
@@ -54,7 +55,7 @@ public class BatchConnectionReadWriteTest extends TestCase {
 	private final File bobDir = new File(testDir, "bob");
 	private final TransportId transportId;
 	private final TransportIndex transportIndex;
-	private final byte[] aliceSecret, bobSecret;
+	private final byte[] aliceToBobSecret, bobToAliceSecret;

 	private Injector alice, bob;

@@ -63,9 +64,11 @@ public class BatchConnectionReadWriteTest extends TestCase {
 		transportId = new TransportId(TestUtils.getRandomId());
 		transportIndex = new TransportIndex(1);
 		// Create matching secrets for Alice and Bob
-		aliceSecret = new byte[123];
-		aliceSecret[0] = (byte) 1;
-		bobSecret = new byte[123];
+		Random r = new Random();
+		aliceToBobSecret = new byte[123];
+		r.nextBytes(aliceToBobSecret);
+		bobToAliceSecret = new byte[123];
+		r.nextBytes(bobToAliceSecret);
 	}

 	@Before
@@ -102,7 +105,7 @@ public class BatchConnectionReadWriteTest extends TestCase {
 		DatabaseComponent db = alice.getInstance(DatabaseComponent.class);
 		db.open(false);
 		// Add Bob as a contact and send him a message
-		ContactId contactId = db.addContact(aliceSecret);
+		ContactId contactId = db.addContact(bobToAliceSecret, aliceToBobSecret);
 		String subject = "Hello";
 		byte[] messageBody = "Hi Bob!".getBytes("UTF-8");
 		MessageEncoder encoder = alice.getInstance(MessageEncoder.class);
@@ -134,7 +137,7 @@ public class BatchConnectionReadWriteTest extends TestCase {
 		MessageListener listener = new MessageListener();
 		db.addListener(listener);
 		// Add Alice as a contact
-		ContactId contactId = db.addContact(bobSecret);
+		ContactId contactId = db.addContact(aliceToBobSecret, bobToAliceSecret);
 		// Add the transport
 		assertEquals(transportIndex, db.addTransport(transportId));
 		// Fake a transport update from Alice