Add an absurd amount of logging.

.idea/codeStyles/Project.xml

@@ -39,6 +39,31 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>

bramble-android/build.gradle

@@ -11,8 +11,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10107
-		versionName "1.1.7"
+		versionCode 10106
+		versionName "1.1.6"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -33,7 +33,7 @@ dependencies {
 	tor 'org.briarproject:tor-android:0.3.5.8@zip'
 	tor 'org.briarproject:obfs4proxy-android:0.0.9@zip'
 
-	annotationProcessor 'com.google.dagger:dagger-compiler:2.22.1'
+	annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
 
 	compileOnly 'javax.annotation:jsr250-api:1.0'
 

bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java

@@ -9,6 +9,7 @@ import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.util.IoUtils;
 
 import java.io.File;
 import java.util.HashSet;
@@ -19,9 +20,6 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static android.os.Build.VERSION.SDK_INT;
-import static java.util.logging.Level.INFO;
-import static org.briarproject.bramble.util.IoUtils.deleteFileOrDir;
-import static org.briarproject.bramble.util.LogUtils.logFileOrDir;
 
 class AndroidAccountManager extends AccountManagerImpl
 		implements AccountManager {
@@ -43,16 +41,6 @@ class AndroidAccountManager extends AccountManagerImpl
 		appContext = app.getApplicationContext();
 	}
 
-	@Override
-	public boolean accountExists() {
-		boolean exists = super.accountExists();
-		if (!exists && LOG.isLoggable(INFO)) {
-			LOG.info("Account does not exist. Contents of account directory:");
-			logFileOrDir(LOG, INFO, getDataDir());
-		}
-		return exists;
-	}
-
 	// Locking: stateChangeLock
 	@Override
 	@Nullable
@@ -86,17 +74,9 @@ class AndroidAccountManager extends AccountManagerImpl
 	@Override
 	public void deleteAccount() {
 		synchronized (stateChangeLock) {
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Contents of account directory before deleting:");
-				logFileOrDir(LOG, INFO, getDataDir());
-			}
 			super.deleteAccount();
 			SharedPreferences defaultPrefs = getDefaultSharedPreferences();
 			deleteAppData(prefs, defaultPrefs);
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Contents of account directory after deleting:");
-				logFileOrDir(LOG, INFO, getDataDir());
-			}
 		}
 	}
 
@@ -114,7 +94,7 @@ class AndroidAccountManager extends AccountManagerImpl
 		}
 		// Delete files, except lib and shared_prefs directories
 		Set<File> files = new HashSet<>();
-		File dataDir = getDataDir();
+		File dataDir = new File(appContext.getApplicationInfo().dataDir);
 		@Nullable
 		File[] fileArray = dataDir.listFiles();
 		if (fileArray == null) {
@@ -141,17 +121,13 @@ class AndroidAccountManager extends AccountManagerImpl
 			}
 		}
 		for (File file : files) {
-			deleteFileOrDir(file);
+			IoUtils.deleteFileOrDir(file);
 		}
 		// Recreate the cache dir as some OpenGL drivers expect it to exist
 		if (!new File(dataDir, "cache").mkdirs())
 			LOG.warning("Could not recreate cache dir");
 	}
 
-	private File getDataDir() {
-		return new File(appContext.getApplicationInfo().dataDir);
-	}
-
 	private void addIfNotNull(Set<File> files, @Nullable File file) {
 		if (file != null) files.add(file);
 	}

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java

@@ -32,6 +32,9 @@ import static java.util.concurrent.TimeUnit.MINUTES;
 @ParametersNotNullByDefault
 class AndroidTorPlugin extends TorPlugin {
 
+	// This tag may prevent Huawei's power manager from killing us
+	private static final String WAKE_LOCK_TAG = "LocationManagerService";
+
 	private final Context appContext;
 	private final RenewableWakeLock wakeLock;
 
@@ -52,7 +55,7 @@ class AndroidTorPlugin extends TorPlugin {
 				appContext.getSystemService(POWER_SERVICE);
 		if (pm == null) throw new AssertionError();
 		wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
-				getWakeLockTag(), 1, MINUTES);
+				WAKE_LOCK_TAG, 1, MINUTES);
 	}
 
 	@Override
@@ -84,17 +87,4 @@ class AndroidTorPlugin extends TorPlugin {
 		super.stop();
 		wakeLock.release();
 	}
-
-	private String getWakeLockTag() {
-		PackageManager pm = appContext.getPackageManager();
-		for (PackageInfo info : pm.getInstalledPackages(0)) {
-			String name = info.packageName.toLowerCase();
-			if (name.startsWith("com.huawei.powergenie")) {
-				return "LocationManagerService";
-			} else if (name.startsWith("com.evenwell.powermonitor")) {
-				return "AudioIn";
-			}
-		}
-		return getClass().getSimpleName();
-	}
 }

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java

@@ -1,13 +1,10 @@
 package org.briarproject.bramble.system;
 
-import org.briarproject.bramble.api.event.EventExecutor;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 
-import java.util.concurrent.Executor;
-
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -35,13 +32,6 @@ public class AndroidSystemModule {
 		return androidExecutor;
 	}
 
-	@Provides
-	@Singleton
-	@EventExecutor
-	Executor provideEventExecutor(AndroidExecutor androidExecutor) {
-		return androidExecutor::runOnUiThread;
-	}
-
 	@Provides
 	@Singleton
 	ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {

bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java

@@ -128,7 +128,7 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 			will(returnValue(editor));
 			oneOf(editor).commit();
 			will(returnValue(true));
-			allowing(app).getApplicationInfo();
+			oneOf(app).getApplicationInfo();
 			will(returnValue(applicationInfo));
 			oneOf(app).getFilesDir();
 			will(returnValue(filesDir));

bramble-android/witness.gradle

@@ -1,45 +1,45 @@
 dependencyVerification {
     verify = [
         'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-        'com.android.tools.analytics-library:protos:26.4.0:protos-26.4.0.jar:ad760915586797d39319f402837b378bff3bb4ed583e3e0c48c965631fb2135f',
-        'com.android.tools.analytics-library:shared:26.4.0:shared-26.4.0.jar:1332106a905d48909c81268c9e414946de3e83487db394c6073b0a9b5c3d0ed2',
-        'com.android.tools.analytics-library:tracker:26.4.0:tracker-26.4.0.jar:d0020cfbfd4cd75935f2972d6a24089840d4a10df6f3ef2a796093217dd37796',
-        'com.android.tools.build:apksig:3.4.0:apksig-3.4.0.jar:91d5a1866139c69756280355a6f61b4d619d0516841580114f45a10f2177327e',
-        'com.android.tools.build:apkzlib:3.4.0:apkzlib-3.4.0.jar:8653c85f5fdf1dde840e8b8af7396aeb79c34b66e541b5860059616006535592',
-        'com.android.tools.build:builder-model:3.4.0:builder-model-3.4.0.jar:a88f138124a9f016a70bcb4760359a502f65c7deed56507ee4014f4dd9ea853b',
-        'com.android.tools.build:builder-test-api:3.4.0:builder-test-api-3.4.0.jar:31089ab1ec19ca7687a010867d2f3807513c805b8226979706f4247b5d4df26f',
-        'com.android.tools.build:builder:3.4.0:builder-3.4.0.jar:476221b5203a7f50089bf185ed95000a34b6f5020ef0a17815afd58606922679',
-        'com.android.tools.build:gradle-api:3.4.0:gradle-api-3.4.0.jar:215eca38f6719213c2f492b4d622cdd11676c66c9871f8a2aed0c66d00175628',
-        'com.android.tools.build:manifest-merger:26.4.0:manifest-merger-26.4.0.jar:29e45e690dedd165035e97c21c2ca94d0bd4ec16b6b210daa26669a582b6f220',
-        'com.android.tools.ddms:ddmlib:26.4.0:ddmlib-26.4.0.jar:93f56fe4630c3166adbd6c51d7bb602d96abb91b07ba5b1165fdcd071e88c940',
-        'com.android.tools.external.com-intellij:intellij-core:26.4.0:intellij-core-26.4.0.jar:30cb0e879d4424de9677a50b537fb628636b4a50f5470af5e52437980c41421f',
-        'com.android.tools.external.com-intellij:kotlin-compiler:26.4.0:kotlin-compiler-26.4.0.jar:dd1fe225c31a0e012dc025336363a5b783e2c5c20ffb69e77f8f57e89420d998',
-        'com.android.tools.external.org-jetbrains:uast:26.4.0:uast-26.4.0.jar:f25f3285b775a983327583ff6584dea54e447813ef69e0ce08b05a45b5f4aab0',
-        'com.android.tools.layoutlib:layoutlib-api:26.4.0:layoutlib-api-26.4.0.jar:52128f5cf293b224072be361919bfd416e59480ab7264ddcdbbf046b0d7a12e3',
-        'com.android.tools.lint:lint-api:26.4.0:lint-api-26.4.0.jar:fdb8fca8ae4c254f438338d03d72605e00ed106f2d5550405af41ca1c8509401',
-        'com.android.tools.lint:lint-checks:26.4.0:lint-checks-26.4.0.jar:4ff52d40488cd3e22b9c6b2eb67784e0c3269d0b42ef9d17689cd75a7b2bceb4',
-        'com.android.tools.lint:lint-gradle-api:26.4.0:lint-gradle-api-26.4.0.jar:714b7a85c7d2aa10daeab16e969fe7530c659d0728a7f24021da456870418d0f',
-        'com.android.tools.lint:lint-gradle:26.4.0:lint-gradle-26.4.0.jar:b8c130d273f522388734457e1b96790f41528fcec6fda9e8eaa4e4d95a07cfbb',
-        'com.android.tools.lint:lint:26.4.0:lint-26.4.0.jar:83aa062fb0405b60ed358d858c8c2955e1bae44a455b498068c6a60988755f00',
-        'com.android.tools:annotations:26.4.0:annotations-26.4.0.jar:a7955b8e19c3a2a861d6faa43a58b7c0d46ea9112188ee3e235c6f9f439ecc1a',
-        'com.android.tools:common:26.4.0:common-26.4.0.jar:ea40b94b3c1284ea7700f011388e2906a8363a66abd902891722b3c557984852',
-        'com.android.tools:dvlib:26.4.0:dvlib-26.4.0.jar:23af89c535b01ba36ceed1b6b309b672814eba624e643cd7dedf0519edad50cc',
-        'com.android.tools:repository:26.4.0:repository-26.4.0.jar:3d1763ab46199374dc6d94129bba11c70f1d5857e2c81a3ac4898abca40b176b',
-        'com.android.tools:sdk-common:26.4.0:sdk-common-26.4.0.jar:78a522525b30ffc6b7bf1299c831d24ce385f68a9f4878f8f752e9baefa31b0f',
-        'com.android.tools:sdklib:26.4.0:sdklib-26.4.0.jar:b854c23892013a326d761cf071c72cf3e038ed0469d10f4a356829fa56e4c132',
+        'com.android.tools.analytics-library:protos:26.3.2:protos-26.3.2.jar:50238fb4298b297217b184b9cd93c14f83536fcee829eb0ca850bdb5b53251f0',
+        'com.android.tools.analytics-library:shared:26.3.2:shared-26.3.2.jar:ddd80dcf21905018b7c0583ba72b7282f446084d4952422609a09fbf8237ef71',
+        'com.android.tools.analytics-library:tracker:26.3.2:tracker-26.3.2.jar:28c575d2d1af003e96d7b375a668ee10b2673a2dd0f6438750aa8c3b42e7d0ad',
+        'com.android.tools.build:apksig:3.3.2:apksig-3.3.2.jar:84c4aaa20127c6c1fe6bdd334b3f5df71f54ad080be9029c8a10f43b6a908acd',
+        'com.android.tools.build:apkzlib:3.3.2:apkzlib-3.3.2.jar:d34e523278e5dff565eba3ef3c089d515b2b5cc7b47dc77e2f3465e5e47176ac',
+        'com.android.tools.build:builder-model:3.3.2:builder-model-3.3.2.jar:055e3db0ecee9e06b9f024034999a29cd92cb1885207b37542126bd8bcc57f46',
+        'com.android.tools.build:builder-test-api:3.3.2:builder-test-api-3.3.2.jar:0b2e4cd7615bbcad14a3c91fe45ae26693508d06e40ba06c5968b8bc24416618',
+        'com.android.tools.build:builder:3.3.2:builder-3.3.2.jar:65649704da7aef0487235fd326f0f2e99ed5cf958e80f204496e6e08a42bd9f5',
+        'com.android.tools.build:gradle-api:3.3.2:gradle-api-3.3.2.jar:3cbd47e41bb70330dd72ec2c9fe51e6173554b484a03829b5a2de9e00841e040',
+        'com.android.tools.build:manifest-merger:26.3.2:manifest-merger-26.3.2.jar:05c4a6d8b02fb9f08744876477d0a68547c03a8a9069b1f086684fa04af97c33',
+        'com.android.tools.ddms:ddmlib:26.3.2:ddmlib-26.3.2.jar:d248da8a563d6e46d2c7ebbf371a4877e00510f4ca763c0bb272d5a281bf8b85',
+        'com.android.tools.external.com-intellij:intellij-core:26.3.2:intellij-core-26.3.2.jar:6c5ecc968230e9f4dcd0fef28885379feace1f0cd8130de6f61d649c86139bf3',
+        'com.android.tools.external.com-intellij:kotlin-compiler:26.3.2:kotlin-compiler-26.3.2.jar:1007d9b07ccb49cd8eaf30fda10ed4681d4714f2f9ab2ecda39b4e539cc51bbe',
+        'com.android.tools.external.org-jetbrains:uast:26.3.2:uast-26.3.2.jar:5d1833e562ea4f38a89708dfde695f0a162cbd39d003d3dde818c3fdc2b05317',
+        'com.android.tools.layoutlib:layoutlib-api:26.3.2:layoutlib-api-26.3.2.jar:d7e61e874ab95f5c350dd38b6a95b5c9dbe0083a02001884264cdb390cb255b8',
+        'com.android.tools.lint:lint-api:26.3.2:lint-api-26.3.2.jar:5867dfd7fb4a4e161a816a5d29d045f9b542d34594c00a1efec46fb4cd0e1033',
+        'com.android.tools.lint:lint-checks:26.3.2:lint-checks-26.3.2.jar:4b163b9c93790d2771e92ba8de58a0d9e0671ffcf2ccef3cf496efd442e27517',
+        'com.android.tools.lint:lint-gradle-api:26.3.2:lint-gradle-api-26.3.2.jar:54cb282e0c054f9bed3f51302ce08b003c8ab7961dfd5a4f6de26c23cc23062f',
+        'com.android.tools.lint:lint-gradle:26.3.2:lint-gradle-26.3.2.jar:bb139615f4ce97d42cc394b9389b49b76a6eb85be6785a5d272991543b519013',
+        'com.android.tools.lint:lint:26.3.2:lint-26.3.2.jar:ef7b369f8a56a92ccb0f4c1c357666b9339e4a711a9d84747d446441746cfe4e',
+        'com.android.tools:annotations:26.3.2:annotations-26.3.2.jar:5bcce8e98b6a2f5ccf13ebcefd8f734e0b35f8b19e456575665631442ce1f7a1',
+        'com.android.tools:common:26.3.2:common-26.3.2.jar:d9f8e7f0669e9a701568e3db6a87c89cf12d8fa6811c9991e969f950215ecfac',
+        'com.android.tools:dvlib:26.3.2:dvlib-26.3.2.jar:d84aad56161c7773579303d69714ded6897c64c6ddfd7d456e453231e4dfe811',
+        'com.android.tools:repository:26.3.2:repository-26.3.2.jar:da611eeb06e9ab8750d25b9e2901e10db8e5ec6304eb4c8b7103d39e0921ea40',
+        'com.android.tools:sdk-common:26.3.2:sdk-common-26.3.2.jar:82823a3bf25e64fac33a286490f0cf5ac50c2cdb3c540149b030896bb44bf96c',
+        'com.android.tools:sdklib:26.3.2:sdklib-26.3.2.jar:424d15492af67321900963238646d27495ab60de2a5b19e6a416963bc5d6932b',
         'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
         'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825',
-        'com.google.dagger:dagger-compiler:2.22.1:dagger-compiler-2.22.1.jar:e5f28302cbe70a79d3620cddebfb8ec0736814f3980ffe1e673bfe3342f507d3',
-        'com.google.dagger:dagger-producers:2.22.1:dagger-producers-2.22.1.jar:f834a0082014213a68ff06a0f048d750178d02196c58b0b15beb367d32b97e35',
-        'com.google.dagger:dagger-spi:2.22.1:dagger-spi-2.22.1.jar:4b0b922793b3bcb91b99fabb75dba77c68afd7ae4c5f0c4fd6ba681f0a291c7d',
-        'com.google.dagger:dagger:2.22.1:dagger-2.22.1.jar:329d4340f24c4f5717af016c097e90668bfea2a5376e6aa9964b01cef3fd241a',
+        'com.google.dagger:dagger-compiler:2.19:dagger-compiler-2.19.jar:27a4b202a2de908182edb261f8c0a264e08e5e4733d7514bc7fbf0d31da5c0fc',
+        'com.google.dagger:dagger-producers:2.19:dagger-producers-2.19.jar:a17663abe0fc38b676026950907d4c5f5e2bf338375415861eaff6e3bdb0b768',
+        'com.google.dagger:dagger-spi:2.19:dagger-spi-2.19.jar:e7a6379d82c841f6aac2866948ad1eed716528707814602842a8d844ce04e2e1',
+        'com.google.dagger:dagger:2.19:dagger-2.19.jar:514b6f1e0727c6572e1d65cb27e4ae668b7aeaeb93a29515182965265b609939',
         'com.google.errorprone:error_prone_annotations:2.1.3:error_prone_annotations-2.1.3.jar:03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8',
         'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
         'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
         'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9',
         'com.google.guava:guava:26.0-jre:guava-26.0-jre.jar:a0e9cabad665bc20bcd2b01f108e5fc03f756e13aea80abaadb9f407033bea2c',
-        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
+        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
         'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
         'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
         'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
@@ -48,7 +48,7 @@ dependencyVerification {
         'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
         'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
         'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
-        'commons-codec:commons-codec:1.10:commons-codec-1.10.jar:4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569',
+        'commons-codec:commons-codec:1.9:commons-codec-1.9.jar:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
         'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
         'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
         'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
@@ -60,9 +60,9 @@ dependencyVerification {
         'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
         'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
         'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
-        'org.apache.httpcomponents:httpclient:4.5.6:httpclient-4.5.6.jar:c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7',
-        'org.apache.httpcomponents:httpcore:4.4.10:httpcore-4.4.10.jar:78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd',
-        'org.apache.httpcomponents:httpmime:4.5.6:httpmime-4.5.6.jar:0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e',
+        'org.apache.httpcomponents:httpclient:4.5.2:httpclient-4.5.2.jar:0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057',
+        'org.apache.httpcomponents:httpcore:4.4.5:httpcore-4.4.5.jar:64d5453874cab7e40a7065cb01a9a9ca1053845a9786b478878b679e0580cec3',
+        'org.apache.httpcomponents:httpmime:4.5.2:httpmime-4.5.2.jar:231a3f7e4962053db2be8461d5422e68fc458a3a7dd7d8ada803a348e21f8f07',
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
         'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',

bramble-api/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 dependencies {
-	implementation "com.google.dagger:dagger:2.22.1"
+	implementation "com.google.dagger:dagger:2.19"
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
 	testImplementation 'junit:junit:4.12'

bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java

@@ -6,7 +6,6 @@ import org.briarproject.bramble.util.StringUtils;
 import java.util.Arrays;
 import java.util.Comparator;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -39,7 +38,7 @@ public class Bytes implements Comparable<Bytes> {
 	}
 
 	@Override
-	public boolean equals(@Nullable Object o) {
+	public boolean equals(Object o) {
 		return o instanceof Bytes && Arrays.equals(bytes, ((Bytes) o).bytes);
 	}
 

bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java

@@ -1,18 +0,0 @@
-package org.briarproject.bramble.api;
-
-/**
- * Thrown when data being parsed uses a protocol or format version that is not
- * supported.
- */
-public class UnsupportedVersionException extends FormatException {
-
-	private final boolean tooOld;
-
-	public UnsupportedVersionException(boolean tooOld) {
-		this.tooOld = tooOld;
-	}
-
-	public boolean isTooOld() {
-		return tooOld;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfIncomingMessageHook.java

@@ -33,8 +33,7 @@ public abstract class BdfIncomingMessageHook implements IncomingMessageHook {
 	/**
 	 * Called once for each incoming message that passes validation.
 	 *
-	 * @param txn A read-write transaction
-	 * @return Whether or not this message should be shared
+	 * @return whether or not this message should be shared
 	 * @throws DbException Should only be used for real database errors.
 	 * If this is thrown, delivery will be attempted again at next startup,
 	 * whereas if a FormatException is thrown, the message will be permanently

bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java

@@ -1,8 +1,6 @@
 package org.briarproject.bramble.api.client;
 
 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.crypto.PrivateKey;
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.db.DbException;
@@ -98,18 +96,14 @@ public interface ClientHelper {
 
 	BdfList toList(Author a);
 
-	byte[] sign(String label, BdfList toSign, PrivateKey privateKey)
+	byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException;
 
 	void verifySignature(byte[] signature, String label, BdfList signed,
-			PublicKey publicKey)
-			throws FormatException, GeneralSecurityException;
+			byte[] publicKey) throws FormatException, GeneralSecurityException;
 
 	Author parseAndValidateAuthor(BdfList author) throws FormatException;
 
-	PublicKey parseAndValidateAgreementPublicKey(byte[] publicKeyBytes)
-		throws FormatException;
-
 	TransportProperties parseAndValidateTransportProperties(
 			BdfDictionary properties) throws FormatException;
 

bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.api.contact;
 
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -20,13 +19,10 @@ public class Contact {
 	private final AuthorId localAuthorId;
 	@Nullable
 	private final String alias;
-	@Nullable
-	private final PublicKey handshakePublicKey;
-	private final boolean verified;
+	private final boolean verified, active;
 
 	public Contact(ContactId id, Author author, AuthorId localAuthorId,
-			@Nullable String alias, @Nullable PublicKey handshakePublicKey,
-			boolean verified) {
+			@Nullable String alias, boolean verified, boolean active) {
 		if (alias != null) {
 			int aliasLength = toUtf8(alias).length;
 			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
@@ -36,8 +32,8 @@ public class Contact {
 		this.author = author;
 		this.localAuthorId = localAuthorId;
 		this.alias = alias;
-		this.handshakePublicKey = handshakePublicKey;
 		this.verified = verified;
+		this.active = active;
 	}
 
 	public ContactId getId() {
@@ -57,15 +53,14 @@ public class Contact {
 		return alias;
 	}
 
-	@Nullable
-	public PublicKey getHandshakePublicKey() {
-		return handshakePublicKey;
-	}
-
 	public boolean isVerified() {
 		return verified;
 	}
 
+	public boolean isActive() {
+		return active;
+	}
+
 	@Override
 	public int hashCode() {
 		return id.hashCode();

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java

@@ -18,30 +18,30 @@ public interface ContactExchangeTask {
 	byte PROTOCOL_VERSION = 1;
 
 	/**
-	 * Label for deriving Alice's header key from the master key.
+	 * Label for deriving Alice's header key from the master secret.
 	 */
 	String ALICE_KEY_LABEL =
 			"org.briarproject.bramble.contact/ALICE_HEADER_KEY";
 
 	/**
-	 * Label for deriving Bob's header key from the master key.
+	 * Label for deriving Bob's header key from the master secret.
 	 */
 	String BOB_KEY_LABEL = "org.briarproject.bramble.contact/BOB_HEADER_KEY";
 
 	/**
-	 * Label for deriving Alice's key binding nonce from the master key.
+	 * Label for deriving Alice's key binding nonce from the master secret.
 	 */
 	String ALICE_NONCE_LABEL = "org.briarproject.bramble.contact/ALICE_NONCE";
 
 	/**
-	 * Label for deriving Bob's key binding nonce from the master key.
+	 * Label for deriving Bob's key binding nonce from the master secret.
 	 */
 	String BOB_NONCE_LABEL = "org.briarproject.bramble.contact/BOB_NONCE";
 
 	/**
 	 * Exchanges contact information with a remote peer.
 	 */
-	void startExchange(LocalAuthor localAuthor, SecretKey masterKey,
+	void startExchange(LocalAuthor localAuthor, SecretKey masterSecret,
 			DuplexTransportConnection conn, TransportId transportId,
 			boolean alice);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java

@@ -2,7 +2,6 @@ package org.briarproject.bramble.api.contact;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -29,7 +28,7 @@ public class ContactId {
 	}
 
 	@Override
-	public boolean equals(@Nullable Object o) {
+	public boolean equals(Object o) {
 		return o instanceof ContactId && id == ((ContactId) o).id;
 	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java

@@ -1,10 +1,7 @@
 package org.briarproject.bramble.api.contact;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.UnsupportedVersionException;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
@@ -16,6 +13,8 @@ import java.util.Collection;
 
 import javax.annotation.Nullable;
 
+import static org.briarproject.bramble.api.contact.PendingContact.PendingContactState.FAILED;
+
 @NotNullByDefault
 public interface ContactManager {
 
@@ -34,7 +33,7 @@ public interface ContactManager {
 	 * @param alice true if the local party is Alice
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			SecretKey rootKey, long timestamp, boolean alice, boolean verified,
+			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 
 	/**
@@ -42,7 +41,7 @@ public interface ContactManager {
 	 * and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			boolean verified) throws DbException;
+			boolean verified, boolean active) throws DbException;
 
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
@@ -51,39 +50,38 @@ public interface ContactManager {
 	 *
 	 * @param alice true if the local party is Alice
 	 */
-	ContactId addContact(Author remote, AuthorId local, SecretKey rootKey,
+	ContactId addContact(Author remote, AuthorId local, SecretKey master,
 			long timestamp, boolean alice, boolean verified, boolean active)
 			throws DbException;
 
 	/**
-	 * Returns the handshake link that needs to be sent to a contact we want
-	 * to add.
+	 * Returns the static link that needs to be sent to the contact to be added.
 	 */
-	String getHandshakeLink() throws DbException;
+	String getRemoteContactLink();
 
 	/**
-	 * Creates a {@link PendingContact} from the given handshake link and
-	 * alias, adds it to the database and returns it.
-	 *
-	 * @param link The handshake link received from the contact we want to add
-	 * @param alias The alias the user has given this contact
-	 * @return A PendingContact representing the contact to be added
-	 * @throws UnsupportedVersionException If the link uses a format version
-	 * that is not supported
-	 * @throws FormatException If the link is invalid
+	 * Returns true if the given link is syntactically valid.
 	 */
-	PendingContact addPendingContact(String link, String alias)
-			throws DbException, FormatException;
+	boolean isValidRemoteContactLink(String link);
+
+	/**
+	 * Requests a new contact to be added via the given {@code link}.
+	 *
+	 * @param link The link received from the contact we want to add.
+	 * @param alias The alias the user has given this contact.
+	 * @return A PendingContact representing the contact to be added.
+	 */
+	PendingContact addRemoteContactRequest(String link, String alias);
 
 	/**
 	 * Returns a list of {@link PendingContact}s.
 	 */
-	Collection<PendingContact> getPendingContacts() throws DbException;
+	Collection<PendingContact> getPendingContacts();
 
 	/**
-	 * Removes a {@link PendingContact}.
+	 * Removes a {@link PendingContact} that is in state {@link FAILED}.
 	 */
-	void removePendingContact(PendingContactId p) throws DbException;
+	void removePendingContact(PendingContact pendingContact);
 
 	/**
 	 * Returns the contact with the given ID.
@@ -94,7 +92,7 @@ public interface ContactManager {
 	 * Returns the contact with the given remoteAuthorId
 	 * that was added by the LocalAuthor with the given localAuthorId
 	 *
-	 * @throws NoSuchContactException If the contact is not in the database
+	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
@@ -103,7 +101,7 @@ public interface ContactManager {
 	 * Returns the contact with the given remoteAuthorId
 	 * that was added by the LocalAuthor with the given localAuthorId
 	 *
-	 * @throws NoSuchContactException If the contact is not in the database
+	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException;
@@ -111,7 +109,7 @@ public interface ContactManager {
 	/**
 	 * Returns all active contacts.
 	 */
-	Collection<Contact> getContacts() throws DbException;
+	Collection<Contact> getActiveContacts() throws DbException;
 
 	/**
 	 * Removes a contact and all associated state.
@@ -123,6 +121,12 @@ public interface ContactManager {
 	 */
 	void removeContact(Transaction txn, ContactId c) throws DbException;
 
+	/**
+	 * Marks a contact as active or inactive.
+	 */
+	void setContactActive(Transaction txn, ContactId c, boolean active)
+			throws DbException;
+
 	/**
 	 * Sets an alias name for the contact or unsets it if alias is null.
 	 */
@@ -159,20 +163,8 @@ public interface ContactManager {
 
 	interface ContactHook {
 
-		/**
-		 * Called when a contact is being added.
-		 *
-		 * @param txn A read-write transaction
-		 * @param c The contact that is being added
-		 */
 		void addingContact(Transaction txn, Contact c) throws DbException;
 
-		/**
-		 * Called when a contact is being removed
-		 *
-		 * @param txn A read-write transaction
-		 * @param c The contact that is being removed
-		 */
 		void removingContact(Transaction txn, Contact c) throws DbException;
 	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeLinkConstants.java

@@ -1,34 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import java.util.regex.Pattern;
-
-public interface HandshakeLinkConstants {
-
-	/**
-	 * The current version of the handshake link format.
-	 */
-	int FORMAT_VERSION = 0;
-
-	/**
-	 * The length of a base32-encoded handshake link in bytes, excluding the
-	 * 'briar://' prefix.
-	 */
-	int BASE32_LINK_BYTES = 53;
-
-	/**
-	 * The length of a raw handshake link in bytes, before base32 encoding.
-	 */
-	int RAW_LINK_BYTES = 33;
-
-	/**
-	 * Regular expression for matching handshake links, including or excluding
-	 * the 'briar://' prefix.
-	 */
-	Pattern LINK_REGEX =
-			Pattern.compile("(briar://)?([a-z2-7]{" + BASE32_LINK_BYTES + "})");
-
-	/**
-	 * Label for hashing handshake public keys to calculate their identifiers.
-	 */
-	String ID_LABEL = "org.briarproject.bramble/HANDSHAKE_KEY_ID";
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.api.contact;
 
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.Immutable;
@@ -9,29 +8,26 @@ import javax.annotation.concurrent.Immutable;
 @NotNullByDefault
 public class PendingContact {
 
+	public enum PendingContactState {
+		WAITING_FOR_CONNECTION,
+		CONNECTED,
+		ADDING_CONTACT,
+		FAILED
+	}
+
 	private final PendingContactId id;
-	private final PublicKey publicKey;
 	private final String alias;
 	private final PendingContactState state;
 	private final long timestamp;
 
-	public PendingContact(PendingContactId id, PublicKey publicKey,
-			String alias, PendingContactState state, long timestamp) {
+	public PendingContact(PendingContactId id, String alias,
+			PendingContactState state, long timestamp) {
 		this.id = id;
-		this.publicKey = publicKey;
 		this.alias = alias;
 		this.state = state;
 		this.timestamp = timestamp;
 	}
 
-	public PendingContactId getId() {
-		return id;
-	}
-
-	public PublicKey getPublicKey() {
-		return publicKey;
-	}
-
 	public String getAlias() {
 		return alias;
 	}
@@ -54,4 +50,5 @@ public class PendingContact {
 		return o instanceof PendingContact &&
 				id.equals(((PendingContact) o).id);
 	}
+
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java

@@ -1,25 +1,11 @@
 package org.briarproject.bramble.api.contact;
 
 import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-/**
- * Type-safe wrapper for a byte array that uniquely identifies a
- * {@link PendingContact}.
- */
-@ThreadSafe
-@NotNullByDefault
 public class PendingContactId extends UniqueId {
 
 	public PendingContactId(byte[] id) {
 		super(id);
 	}
 
-	@Override
-	public boolean equals(@Nullable Object o) {
-		return o instanceof PendingContactId && super.equals(o);
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java

@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public enum PendingContactState {
-
-	WAITING_FOR_CONNECTION(0),
-	CONNECTED(1),
-	ADDING_CONTACT(2),
-	FAILED(3);
-
-	private final int value;
-
-	PendingContactState(int value) {
-		this.value = value;
-	}
-
-	public int getValue() {
-		return value;
-	}
-
-	public static PendingContactState fromValue(int value) {
-		for (PendingContactState s : values()) if (s.value == value) return s;
-		throw new IllegalArgumentException();
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java

@@ -14,12 +14,18 @@ import javax.annotation.concurrent.Immutable;
 public class ContactAddedEvent extends Event {
 
 	private final ContactId contactId;
+	private final boolean active;
 
-	public ContactAddedEvent(ContactId contactId) {
+	public ContactAddedEvent(ContactId contactId, boolean active) {
 		this.contactId = contactId;
+		this.active = active;
 	}
 
 	public ContactId getContactId() {
 		return contactId;
 	}
+
+	public boolean isActive() {
+		return active;
+	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java

@@ -0,0 +1,31 @@
+package org.briarproject.bramble.api.contact.event;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An event that is broadcast when a contact is marked active or inactive.
+ */
+@Immutable
+@NotNullByDefault
+public class ContactStatusChangedEvent extends Event {
+
+	private final ContactId contactId;
+	private final boolean active;
+
+	public ContactStatusChangedEvent(ContactId contactId, boolean active) {
+		this.contactId = contactId;
+		this.active = active;
+	}
+
+	public ContactId getContactId() {
+		return contactId;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a pending contact is removed.
- */
-@Immutable
-@NotNullByDefault
-public class PendingContactRemovedEvent extends Event {
-
-	private final PendingContactId id;
-
-	public PendingContactRemovedEvent(PendingContactId id) {
-		this.id = id;
-	}
-
-	public PendingContactId getId() {
-		return id;
-	}
-
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java

@@ -1,7 +1,7 @@
 package org.briarproject.bramble.api.contact.event;
 
+import org.briarproject.bramble.api.contact.PendingContact.PendingContactState;
 import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.contact.PendingContactState;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPrivateKey.java

@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.Bytes;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_AGREEMENT;
-
-/**
- * Type-safe wrapper for a private key used for key agreement.
- */
-@Immutable
-@NotNullByDefault
-public class AgreementPrivateKey extends Bytes implements PrivateKey {
-
-	public AgreementPrivateKey(byte[] encoded) {
-		super(encoded);
-	}
-
-	@Override
-	public String getKeyType() {
-		return KEY_TYPE_AGREEMENT;
-	}
-
-	@Override
-	public byte[] getEncoded() {
-		return getBytes();
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPublicKey.java

@@ -1,35 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.Bytes;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_AGREEMENT;
-import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_AGREEMENT_PUBLIC_KEY_BYTES;
-
-/**
- * Type-safe wrapper for a public key used for key agreement.
- */
-@Immutable
-@NotNullByDefault
-public class AgreementPublicKey extends Bytes implements PublicKey {
-
-	public AgreementPublicKey(byte[] encoded) {
-		super(encoded);
-		if (encoded.length == 0 ||
-				encoded.length > MAX_AGREEMENT_PUBLIC_KEY_BYTES) {
-			throw new IllegalArgumentException();
-		}
-	}
-
-	@Override
-	public String getKeyType() {
-		return KEY_TYPE_AGREEMENT;
-	}
-
-	@Override
-	public byte[] getEncoded() {
-		return getBytes();
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java

@@ -55,7 +55,7 @@ public interface CryptoComponent {
 	 * signature, to prevent it from being repurposed or colliding with a
 	 * signature created for another purpose
 	 */
-	byte[] sign(String label, byte[] toSign, PrivateKey privateKey)
+	byte[] sign(String label, byte[] toSign, byte[] privateKey)
 			throws GeneralSecurityException;
 
 	/**
@@ -68,7 +68,7 @@ public interface CryptoComponent {
 	 * @return true if the signature was valid, false otherwise.
 	 */
 	boolean verifySignature(byte[] signature, String label, byte[] signed,
-			PublicKey publicKey) throws GeneralSecurityException;
+			byte[] publicKey) throws GeneralSecurityException;
 
 	/**
 	 * Returns the hash of the given inputs. The inputs are unambiguously

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoConstants.java

@@ -7,21 +7,11 @@ public interface CryptoConstants {
 	 */
 	int MAX_AGREEMENT_PUBLIC_KEY_BYTES = 32;
 
-	/**
-	 * The key type for agreement key pairs.
-	 */
-	String KEY_TYPE_AGREEMENT = "Curve25519";
-
 	/**
 	 * The maximum length of a signature public key in bytes.
 	 */
 	int MAX_SIGNATURE_PUBLIC_KEY_BYTES = 32;
 
-	/**
-	 * The key type for signature key pairs.
-	 */
-	String KEY_TYPE_SIGNATURE = "Ed25519";
-
 	/**
 	 * The maximum length of a signature in bytes.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyAgreementCrypto.java

@@ -2,7 +2,7 @@ package org.briarproject.bramble.api.crypto;
 
 /**
  * Crypto operations for the key agreement protocol - see
- * https://code.briarproject.org/briar/briar-spec/blob/master/protocols/BQP.md
+ * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BQP.md
  */
 public interface KeyAgreementCrypto {
 

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java

@@ -15,8 +15,6 @@ public class KeyPair {
 	private final PrivateKey privateKey;
 
 	public KeyPair(PublicKey publicKey, PrivateKey privateKey) {
-		if (!publicKey.getKeyType().equals(privateKey.getKeyType()))
-			throw new IllegalArgumentException();
 		this.publicKey = publicKey;
 		this.privateKey = privateKey;
 	}

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java

@@ -8,11 +8,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 @NotNullByDefault
 public interface PrivateKey {
 
-	/**
-	 * Returns the type of this key pair.
-	 */
-	String getKeyType();
-
 	/**
 	 * Returns the encoded representation of this key.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java

@@ -8,11 +8,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 @NotNullByDefault
 public interface PublicKey {
 
-	/**
-	 * Returns the type of this key pair.
-	 */
-	String getKeyType();
-
 	/**
 	 * Returns the encoded representation of this key.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePrivateKey.java

@@ -1,30 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.Bytes;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
-
-/**
- * Type-safe wrapper for a public key used for signing.
- */
-@Immutable
-@NotNullByDefault
-public class SignaturePrivateKey extends Bytes implements PrivateKey {
-
-	public SignaturePrivateKey(byte[] bytes) {
-		super(bytes);
-	}
-
-	@Override
-	public String getKeyType() {
-		return KEY_TYPE_SIGNATURE;
-	}
-
-	@Override
-	public byte[] getEncoded() {
-		return getBytes();
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePublicKey.java

@@ -1,35 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.Bytes;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
-import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_PUBLIC_KEY_BYTES;
-
-/**
- * Type-safe wrapper for a public key used for verifying signatures.
- */
-@Immutable
-@NotNullByDefault
-public class SignaturePublicKey extends Bytes implements PublicKey {
-
-	public SignaturePublicKey(byte[] encoded) {
-		super(encoded);
-		if (encoded.length == 0 ||
-				encoded.length > MAX_SIGNATURE_PUBLIC_KEY_BYTES) {
-			throw new IllegalArgumentException();
-		}
-	}
-
-	@Override
-	public String getKeyType() {
-		return KEY_TYPE_SIGNATURE;
-	}
-
-	@Override
-	public byte[] getEncoded() {
-		return getBytes();
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/TransportCrypto.java

@@ -5,34 +5,25 @@ import org.briarproject.bramble.api.transport.TransportKeys;
 
 /**
  * Crypto operations for the transport security protocol - see
- * https://code.briarproject.org/briar/briar-spec/blob/master/protocols/BTP.md
+ * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BTP.md
  */
 public interface TransportCrypto {
 
 	/**
-	 * Derives initial rotation mode transport keys for the given transport in
-	 * the given time period from the given root key.
+	 * Derives initial transport keys for the given transport in the given
+	 * rotation period from the given master secret.
 	 *
-	 * @param alice Whether the keys are for use by Alice or Bob
-	 * @param active Whether the keys are usable for outgoing streams
+	 * @param alice whether the keys are for use by Alice or Bob.
+	 * @param active whether the keys are usable for outgoing streams.
 	 */
-	TransportKeys deriveRotationKeys(TransportId t, SecretKey rootKey,
-			long timePeriod, boolean alice, boolean active);
+	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
+			long rotationPeriod, boolean alice, boolean active);
 
 	/**
-	 * Derives handshake keys for the given transport in the given time period
-	 * from the given root key.
-	 *
-	 * @param alice Whether the keys are for use by Alice or Bob
+	 * Rotates the given transport keys to the given rotation period. If the
+	 * keys are for the given period or any later period they are not rotated.
 	 */
-	TransportKeys deriveHandshakeKeys(TransportId t, SecretKey rootKey,
-			long timePeriod, boolean alice);
-
-	/**
-	 * Updates the given transport keys to the given time period. If the keys
-	 * are for the given period or any later period they are not updated.
-	 */
-	TransportKeys updateTransportKeys(TransportKeys k, long timePeriod);
+	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
 
 	/**
 	 * Encodes the pseudo-random tag that is used to recognise a stream.

bramble-api/src/main/java/org/briarproject/bramble/api/db/CommitAction.java

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.event.EventExecutor;
-
-/**
- * An action that's taken when a {@link Transaction} is committed.
- */
-public interface CommitAction {
-
-	void accept(Visitor visitor);
-
-	interface Visitor {
-
-		@EventExecutor
-		void visit(EventAction a);
-
-		@EventExecutor
-		void visit(TaskAction a);
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java

@@ -2,14 +2,10 @@ package org.briarproject.bramble.api.db;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.PendingContact;
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.crypto.PrivateKey;
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.Identity;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.settings.Settings;
@@ -24,8 +20,8 @@ import org.briarproject.bramble.api.sync.MessageStatus;
 import org.briarproject.bramble.api.sync.Offer;
 import org.briarproject.bramble.api.sync.Request;
 import org.briarproject.bramble.api.sync.validation.MessageState;
+import org.briarproject.bramble.api.transport.KeySet;
 import org.briarproject.bramble.api.transport.KeySetId;
-import org.briarproject.bramble.api.transport.TransportKeySet;
 import org.briarproject.bramble.api.transport.TransportKeys;
 
 import java.util.Collection;
@@ -105,7 +101,7 @@ public interface DatabaseComponent {
 	 * and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			boolean verified) throws DbException;
+			boolean verified, boolean active) throws DbException;
 
 	/**
 	 * Stores a group.
@@ -113,9 +109,9 @@ public interface DatabaseComponent {
 	void addGroup(Transaction txn, Group g) throws DbException;
 
 	/**
-	 * Stores an identity.
+	 * Stores a local pseudonym.
 	 */
-	void addIdentity(Transaction txn, Identity i) throws DbException;
+	void addLocalAuthor(Transaction txn, LocalAuthor a) throws DbException;
 
 	/**
 	 * Stores a local message.
@@ -123,12 +119,6 @@ public interface DatabaseComponent {
 	void addLocalMessage(Transaction txn, Message m, Metadata meta,
 			boolean shared) throws DbException;
 
-	/**
-	 * Stores a pending contact.
-	 */
-	void addPendingContact(Transaction txn, PendingContact p)
-			throws DbException;
-
 	/**
 	 * Stores a transport.
 	 */
@@ -139,46 +129,25 @@ public interface DatabaseComponent {
 	 * Stores the given transport keys for the given contact and returns a
 	 * key set ID.
 	 */
-	KeySetId addTransportKeys(Transaction txn, ContactId c, TransportKeys k)
-			throws DbException;
-
-	/**
-	 * Stores the given transport keys for the given pending contact and
-	 * returns a key set ID.
-	 */
-	KeySetId addTransportKeys(Transaction txn, PendingContactId p,
+	KeySetId addTransportKeys(Transaction txn, ContactId c,
 			TransportKeys k) throws DbException;
 
 	/**
 	 * Returns true if the database contains the given contact for the given
 	 * local pseudonym.
-	 * <p/>
-	 * Read-only.
 	 */
 	boolean containsContact(Transaction txn, AuthorId remote, AuthorId local)
 			throws DbException;
 
 	/**
 	 * Returns true if the database contains the given group.
-	 * <p/>
-	 * Read-only.
 	 */
 	boolean containsGroup(Transaction txn, GroupId g) throws DbException;
 
 	/**
-	 * Returns true if the database contains an identity for the given
-	 * pseudonym.
-	 * <p/>
-	 * Read-only.
+	 * Returns true if the database contains the given local author.
 	 */
-	boolean containsIdentity(Transaction txn, AuthorId a) throws DbException;
-
-	/**
-	 * Returns true if the database contains the given pending contact.
-	 * <p/>
-	 * Read-only.
-	 */
-	boolean containsPendingContact(Transaction txn, PendingContactId p)
+	boolean containsLocalAuthor(Transaction txn, AuthorId local)
 			throws DbException;
 
 	/**
@@ -266,7 +235,7 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<ContactId> getContacts(Transaction txn, AuthorId local)
+	Collection<ContactId> getContacts(Transaction txn, AuthorId a)
 			throws DbException;
 
 	/**
@@ -301,18 +270,18 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns the identity for the local pseudonym with the given ID.
+	 * Returns the local pseudonym with the given ID.
 	 * <p/>
 	 * Read-only.
 	 */
-	Identity getIdentity(Transaction txn, AuthorId a) throws DbException;
+	LocalAuthor getLocalAuthor(Transaction txn, AuthorId a) throws DbException;
 
 	/**
-	 * Returns the identities for all local pseudonyms.
+	 * Returns all local pseudonyms.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<Identity> getIdentities(Transaction txn) throws DbException;
+	Collection<LocalAuthor> getLocalAuthors(Transaction txn) throws DbException;
 
 	/**
 	 * Returns the message with the given ID.
@@ -448,14 +417,6 @@ public interface DatabaseComponent {
 	 */
 	long getNextSendTime(Transaction txn, ContactId c) throws DbException;
 
-	/**
-	 * Returns all pending contacts.
-	 * <p/>
-	 * Read-only.
-	 */
-	Collection<PendingContact> getPendingContacts(Transaction txn)
-			throws DbException;
-
 	/**
 	 * Returns all settings in the given namespace.
 	 * <p/>
@@ -468,7 +429,7 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<TransportKeySet> getTransportKeys(Transaction txn, TransportId t)
+	Collection<KeySet> getTransportKeys(Transaction txn, TransportId t)
 			throws DbException;
 
 	/**
@@ -531,21 +492,15 @@ public interface DatabaseComponent {
 	void removeGroup(Transaction txn, Group g) throws DbException;
 
 	/**
-	 * Removes an identity (and all associated state) from the database.
+	 * Removes a local pseudonym (and all associated state) from the database.
 	 */
-	void removeIdentity(Transaction txn, AuthorId a) throws DbException;
+	void removeLocalAuthor(Transaction txn, AuthorId a) throws DbException;
 
 	/**
 	 * Removes a message (and all associated state) from the database.
 	 */
 	void removeMessage(Transaction txn, MessageId m) throws DbException;
 
-	/**
-	 * Removes a pending contact (and all associated state) from the database.
-	 */
-	void removePendingContact(Transaction txn, PendingContactId p)
-			throws DbException;
-
 	/**
 	 * Removes a transport (and all associated state) from the database.
 	 */
@@ -562,6 +517,12 @@ public interface DatabaseComponent {
 	 */
 	void setContactVerified(Transaction txn, ContactId c) throws DbException;
 
+	/**
+	 * Marks the given contact as active or inactive.
+	 */
+	void setContactActive(Transaction txn, ContactId c, boolean active)
+			throws DbException;
+
 	/**
 	 * Sets an alias name for the contact or unsets it if alias is null.
 	 */
@@ -592,17 +553,11 @@ public interface DatabaseComponent {
 			Collection<MessageId> dependencies) throws DbException;
 
 	/**
-	 * Sets the handshake key pair for the identity with the given ID.
-	 */
-	void setHandshakeKeyPair(Transaction txn, AuthorId local,
-			PublicKey publicKey, PrivateKey privateKey) throws DbException;
-
-	/**
-	 * Sets the reordering window for the given transport keys in the given
-	 * time period.
+	 * Sets the reordering window for the given key set and transport in the
+	 * given rotation period.
 	 */
 	void setReorderingWindow(Transaction txn, KeySetId k, TransportId t,
-			long timePeriod, long base, byte[] bitmap) throws DbException;
+			long rotationPeriod, long base, byte[] bitmap) throws DbException;
 
 	/**
 	 * Marks the given transport keys as usable for outgoing streams.
@@ -613,6 +568,6 @@ public interface DatabaseComponent {
 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.
 	 */
-	void updateTransportKeys(Transaction txn, Collection<TransportKeySet> keys)
+	void updateTransportKeys(Transaction txn, Collection<KeySet> keys)
 			throws DbException;
 }

bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java

@@ -10,4 +10,6 @@ public interface DatabaseConfig {
 	File getDatabaseDirectory();
 
 	File getDatabaseKeyDirectory();
+
+	long getMaxSize();
 }

bramble-api/src/main/java/org/briarproject/bramble/api/db/EventAction.java

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * A {@link CommitAction} that broadcasts an event.
- */
-public class EventAction implements CommitAction {
-
-	private final Event event;
-
-	EventAction(Event event) {
-		this.event = event;
-	}
-
-	public Event getEvent() {
-		return event;
-	}
-
-	@Override
-	public void accept(Visitor visitor) {
-		visitor.visit(this);
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java

@@ -1,9 +1,9 @@
 package org.briarproject.bramble.api.db;
 
 /**
- * Thrown when a database operation is attempted for an identity that is not in
+ * Thrown when a database operation is attempted for a pseudonym that is not in
  * the database. This exception may occur due to concurrent updates and does
  * not indicate a database error.
  */
-public class NoSuchIdentityException extends DbException {
+public class NoSuchLocalAuthorException extends DbException {
 }

bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchPendingContactException.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-/**
- * Thrown when a database operation is attempted for a pending contact that is
- * not in the database. This exception may occur due to concurrent updates and
- * does not indicate a database error.
- */
-public class NoSuchPendingContactException extends DbException {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/db/PendingContactExistsException.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-/**
- * Thrown when a duplicate pending contact is added to the database. This
- * exception may occur due to concurrent updates and does not indicate a
- * database error.
- */
-public class PendingContactExistsException extends DbException {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/db/TaskAction.java

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.event.EventExecutor;
-
-/**
- * A {@link CommitAction} that submits a task to the {@link EventExecutor}.
- */
-public class TaskAction implements CommitAction {
-
-	private final Runnable task;
-
-	TaskAction(Runnable task) {
-		this.task = task;
-	}
-
-	public Runnable getTask() {
-		return task;
-	}
-
-	@Override
-	public void accept(Visitor visitor) {
-		visitor.visit(this);
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/db/Transaction.java

@@ -1,15 +1,13 @@
 package org.briarproject.bramble.api.db;
 
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventExecutor;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
-import static java.util.Collections.emptyList;
-
 /**
  * A wrapper around a database transaction. Transactions are not thread-safe.
  */
@@ -19,7 +17,7 @@ public class Transaction {
 	private final Object txn;
 	private final boolean readOnly;
 
-	private List<CommitAction> actions = null;
+	private List<Event> events = null;
 	private boolean committed = false;
 
 	public Transaction(Object txn, boolean readOnly) {
@@ -44,27 +42,19 @@ public class Transaction {
 
 	/**
 	 * Attaches an event to be broadcast when the transaction has been
-	 * committed. The event will be broadcast on the {@link EventExecutor}.
+	 * committed.
 	 */
 	public void attach(Event e) {
-		if (actions == null) actions = new ArrayList<>();
-		actions.add(new EventAction(e));
+		if (events == null) events = new ArrayList<>();
+		events.add(e);
 	}
 
 	/**
-	 * Attaches a task to be executed when the transaction has been
-	 * committed. The task will be run on the {@link EventExecutor}.
+	 * Returns any events attached to the transaction.
 	 */
-	public void attach(Runnable r) {
-		if (actions == null) actions = new ArrayList<>();
-		actions.add(new TaskAction(r));
-	}
-
-	/**
-	 * Returns any actions attached to the transaction.
-	 */
-	public List<CommitAction> getActions() {
-		return actions == null ? emptyList() : actions;
+	public List<Event> getEvents() {
+		if (events == null) return Collections.emptyList();
+		return events;
 	}
 
 	/**

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java

@@ -16,8 +16,7 @@ public interface EventBus {
 	void removeListener(EventListener l);
 
 	/**
-	 * Asynchronously notifies all listeners of an event. Listeners are
-	 * notified on the {@link EventExecutor}.
+	 * Notifies all listeners of an event.
 	 */
 	void broadcast(Event e);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventExecutor.java

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Annotation for injecting the executor for broadcasting events and running
- * tasks that need to run in a defined order with respect to events. Also used
- * for annotating methods that should run on the event executor.
- * <p>
- * The contract of this executor is that tasks are run in the order they're
- * submitted, tasks are not run concurrently, and submitting a task will never
- * block. Tasks must not block. Tasks submitted during shutdown are discarded.
- */
-@Qualifier
-@Target({FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-public @interface EventExecutor {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java

@@ -12,6 +12,5 @@ public interface EventListener {
 	 * Called when an event is broadcast. Implementations of this method must
 	 * not block.
 	 */
-	@EventExecutor
 	void eventOccurred(Event e);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java

@@ -1,14 +1,13 @@
 package org.briarproject.bramble.api.identity;
 
 import org.briarproject.bramble.api.Nameable;
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.util.StringUtils;
 
 import javax.annotation.concurrent.Immutable;
 
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.util.StringUtils.toUtf8;
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 
 /**
  * A pseudonym for a user.
@@ -25,14 +24,14 @@ public class Author implements Nameable {
 	private final AuthorId id;
 	private final int formatVersion;
 	private final String name;
-	private final PublicKey publicKey;
+	private final byte[] publicKey;
 
 	public Author(AuthorId id, int formatVersion, String name,
-			PublicKey publicKey) {
-		int nameLength = toUtf8(name).length;
+			byte[] publicKey) {
+		int nameLength = StringUtils.toUtf8(name).length;
 		if (nameLength == 0 || nameLength > MAX_AUTHOR_NAME_LENGTH)
 			throw new IllegalArgumentException();
-		if (!publicKey.getKeyType().equals(KEY_TYPE_SIGNATURE))
+		if (publicKey.length == 0 || publicKey.length > MAX_PUBLIC_KEY_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 		this.formatVersion = formatVersion;
@@ -64,7 +63,7 @@ public class Author implements Nameable {
 	/**
 	 * Returns the public key used to verify the pseudonym's signatures.
 	 */
-	public PublicKey getPublicKey() {
+	public byte[] getPublicKey() {
 		return publicKey;
 	}
 

bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorFactory.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.api.identity;
 
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
@@ -10,16 +9,23 @@ public interface AuthorFactory {
 	 * Creates an author with the current format version and the given name and
 	 * public key.
 	 */
-	Author createAuthor(String name, PublicKey publicKey);
+	Author createAuthor(String name, byte[] publicKey);
 
 	/**
 	 * Creates an author with the given format version, name and public key.
 	 */
-	Author createAuthor(int formatVersion, String name, PublicKey publicKey);
+	Author createAuthor(int formatVersion, String name, byte[] publicKey);
 
 	/**
 	 * Creates a local author with the current format version and the given
-	 * name.
+	 * name and keys.
 	 */
-	LocalAuthor createLocalAuthor(String name);
+	LocalAuthor createLocalAuthor(String name, byte[] publicKey,
+			byte[] privateKey);
+
+	/**
+	 * Creates a local author with the given format version, name and keys.
+	 */
+	LocalAuthor createLocalAuthor(int formatVersion, String name,
+			byte[] publicKey, byte[] privateKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/identity/Identity.java

@@ -1,88 +0,0 @@
-package org.briarproject.bramble.api.identity;
-
-import org.briarproject.bramble.api.crypto.PrivateKey;
-import org.briarproject.bramble.api.crypto.PublicKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_AGREEMENT;
-
-@Immutable
-@NotNullByDefault
-public class Identity {
-
-	private final LocalAuthor localAuthor;
-	@Nullable
-	private final PublicKey handshakePublicKey;
-	@Nullable
-	private final PrivateKey handshakePrivateKey;
-	private final long created;
-
-	public Identity(LocalAuthor localAuthor,
-			@Nullable PublicKey handshakePublicKey,
-			@Nullable PrivateKey handshakePrivateKey, long created) {
-		if (handshakePublicKey != null) {
-			if (handshakePrivateKey == null)
-				throw new IllegalArgumentException();
-			if (!handshakePublicKey.getKeyType().equals(KEY_TYPE_AGREEMENT))
-				throw new IllegalArgumentException();
-		}
-		if (handshakePrivateKey != null) {
-			if (handshakePublicKey == null)
-				throw new IllegalArgumentException();
-			if (!handshakePrivateKey.getKeyType().equals(KEY_TYPE_AGREEMENT))
-				throw new IllegalArgumentException();
-		}
-		this.localAuthor = localAuthor;
-		this.handshakePublicKey = handshakePublicKey;
-		this.handshakePrivateKey = handshakePrivateKey;
-		this.created = created;
-	}
-
-	/**
-	 * Returns the ID of the user's pseudonym.
-	 */
-	public AuthorId getId() {
-		return localAuthor.getId();
-	}
-
-	/**
-	 * Returns the user's pseudonym.
-	 */
-	public LocalAuthor getLocalAuthor() {
-		return localAuthor;
-	}
-
-	/**
-	 * Returns true if the identity has a handshake key pair.
-	 */
-	public boolean hasHandshakeKeyPair() {
-		return handshakePublicKey != null && handshakePrivateKey != null;
-	}
-
-	/**
-	 * Returns the public key used for handshaking, or null if no key exists.
-	 */
-	@Nullable
-	public PublicKey getHandshakePublicKey() {
-		return handshakePublicKey;
-	}
-
-	/**
-	 * Returns the private key used for handshaking, or null if no key exists.
-	 */
-	@Nullable
-	public PrivateKey getHandshakePrivateKey() {
-		return handshakePrivateKey;
-	}
-
-	/**
-	 * Returns the time the identity was created, in milliseconds since the
-	 * Unix epoch.
-	 */
-	public long getTimeCreated() {
-		return created;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java

@@ -1,30 +1,30 @@
 package org.briarproject.bramble.api.identity;
 
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.crypto.KeyPair;
-import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
 public interface IdentityManager {
 
 	/**
-	 * Creates an identity with the given name. The identity includes a
-	 * handshake key pair.
+	 * Creates a local identity with the given name.
 	 */
 	@CryptoExecutor
-	Identity createIdentity(String name);
+	LocalAuthor createLocalAuthor(String name);
 
 	/**
-	 * Registers the given identity with the manager. This method should be
-	 * called before {@link LifecycleManager#startServices(SecretKey)}. The
-	 * identity is stored when {@link LifecycleManager#startServices(SecretKey)}
-	 * is called. The identity must include a handshake key pair.
+	 * Registers the given local identity with the manager. The identity is
+	 * not stored until {@link #storeLocalAuthor()} is called.
 	 */
-	void registerIdentity(Identity i);
+	void registerLocalAuthor(LocalAuthor a);
+
+	/**
+	 * Stores the local identity registered with
+	 * {@link #registerLocalAuthor(LocalAuthor)}, if any.
+	 */
+	void storeLocalAuthor() throws DbException;
 
 	/**
 	 * Returns the cached local identity or loads it from the database.
@@ -33,15 +33,7 @@ public interface IdentityManager {
 
 	/**
 	 * Returns the cached local identity or loads it from the database.
-	 * <p/>
-	 * Read-only.
 	 */
 	LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
 
-	/**
-	 * Returns the cached handshake keys or loads them from the database.
-	 * <p/>
-	 * Read-only.
-	 */
-	KeyPair getHandshakeKeys(Transaction txn) throws DbException;
 }

bramble-api/src/main/java/org/briarproject/bramble/api/identity/LocalAuthor.java

@@ -1,13 +1,9 @@
 package org.briarproject.bramble.api.identity;
 
-import org.briarproject.bramble.api.crypto.PrivateKey;
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.Immutable;
 
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
-
 /**
  * A pseudonym for the local user.
  */
@@ -15,20 +11,28 @@ import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNA
 @NotNullByDefault
 public class LocalAuthor extends Author {
 
-	private final PrivateKey privateKey;
+	private final byte[] privateKey;
+	private final long created;
 
 	public LocalAuthor(AuthorId id, int formatVersion, String name,
-			PublicKey publicKey, PrivateKey privateKey) {
+			byte[] publicKey, byte[] privateKey, long created) {
 		super(id, formatVersion, name, publicKey);
-		if (!privateKey.getKeyType().equals(KEY_TYPE_SIGNATURE))
-			throw new IllegalArgumentException();
 		this.privateKey = privateKey;
+		this.created = created;
 	}
 
 	/**
 	 * Returns the private key used to generate the pseudonym's signatures.
 	 */
-	public PrivateKey getPrivateKey() {
+	public byte[] getPrivateKey() {
 		return privateKey;
 	}
+
+	/**
+	 * Returns the time the pseudonym was created, in milliseconds since the
+	 * Unix epoch.
+	 */
+	public long getTimeCreated() {
+		return created;
+	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java

@@ -7,15 +7,15 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 
 /**
- * An event that is broadcast when an identity is added.
+ * An event that is broadcast when a local pseudonym is added.
  */
 @Immutable
 @NotNullByDefault
-public class IdentityAddedEvent extends Event {
+public class LocalAuthorAddedEvent extends Event {
 
 	private final AuthorId authorId;
 
-	public IdentityAddedEvent(AuthorId authorId) {
+	public LocalAuthorAddedEvent(AuthorId authorId) {
 		this.authorId = authorId;
 	}
 

bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java

@@ -7,15 +7,15 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 
 /**
- * An event that is broadcast when an identity is removed.
+ * An event that is broadcast when a local pseudonym is removed.
  */
 @Immutable
 @NotNullByDefault
-public class IdentityRemovedEvent extends Event {
+public class LocalAuthorRemovedEvent extends Event {
 
 	private final AuthorId authorId;
 
-	public IdentityRemovedEvent(AuthorId authorId) {
+	public LocalAuthorRemovedEvent(AuthorId authorId) {
 		this.authorId = authorId;
 	}
 

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java

@@ -40,8 +40,8 @@ public interface KeyAgreementConstants {
 			"org.briarproject.bramble.keyagreement/SHARED_SECRET";
 
 	/**
-	 * Label for deriving the master key.
+	 * Label for deriving the master secret.
 	 */
-	String MASTER_KEY_LABEL =
+	String MASTER_SECRET_LABEL =
 			"org.briarproject.bramble.keyagreement/MASTER_SECRET";
 }

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/UnsupportedVersionException.java

@@ -0,0 +1,20 @@
+package org.briarproject.bramble.api.keyagreement;
+
+import java.io.IOException;
+
+/**
+ * Thrown when a QR code that has been scanned uses a protocol version that is
+ * not supported.
+ */
+public class UnsupportedVersionException extends IOException {
+
+	private final boolean tooOld;
+
+	public UnsupportedVersionException(boolean tooOld) {
+		this.tooOld = tooOld;
+	}
+
+	public boolean isTooOld() {
+		return tooOld;
+	}
+}

bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java

@@ -2,16 +2,16 @@ package org.briarproject.bramble.api.lifecycle;
 
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.Client;
 
 import java.util.concurrent.ExecutorService;
 
 /**
- * Manages the lifecycle of the app: opening and closing the
- * {@link DatabaseComponent} starting and stopping {@link Service Services},
- * and shutting down {@link ExecutorService ExecutorServices}.
+ * Manages the lifecycle of the app, starting {@link Client Clients}, starting
+ * and stopping {@link Service Services}, shutting down
+ * {@link ExecutorService ExecutorServices}, and opening and closing the
+ * {@link DatabaseComponent}.
  */
 @NotNullByDefault
 public interface LifecycleManager {
@@ -42,19 +42,18 @@ public interface LifecycleManager {
 		}
 	}
 
-	/**
-	 * Registers a hook to be called after the database is opened and before
-	 * {@link Service services} are started. This method should be called
-	 * before {@link #startServices(SecretKey)}.
-	 */
-	void registerOpenDatabaseHook(OpenDatabaseHook hook);
-
 	/**
 	 * Registers a {@link Service} to be started and stopped. This method
 	 * should be called before {@link #startServices(SecretKey)}.
 	 */
 	void registerService(Service s);
 
+	/**
+	 * Registers a {@link Client} to be started. This method should be called
+	 * before {@link #startServices(SecretKey)}.
+	 */
+	void registerClient(Client c);
+
 	/**
 	 * Registers an {@link ExecutorService} to be shut down. This method
 	 * should be called before {@link #startServices(SecretKey)}.
@@ -63,7 +62,7 @@ public interface LifecycleManager {
 
 	/**
 	 * Opens the {@link DatabaseComponent} using the given key and starts any
-	 * registered {@link Service Services}.
+	 * registered {@link Client Clients} and {@link Service Services}.
 	 */
 	StartResult startServices(SecretKey dbKey);
 
@@ -81,7 +80,8 @@ public interface LifecycleManager {
 
 	/**
 	 * Waits for the {@link DatabaseComponent} to be opened and all registered
-	 * {@link Service Services} to start before returning.
+	 * {@link Client Clients} and {@link Service Services} to start before
+	 * returning.
 	 */
 	void waitForStartup() throws InterruptedException;
 
@@ -97,13 +97,4 @@ public interface LifecycleManager {
 	 */
 	LifecycleState getLifecycleState();
 
-	interface OpenDatabaseHook {
-		/**
-		 * Called when the database is being opened, before
-		 * {@link #waitForDatabase()} returns.
-		 *
-		 * @param txn A read-write transaction
-		 */
-		void onDatabaseOpened(Transaction txn) throws DbException;
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NullSafety.java

@@ -6,20 +6,10 @@ import javax.annotation.Nullable;
 public class NullSafety {
 
 	/**
-	 * Stand-in for {@code Objects.requireNonNull()}.
+	 * Stand-in for `Objects.requireNonNull()`.
 	 */
 	public static <T> T requireNonNull(@Nullable T t) {
 		if (t == null) throw new NullPointerException();
 		return t;
 	}
-
-	/**
-	 * Checks that exactly one of the arguments is null.
-	 *
-	 * @throws AssertionError If both or neither of the arguments are null
-	 */
-	public static void requireExactlyOneNull(@Nullable Object a,
-			@Nullable Object b) {
-		if ((a == null) == (b == null)) throw new AssertionError();
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/sync/Client.java

@@ -0,0 +1,14 @@
+package org.briarproject.bramble.api.sync;
+
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.Transaction;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+public interface Client {
+
+	/**
+	 * Called at startup to create any local state needed by the client.
+	 */
+	void createLocalState(Transaction txn) throws DbException;
+}

bramble-api/src/main/java/org/briarproject/bramble/api/sync/validation/IncomingMessageHook.java

@@ -11,8 +11,7 @@ public interface IncomingMessageHook {
 	/**
 	 * Called once for each incoming message that passes validation.
 	 *
-	 * @param txn A read-write transaction
-	 * @return Whether or not this message should be shared
+	 * @return whether or not this message should be shared
 	 * @throws DbException Should only be used for real database errors.
 	 * If this is thrown, delivery will be attempted again at next startup,
 	 * whereas if an InvalidMessageException is thrown,

bramble-api/src/main/java/org/briarproject/bramble/api/transport/IncomingKeys.java

@@ -1,35 +1,30 @@
 package org.briarproject.bramble.api.transport;
 
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
 
 import static org.briarproject.bramble.api.transport.TransportConstants.REORDERING_WINDOW_SIZE;
 
 /**
- * Contains transport keys for receiving streams from a given contact or
- * pending contact over a given transport in a given time period.
+ * Contains transport keys for receiving streams from a given contact over a
+ * given transport in a given rotation period.
  */
-@Immutable
-@NotNullByDefault
 public class IncomingKeys {
 
 	private final SecretKey tagKey, headerKey;
-	private final long timePeriod, windowBase;
+	private final long rotationPeriod, windowBase;
 	private final byte[] windowBitmap;
 
 	public IncomingKeys(SecretKey tagKey, SecretKey headerKey,
-			long timePeriod) {
-		this(tagKey, headerKey, timePeriod, 0,
+			long rotationPeriod) {
+		this(tagKey, headerKey, rotationPeriod, 0,
 				new byte[REORDERING_WINDOW_SIZE / 8]);
 	}
 
 	public IncomingKeys(SecretKey tagKey, SecretKey headerKey,
-			long timePeriod, long windowBase, byte[] windowBitmap) {
+			long rotationPeriod, long windowBase, byte[] windowBitmap) {
 		this.tagKey = tagKey;
 		this.headerKey = headerKey;
-		this.timePeriod = timePeriod;
+		this.rotationPeriod = rotationPeriod;
 		this.windowBase = windowBase;
 		this.windowBitmap = windowBitmap;
 	}
@@ -42,8 +37,8 @@ public class IncomingKeys {
 		return headerKey;
 	}
 
-	public long getTimePeriod() {
-		return timePeriod;
+	public long getRotationPeriod() {
+		return rotationPeriod;
 	}
 
 	public long getWindowBase() {

bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeyManager.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.api.transport;
 
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
@@ -19,45 +18,17 @@ public interface KeyManager {
 
 	/**
 	 * Informs the key manager that a new contact has been added. Derives and
-	 * stores a set of rotation mode transport keys for communicating with the
-	 * contact over each transport and returns the key set IDs.
+	 * stores a set of transport keys for communicating with the contact over
+	 * each transport and returns the key set IDs.
 	 * <p/>
 	 * {@link StreamContext StreamContexts} for the contact can be created
 	 * after this method has returned.
 	 *
-	 * @param alice True if the local party is Alice
-	 * @param active Whether the derived keys can be used for outgoing streams
+	 * @param alice true if the local party is Alice
+	 * @param active whether the derived keys can be used for outgoing streams
 	 */
-	Map<TransportId, KeySetId> addContactWithRotationKeys(Transaction txn,
-			ContactId c, SecretKey rootKey, long timestamp, boolean alice,
-			boolean active) throws DbException;
-
-	/**
-	 * Informs the key manager that a new contact has been added. Derives and
-	 * stores a set of handshake mode transport keys for communicating with the
-	 * contact over each transport and returns the key set IDs.
-	 * <p/>
-	 * {@link StreamContext StreamContexts} for the contact can be created
-	 * after this method has returned.
-	 *
-	 * @param alice True if the local party is Alice
-	 */
-	Map<TransportId, KeySetId> addContactWithHandshakeKeys(Transaction txn,
-			ContactId c, SecretKey rootKey, boolean alice) throws DbException;
-
-	/**
-	 * Informs the key manager that a new pending contact has been added.
-	 * Derives and stores a set of handshake mode transport keys for
-	 * communicating with the pending contact over each transport and returns
-	 * the key set IDs.
-	 * <p/>
-	 * {@link StreamContext StreamContexts} for the pending contact can be
-	 * created after this method has returned.
-	 *
-	 * @param alice True if the local party is Alice
-	 */
-	Map<TransportId, KeySetId> addPendingContact(Transaction txn,
-			PendingContactId p, SecretKey rootKey, boolean alice)
+	Map<TransportId, KeySetId> addContact(Transaction txn, ContactId c,
+			SecretKey master, long timestamp, boolean alice, boolean active)
 			throws DbException;
 
 	/**
@@ -72,28 +43,15 @@ public interface KeyManager {
 	 */
 	boolean canSendOutgoingStreams(ContactId c, TransportId t);
 
-	/**
-	 * Returns true if we have keys that can be used for outgoing streams to
-	 * the given pending contact over the given transport.
-	 */
-	boolean canSendOutgoingStreams(PendingContactId p, TransportId t);
-
 	/**
 	 * Returns a {@link StreamContext} for sending a stream to the given
-	 * contact over the given transport, or null if an error occurs.
+	 * contact over the given transport, or null if an error occurs or the
+	 * contact does not support the transport.
 	 */
 	@Nullable
 	StreamContext getStreamContext(ContactId c, TransportId t)
 			throws DbException;
 
-	/**
-	 * Returns a {@link StreamContext} for sending a stream to the given
-	 * pending contact over the given transport, or null if an error occurs.
-	 */
-	@Nullable
-	StreamContext getStreamContext(PendingContactId p, TransportId t)
-			throws DbException;
-
 	/**
 	 * Looks up the given tag and returns a {@link StreamContext} for reading
 	 * from the corresponding stream, or null if an error occurs or the tag was

bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySet.java

@@ -0,0 +1,47 @@
+package org.briarproject.bramble.api.transport;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * A set of transport keys for communicating with a contact.
+ */
+@Immutable
+@NotNullByDefault
+public class KeySet {
+
+	private final KeySetId keySetId;
+	private final ContactId contactId;
+	private final TransportKeys transportKeys;
+
+	public KeySet(KeySetId keySetId, ContactId contactId,
+			TransportKeys transportKeys) {
+		this.keySetId = keySetId;
+		this.contactId = contactId;
+		this.transportKeys = transportKeys;
+	}
+
+	public KeySetId getKeySetId() {
+		return keySetId;
+	}
+
+	public ContactId getContactId() {
+		return contactId;
+	}
+
+	public TransportKeys getTransportKeys() {
+		return transportKeys;
+	}
+
+	@Override
+	public int hashCode() {
+		return keySetId.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		return o instanceof KeySet && keySetId.equals(((KeySet) o).keySetId);
+	}
+}

bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java

@@ -5,8 +5,10 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 
 /**
- * Type-safe wrapper for an integer that uniquely identifies a set of
- * {@link TransportKeySet transport keys} within the scope of the local device.
+ * Type-safe wrapper for an integer that uniquely identifies a set of transport
+ * keys within the scope of the local device.
+ * <p/>
+ * Key sets created on a given device must have increasing identifiers.
  */
 @Immutable
 @NotNullByDefault

bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java

@@ -1,32 +1,27 @@
 package org.briarproject.bramble.api.transport;
 
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
 
 /**
- * Contains transport keys for sending streams to a given contact or pending
- * contact over a given transport in a given time period.
+ * Contains transport keys for sending streams to a given contact over a given
+ * transport in a given rotation period.
  */
-@Immutable
-@NotNullByDefault
 public class OutgoingKeys {
 
 	private final SecretKey tagKey, headerKey;
-	private final long timePeriod, streamCounter;
+	private final long rotationPeriod, streamCounter;
 	private final boolean active;
 
 	public OutgoingKeys(SecretKey tagKey, SecretKey headerKey,
-			long timePeriod, boolean active) {
-		this(tagKey, headerKey, timePeriod, 0, active);
+			long rotationPeriod, boolean active) {
+		this(tagKey, headerKey, rotationPeriod, 0, active);
 	}
 
 	public OutgoingKeys(SecretKey tagKey, SecretKey headerKey,
-			long timePeriod, long streamCounter, boolean active) {
+			long rotationPeriod, long streamCounter, boolean active) {
 		this.tagKey = tagKey;
 		this.headerKey = headerKey;
-		this.timePeriod = timePeriod;
+		this.rotationPeriod = rotationPeriod;
 		this.streamCounter = streamCounter;
 		this.active = active;
 	}
@@ -39,8 +34,8 @@ public class OutgoingKeys {
 		return headerKey;
 	}
 
-	public long getTimePeriod() {
-		return timePeriod;
+	public long getRotationPeriod() {
+		return rotationPeriod;
 	}
 
 	public long getStreamCounter() {

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamContext.java

@@ -1,53 +1,29 @@
 package org.briarproject.bramble.api.transport;
 
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull;
-
-@Immutable
-@NotNullByDefault
 public class StreamContext {
 
-	@Nullable
 	private final ContactId contactId;
-	@Nullable
-	private final PendingContactId pendingContactId;
 	private final TransportId transportId;
 	private final SecretKey tagKey, headerKey;
 	private final long streamNumber;
-	private final boolean handshakeMode;
 
-	public StreamContext(@Nullable ContactId contactId,
-			@Nullable PendingContactId pendingContactId,
-			TransportId transportId, SecretKey tagKey, SecretKey headerKey,
-			long streamNumber, boolean handshakeMode) {
-		requireExactlyOneNull(contactId, pendingContactId);
+	public StreamContext(ContactId contactId, TransportId transportId,
+			SecretKey tagKey, SecretKey headerKey, long streamNumber) {
 		this.contactId = contactId;
-		this.pendingContactId = pendingContactId;
 		this.transportId = transportId;
 		this.tagKey = tagKey;
 		this.headerKey = headerKey;
 		this.streamNumber = streamNumber;
-		this.handshakeMode = handshakeMode;
 	}
 
-	@Nullable
 	public ContactId getContactId() {
 		return contactId;
 	}
 
-	@Nullable
-	public PendingContactId getPendingContactId() {
-		return pendingContactId;
-	}
-
 	public TransportId getTransportId() {
 		return transportId;
 	}
@@ -63,8 +39,4 @@ public class StreamContext {
 	public long getStreamNumber() {
 		return streamNumber;
 	}
-
-	public boolean isHandshakeMode() {
-		return handshakeMode;
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportConstants.java

@@ -82,58 +82,30 @@ public interface TransportConstants {
 	int REORDERING_WINDOW_SIZE = 32;
 
 	/**
-	 * Label for deriving Alice's initial tag key from the root key in
-	 * rotation mode.
+	 * Label for deriving Alice's initial tag key from the master secret.
 	 */
 	String ALICE_TAG_LABEL = "org.briarproject.bramble.transport/ALICE_TAG_KEY";
 
 	/**
-	 * Label for deriving Bob's initial tag key from the root key in rotation
-	 * mode.
+	 * Label for deriving Bob's initial tag key from the master secret.
 	 */
 	String BOB_TAG_LABEL = "org.briarproject.bramble.transport/BOB_TAG_KEY";
 
 	/**
-	 * Label for deriving Alice's initial header key from the root key in
-	 * rotation mode.
+	 * Label for deriving Alice's initial header key from the master secret.
 	 */
 	String ALICE_HEADER_LABEL =
 			"org.briarproject.bramble.transport/ALICE_HEADER_KEY";
 
 	/**
-	 * Label for deriving Bob's initial header key from the root key in
-	 * rotation mode.
+	 * Label for deriving Bob's initial header key from the master secret.
 	 */
 	String BOB_HEADER_LABEL =
 			"org.briarproject.bramble.transport/BOB_HEADER_KEY";
 
 	/**
-	 * Label for deriving the next period's key in rotation mode.
+	 * Label for deriving the next period's key in key rotation.
 	 */
 	String ROTATE_LABEL = "org.briarproject.bramble.transport/ROTATE";
 
-	/**
-	 * Label for deriving Alice's tag key from the root key in handshake mode.
-	 */
-	String ALICE_HANDSHAKE_TAG_LABEL =
-			"org.briarproject.bramble.transport/ALICE_HANDSHAKE_TAG_KEY";
-
-	/**
-	 * Label for deriving Bob's tag key from the root key in handshake mode.
-	 */
-	String BOB_HANDSHAKE_TAG_LABEL =
-			"org.briarproject.bramble.transport/BOB_HANDSHAKE_TAG_KEY";
-
-	/**
-	 * Label for deriving Alice's header key from the root key in handshake
-	 * mode.
-	 */
-	String ALICE_HANDSHAKE_HEADER_LABEL =
-			"org.briarproject.bramble.transport/ALICE_HANDSHAKE_HEADER_KEY";
-
-	/**
-	 * Label for deriving Bob's header key from the root key in handshake mode.
-	 */
-	String BOB_HANDSHAKE_HEADER_LABEL =
-			"org.briarproject.bramble.transport/BOB_HANDSHAKE_HEADER_KEY";
 }

bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeySet.java

@@ -1,64 +0,0 @@
-package org.briarproject.bramble.api.transport;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull;
-
-/**
- * A set of keys for communicating with a given contact or pending contact
- * over a given transport.
- */
-@Immutable
-@NotNullByDefault
-public class TransportKeySet {
-
-	private final KeySetId keySetId;
-	@Nullable
-	private final ContactId contactId;
-	@Nullable
-	private final PendingContactId pendingContactId;
-	private final TransportKeys keys;
-
-	public TransportKeySet(KeySetId keySetId, @Nullable ContactId contactId,
-			@Nullable PendingContactId pendingContactId, TransportKeys keys) {
-		requireExactlyOneNull(contactId, pendingContactId);
-		this.keySetId = keySetId;
-		this.contactId = contactId;
-		this.pendingContactId = pendingContactId;
-		this.keys = keys;
-	}
-
-	public KeySetId getKeySetId() {
-		return keySetId;
-	}
-
-	@Nullable
-	public ContactId getContactId() {
-		return contactId;
-	}
-
-	@Nullable
-	public PendingContactId getPendingContactId() {
-		return pendingContactId;
-	}
-
-	public TransportKeys getKeys() {
-		return keys;
-	}
-
-	@Override
-	public int hashCode() {
-		return keySetId.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		return o instanceof TransportKeySet &&
-				keySetId.equals(((TransportKeySet) o).keySetId);
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportKeys.java

@@ -1,54 +1,29 @@
 package org.briarproject.bramble.api.transport;
 
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
 /**
- * Keys for communicating with a given contact or pending contact over a given
- * transport.
+ * Keys for communicating with a given contact over a given transport.
  */
-@Immutable
-@NotNullByDefault
 public class TransportKeys {
 
 	private final TransportId transportId;
 	private final IncomingKeys inPrev, inCurr, inNext;
 	private final OutgoingKeys outCurr;
-	@Nullable
-	private final SecretKey rootKey;
-	private final boolean alice;
 
-	/**
-	 * Constructor for rotation mode.
-	 */
 	public TransportKeys(TransportId transportId, IncomingKeys inPrev,
 			IncomingKeys inCurr, IncomingKeys inNext, OutgoingKeys outCurr) {
-		this(transportId, inPrev, inCurr, inNext, outCurr, null, false);
-	}
-
-	/**
-	 * Constructor for handshake mode.
-	 */
-	public TransportKeys(TransportId transportId, IncomingKeys inPrev,
-			IncomingKeys inCurr, IncomingKeys inNext, OutgoingKeys outCurr,
-			@Nullable SecretKey rootKey, boolean alice) {
-		if (inPrev.getTimePeriod() != outCurr.getTimePeriod() - 1)
+		if (inPrev.getRotationPeriod() != inCurr.getRotationPeriod() - 1)
 			throw new IllegalArgumentException();
-		if (inCurr.getTimePeriod() != outCurr.getTimePeriod())
+		if (inNext.getRotationPeriod() != inCurr.getRotationPeriod() + 1)
 			throw new IllegalArgumentException();
-		if (inNext.getTimePeriod() != outCurr.getTimePeriod() + 1)
+		if (outCurr.getRotationPeriod() != inCurr.getRotationPeriod())
 			throw new IllegalArgumentException();
 		this.transportId = transportId;
 		this.inPrev = inPrev;
 		this.inCurr = inCurr;
 		this.inNext = inNext;
 		this.outCurr = outCurr;
-		this.rootKey = rootKey;
-		this.alice = alice;
 	}
 
 	public TransportId getTransportId() {
@@ -71,38 +46,7 @@ public class TransportKeys {
 		return outCurr;
 	}
 
-	public long getTimePeriod() {
-		return outCurr.getTimePeriod();
-	}
-
-	/**
-	 * Returns true if these keys are for use in handshake mode or false if
-	 * they're for use in rotation mode.
-	 */
-	public boolean isHandshakeMode() {
-		return rootKey != null;
-	}
-
-	/**
-	 * If these keys are for use in handshake mode, returns the root key.
-	 *
-	 * @throws UnsupportedOperationException If these keys are for use in
-	 * rotation mode
-	 */
-	public SecretKey getRootKey() {
-		if (rootKey == null) throw new UnsupportedOperationException();
-		return rootKey;
-	}
-
-	/**
-	 * If these keys are for use in handshake mode, returns true if the local
-	 * party is Alice.
-	 *
-	 * @throws UnsupportedOperationException If these keys are for use in
-	 * rotation mode
-	 */
-	public boolean isAlice() {
-		if (rootKey == null) throw new UnsupportedOperationException();
-		return alice;
+	public long getRotationPeriod() {
+		return outCurr.getRotationPeriod();
 	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java

@@ -46,14 +46,7 @@ public interface ClientVersioningManager {
 			ClientId clientId, int majorVersion) throws DbException;
 
 	interface ClientVersioningHook {
-		/**
-		 * Called when the visibility of a client with respect to a contact is
-		 * changing.
-		 *
-		 * @param txn A read-write transaction
-		 * @param c The contact affected by the visibility change
-		 * @param v The new visibility of the client
-		 */
+
 		void onClientVisibilityChanging(Transaction txn, Contact c,
 				Visibility v) throws DbException;
 	}

bramble-api/src/main/java/org/briarproject/bramble/util/Base32.java

@@ -1,75 +0,0 @@
-package org.briarproject.bramble.util;
-
-import java.io.ByteArrayOutputStream;
-
-public class Base32 {
-
-	private static final char[] DIGITS = {
-			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
-			'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-			'Y', 'Z', '2', '3', '4', '5', '6', '7'
-	};
-
-	public static String encode(byte[] b) {
-		StringBuilder s = new StringBuilder();
-		int byteIndex = 0, currentCode = 0x00;
-		int byteMask = 0x80, codeMask = 0x10;
-		while (byteIndex < b.length) {
-			if ((b[byteIndex] & byteMask) != 0) currentCode |= codeMask;
-			// After every 8 bits, move on to the next byte
-			if (byteMask == 0x01) {
-				byteMask = 0x80;
-				byteIndex++;
-			} else {
-				byteMask >>>= 1;
-			}
-			// After every 5 bits, move on to the next digit
-			if (codeMask == 0x01) {
-				s.append(DIGITS[currentCode]);
-				codeMask = 0x10;
-				currentCode = 0x00;
-			} else {
-				codeMask >>>= 1;
-			}
-		}
-		// If we're part-way through a digit, output it
-		if (codeMask != 0x10) s.append(DIGITS[currentCode]);
-		return s.toString();
-	}
-
-	public static byte[] decode(String s, boolean strict) {
-		ByteArrayOutputStream b = new ByteArrayOutputStream();
-		int digitIndex = 0, digitCount = s.length(), currentByte = 0x00;
-		int byteMask = 0x80, codeMask = 0x10;
-		while (digitIndex < digitCount) {
-			int code = decodeDigit(s.charAt(digitIndex));
-			if ((code & codeMask) != 0) currentByte |= byteMask;
-			// After every 8 bits, move on to the next byte
-			if (byteMask == 0x01) {
-				b.write(currentByte);
-				byteMask = 0x80;
-				currentByte = 0x00;
-			} else {
-				byteMask >>>= 1;
-			}
-			// After every 5 bits, move on to the next digit
-			if (codeMask == 0x01) {
-				codeMask = 0x10;
-				digitIndex++;
-			} else {
-				codeMask >>>= 1;
-			}
-		}
-		// If any extra bits were used for encoding, they should all be zero
-		if (strict && byteMask != 0x80 && currentByte != 0x00)
-			throw new IllegalArgumentException();
-		return b.toByteArray();
-	}
-
-	private static int decodeDigit(char c) {
-		if (c >= 'A' && c <= 'Z') return c - 'A';
-		if (c >= 'a' && c <= 'z') return c - 'a';
-		if (c >= '2' && c <= '7') return c - '2' + 26;
-		throw new IllegalArgumentException("Not a base32 digit: " + c);
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/util/LogUtils.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.util;
 
-import java.io.File;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -20,7 +19,6 @@ public class LogUtils {
 
 	/**
 	 * Logs the duration of a task.
-	 *
 	 * @param logger the logger to use
 	 * @param task a description of the task
 	 * @param start the start time of the task, as returned by {@link #now()}
@@ -35,26 +33,4 @@ public class LogUtils {
 	public static void logException(Logger logger, Level level, Throwable t) {
 		if (logger.isLoggable(level)) logger.log(level, t.toString(), t);
 	}
-
-	public static void logFileOrDir(Logger logger, Level level, File f) {
-		if (logger.isLoggable(level)) {
-			if (f.isFile()) {
-				logWithType(logger, level, f, "F");
-			} else if (f.isDirectory()) {
-				logWithType(logger, level, f, "D");
-				File[] children = f.listFiles();
-				if (children != null) {
-					for (File child : children)
-						logFileOrDir(logger, level, child);
-				}
-			} else if (f.exists()) {
-				logWithType(logger, level, f, "?");
-			}
-		}
-	}
-
-	private static void logWithType(Logger logger, Level level, File f,
-			String type) {
-		logger.log(level, type + " " + f.getAbsolutePath() + " " + f.length());
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java

@@ -153,13 +153,4 @@ public class StringUtils {
 		return new String(c);
 	}
 
-	public static String getRandomBase32String(int length) {
-		char[] c = new char[length];
-		for (int i = 0; i < length; i++) {
-			int character = random.nextInt(32);
-			if (character < 26) c[i] = (char) ('a' + character);
-			else c[i] = (char) ('2' + (character - 26));
-		}
-		return new String(c);
-	}
 }

bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java

@@ -1,21 +1,9 @@
 package org.briarproject.bramble.test;
 
 import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.PendingContact;
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.contact.PendingContactState;
-import org.briarproject.bramble.api.crypto.AgreementPrivateKey;
-import org.briarproject.bramble.api.crypto.AgreementPublicKey;
-import org.briarproject.bramble.api.crypto.PrivateKey;
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.crypto.SignaturePrivateKey;
-import org.briarproject.bramble.api.crypto.SignaturePublicKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.Identity;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
@@ -37,10 +25,9 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static java.util.Arrays.asList;
-import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_AGREEMENT_PUBLIC_KEY_BYTES;
-import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_PUBLIC_KEY_BYTES;
 import static org.briarproject.bramble.api.identity.Author.FORMAT_VERSION;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.bramble.api.plugin.TransportId.MAX_TRANSPORT_ID_LENGTH;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
 import static org.briarproject.bramble.api.sync.ClientId.MAX_CLIENT_ID_LENGTH;
@@ -54,7 +41,6 @@ public class TestUtils {
 			new AtomicInteger((int) (Math.random() * 1000 * 1000));
 	private static final Random random = new Random();
 	private static final long timestamp = System.currentTimeMillis();
-	private static final AtomicInteger nextContactId = new AtomicInteger(1);
 
 	public static File getTestDirectory() {
 		int name = nextTestDir.getAndIncrement();
@@ -107,46 +93,27 @@ public class TestUtils {
 		return new SecretKey(getRandomBytes(SecretKey.LENGTH));
 	}
 
-	public static PublicKey getSignaturePublicKey() {
-		byte[] key = getRandomBytes(MAX_SIGNATURE_PUBLIC_KEY_BYTES);
-		return new SignaturePublicKey(key);
+	public static LocalAuthor getLocalAuthor() {
+		return getLocalAuthor(1 + random.nextInt(MAX_AUTHOR_NAME_LENGTH));
 	}
 
-	public static PrivateKey getSignaturePrivateKey() {
-		return new SignaturePrivateKey(getRandomBytes(123));
-	}
-
-	public static PublicKey getAgreementPublicKey() {
-		byte[] key = getRandomBytes(MAX_AGREEMENT_PUBLIC_KEY_BYTES);
-		return new AgreementPublicKey(key);
-	}
-
-	public static PrivateKey getAgreementPrivateKey() {
-		return new AgreementPrivateKey(getRandomBytes(123));
-	}
-
-	public static Identity getIdentity() {
-		LocalAuthor localAuthor = getLocalAuthor();
-		PublicKey handshakePub = getAgreementPublicKey();
-		PrivateKey handshakePriv = getAgreementPrivateKey();
-		return new Identity(localAuthor, handshakePub, handshakePriv,
+	public static LocalAuthor getLocalAuthor(int nameLength) {
+		AuthorId id = new AuthorId(getRandomId());
+		String name = getRandomString(nameLength);
+		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
+		byte[] privateKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
+		return new LocalAuthor(id, FORMAT_VERSION, name, publicKey, privateKey,
 				timestamp);
 	}
 
-	public static LocalAuthor getLocalAuthor() {
-		AuthorId id = new AuthorId(getRandomId());
-		int nameLength = 1 + random.nextInt(MAX_AUTHOR_NAME_LENGTH);
-		String name = getRandomString(nameLength);
-		PublicKey publicKey = getSignaturePublicKey();
-		PrivateKey privateKey = getSignaturePrivateKey();
-		return new LocalAuthor(id, FORMAT_VERSION, name, publicKey, privateKey);
+	public static Author getAuthor() {
+		return getAuthor(1 + random.nextInt(MAX_AUTHOR_NAME_LENGTH));
 	}
 
-	public static Author getAuthor() {
+	public static Author getAuthor(int nameLength) {
 		AuthorId id = new AuthorId(getRandomId());
-		int nameLength = 1 + random.nextInt(MAX_AUTHOR_NAME_LENGTH);
 		String name = getRandomString(nameLength);
-		PublicKey publicKey = getSignaturePublicKey();
+		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
 		return new Author(id, FORMAT_VERSION, name, publicKey);
 	}
 
@@ -173,41 +140,6 @@ public class TestUtils {
 		return new Message(id, groupId, timestamp, body);
 	}
 
-	public static PendingContact getPendingContact() {
-		return getPendingContact(1 + random.nextInt(MAX_AUTHOR_NAME_LENGTH));
-	}
-
-	public static PendingContact getPendingContact(int nameLength) {
-		PendingContactId id = new PendingContactId(getRandomId());
-		PublicKey publicKey = getAgreementPublicKey();
-		String alias = getRandomString(nameLength);
-		int stateIndex =
-				random.nextInt(PendingContactState.values().length - 1);
-		PendingContactState state = PendingContactState.values()[stateIndex];
-		return new PendingContact(id, publicKey, alias, state, timestamp);
-	}
-
-	public static ContactId getContactId() {
-		return new ContactId(nextContactId.getAndIncrement());
-	}
-
-	public static Contact getContact() {
-		return getContact(getAuthor(), new AuthorId(getRandomId()),
-				random.nextBoolean());
-	}
-
-	public static Contact getContact(Author remote, AuthorId local,
-			boolean verified) {
-		return getContact(getContactId(), remote, local, verified);
-	}
-
-	public static Contact getContact(ContactId c, Author remote, AuthorId local,
-			boolean verified) {
-		return new Contact(c, remote, local,
-				getRandomString(MAX_AUTHOR_NAME_LENGTH),
-				getAgreementPublicKey(), verified);
-	}
-
 	public static double getMedian(Collection<? extends Number> samples) {
 		int size = samples.size();
 		if (size == 0) throw new IllegalArgumentException();

bramble-api/witness.gradle

@@ -2,7 +2,7 @@ dependencyVerification {
     verify = [
         'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
         'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-        'com.google.dagger:dagger:2.22.1:dagger-2.22.1.jar:329d4340f24c4f5717af016c097e90668bfea2a5376e6aa9964b01cef3fd241a',
+        'com.google.dagger:dagger:2.19:dagger-2.19.jar:514b6f1e0727c6572e1d65cb27e4ae668b7aeaeb93a29515182965265b609939',
         'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
         'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',

bramble-core/build.gradle

@@ -15,9 +15,8 @@ dependencies {
 	implementation 'org.bitlet:weupnp:0.1.4'
 	implementation 'net.i2p.crypto:eddsa:0.2.0'
 	implementation 'org.whispersystems:curve25519-java:0.5.0'
-	implementation 'org.briarproject:jtorctl:0.3'
 
-	annotationProcessor 'com.google.dagger:dagger-compiler:2.22.1'
+	annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
 
 	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	testImplementation 'org.hsqldb:hsqldb:2.3.5' // The last version that supports Java 1.6
@@ -26,7 +25,7 @@ dependencies {
 	testImplementation "org.jmock:jmock-junit4:2.8.2"
 	testImplementation "org.jmock:jmock-legacy:2.8.2"
 
-	testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.22.1'
+	testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.19'
 
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }

bramble-core/src/main/java/net/freehaven/tor/control/.cvsignore

@@ -0,0 +1 @@
+*.class

bramble-core/src/main/java/net/freehaven/tor/control/Bytes.java

@@ -0,0 +1,114 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Static class to do bytewise structure manipulation in Java.
+ */
+/* XXXX There must be a better way to do most of this.
+ * XXXX The string logic here uses default encoding, which is stupid.
+ */
+final class Bytes {
+
+    /** Write the two-byte value in 's' into the byte array 'ba', starting at
+     * the index 'pos'. */
+    public static void setU16(byte[] ba, int pos, short s) {
+        ba[pos]   = (byte)((s >> 8) & 0xff);
+        ba[pos+1] = (byte)((s     ) & 0xff);
+    }
+
+    /** Write the four-byte value in 'i' into the byte array 'ba', starting at
+     * the index 'pos'. */
+    public static void setU32(byte[] ba, int pos, int i) {
+        ba[pos]   = (byte)((i >> 24) & 0xff);
+        ba[pos+1] = (byte)((i >> 16) & 0xff);
+        ba[pos+2] = (byte)((i >>  8) & 0xff);
+        ba[pos+3] = (byte)((i      ) & 0xff);
+    }
+
+    /** Return the four-byte value starting at index 'pos' within 'ba' */
+    public static int getU32(byte[] ba, int pos) {
+        return
+            ((ba[pos  ]&0xff)<<24) |
+            ((ba[pos+1]&0xff)<<16) |
+            ((ba[pos+2]&0xff)<< 8)  |
+            ((ba[pos+3]&0xff));
+    }
+
+    public static String getU32S(byte[] ba, int pos) {
+        return String.valueOf( (getU32(ba,pos))&0xffffffffL );
+    }
+
+    /** Return the two-byte value starting at index 'pos' within 'ba' */
+    public static int getU16(byte[] ba, int pos) {
+        return
+            ((ba[pos  ]&0xff)<<8) |
+            ((ba[pos+1]&0xff));
+    }
+
+    /** Return the string starting at position 'pos' of ba and extending
+     * until a zero byte or the end of the string. */
+    public static String getNulTerminatedStr(byte[] ba, int pos) {
+        int len, maxlen = ba.length-pos;
+        for (len=0; len<maxlen; ++len) {
+            if (ba[pos+len] == 0)
+                break;
+        }
+        return new String(ba, pos, len);
+    }
+
+    /**
+     * Read bytes from 'ba' starting at 'pos', dividing them into strings
+     * along the character in 'split' and writing them into 'lst'
+     */
+    public static void splitStr(List<String> lst, byte[] ba, int pos, byte split) {
+        while (pos < ba.length && ba[pos] != 0) {
+            int len;
+            for (len=0; pos+len < ba.length; ++len) {
+                if (ba[pos+len] == 0 || ba[pos+len] == split)
+                    break;
+            }
+            if (len>0)
+                lst.add(new String(ba, pos, len));
+            pos += len;
+            if (ba[pos] == split)
+                ++pos;
+        }
+    }
+
+    /**
+     * Read bytes from 'ba' starting at 'pos', dividing them into strings
+     * along the character in 'split' and writing them into 'lst'
+     */
+    public static List<String> splitStr(List<String> lst, String str) {
+        // split string on spaces, include trailing/leading
+        String[] tokenArray = str.split(" ", -1);
+        if (lst == null) {
+            lst = Arrays.asList( tokenArray );
+        } else {
+            lst.addAll( Arrays.asList( tokenArray ) );
+        }
+        return lst;
+    }
+
+    private static final char[] NYBBLES = {
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+    };
+
+    public static final String hex(byte[] ba) {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < ba.length; ++i) {
+            int b = (ba[i]) & 0xff;
+            buf.append(NYBBLES[b >> 4]);
+            buf.append(NYBBLES[b&0x0f]);
+        }
+        return buf.toString();
+    }
+
+    private Bytes() {};
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/ConfigEntry.java

@@ -0,0 +1,20 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+/** A single key-value pair from Tor's configuration. */
+public class ConfigEntry {
+    public ConfigEntry(String k, String v) {
+        key = k;
+        value = v;
+        is_default = false;
+    }
+    public ConfigEntry(String k) {
+        key = k;
+        value = "";
+        is_default = true;
+    }
+    public final String key;
+    public final String value;
+    public final boolean is_default;
+}

bramble-core/src/main/java/net/freehaven/tor/control/EventHandler.java

@@ -0,0 +1,75 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+/**
+ * Abstract interface whose methods are invoked when Tor sends us an event.
+ *
+ * @see TorControlConnection#setEventHandler
+ * @see TorControlConnection#setEvents
+ */
+public interface EventHandler {
+    /**
+     * Invoked when a circuit's status has changed.
+     * Possible values for <b>status</b> are:
+     * <ul>
+     *   <li>"LAUNCHED" :  circuit ID assigned to new circuit</li>
+     *   <li>"BUILT"    :  all hops finished, can now accept streams</li>
+     *   <li>"EXTENDED" :  one more hop has been completed</li>
+     *   <li>"FAILED"   :  circuit closed (was not built)</li>
+     *   <li>"CLOSED"   :  circuit closed (was built)</li>
+     *	</ul>
+     * 
+     * <b>circID</b> is the alphanumeric identifier of the affected circuit,
+     * and <b>path</b> is a comma-separated list of alphanumeric ServerIDs.
+     */
+    public void circuitStatus(String status, String circID, String path);
+    /**
+     * Invoked when a stream's status has changed.
+     * Possible values for <b>status</b> are:
+     * <ul>
+     *   <li>"NEW"         :  New request to connect</li>
+     *   <li>"NEWRESOLVE"  :  New request to resolve an address</li>
+     *   <li>"SENTCONNECT" :  Sent a connect cell along a circuit</li>
+     *   <li>"SENTRESOLVE" :  Sent a resolve cell along a circuit</li>
+     *   <li>"SUCCEEDED"   :  Received a reply; stream established</li>
+     *   <li>"FAILED"      :  Stream failed and not retriable.</li>
+     *   <li>"CLOSED"      :  Stream closed</li>
+     *   <li>"DETACHED"    :  Detached from circuit; still retriable.</li>
+     *	</ul>
+     *
+     * <b>streamID</b> is the alphanumeric identifier of the affected stream,
+     * and its <b>target</b> is specified as address:port.
+     */
+    public void streamStatus(String status, String streamID, String target);
+    /**
+     * Invoked when the status of a connection to an OR has changed.
+     * Possible values for <b>status</b> are ["LAUNCHED" | "CONNECTED" | "FAILED" | "CLOSED"].
+     * <b>orName</b> is the alphanumeric identifier of the OR affected.
+     */
+    public void orConnStatus(String status, String orName);
+    /**
+     * Invoked once per second. <b>read</b> and <b>written</b> are
+     * the number of bytes read and written, respectively, in
+     * the last second.
+     */
+    public void bandwidthUsed(long read, long written);
+    /**
+     * Invoked whenever Tor learns about new ORs.  The <b>orList</b> object
+     * contains the alphanumeric ServerIDs associated with the new ORs.
+     */
+    public void newDescriptors(java.util.List<String> orList);
+    /**
+     * Invoked when Tor logs a message.
+     * <b>severity</b> is one of ["DEBUG" | "INFO" | "NOTICE" | "WARN" | "ERR"],
+     * and <b>msg</b> is the message string.
+     */
+    public void message(String severity, String msg);
+    /**
+     * Invoked when an unspecified message is received.
+     * <type> is the message type, and <msg> is the message string.
+     */
+    public void unrecognized(String type, String msg);
+
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/NullEventHandler.java

@@ -0,0 +1,18 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+/**
+ * Implementation of EventHandler that ignores all events.  Useful
+ * when you only want to override one method.
+ */
+public class NullEventHandler implements EventHandler {
+    public void circuitStatus(String status, String circID, String path) {}
+    public void streamStatus(String status, String streamID, String target) {}
+    public void orConnStatus(String status, String orName) {}
+    public void bandwidthUsed(long read, long written) {}
+    public void newDescriptors(java.util.List<String> orList) {}
+    public void message(String severity, String msg) {}
+    public void unrecognized(String type, String msg) {}
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/PasswordDigest.java

@@ -0,0 +1,98 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+/**
+ * A hashed digest of a secret password (used to set control connection
+ * security.)
+ *
+ * For the actual hashing algorithm, see RFC2440's secret-to-key conversion.
+ */
+public class PasswordDigest {
+
+    private final byte[] secret;
+    private final String hashedKey;
+
+    /** Return a new password digest with a random secret and salt. */
+    public static PasswordDigest generateDigest() {
+        byte[] secret = new byte[20];
+        SecureRandom rng = new SecureRandom();
+        rng.nextBytes(secret);
+        return new PasswordDigest(secret);
+    }
+
+    /** Construct a new password digest with a given secret and random salt */
+    public PasswordDigest(byte[] secret) {
+        this(secret, null);
+    }
+
+    /** Construct a new password digest with a given secret and random salt.
+     * Note that the 9th byte of the specifier determines the number of hash
+     * iterations as in RFC2440.
+     */
+    public PasswordDigest(byte[] secret, byte[] specifier) {
+        this.secret = secret.clone();
+        if (specifier == null) {
+            specifier = new byte[9];
+            SecureRandom rng = new SecureRandom();
+            rng.nextBytes(specifier);
+            specifier[8] = 96;
+        }
+        hashedKey = "16:"+encodeBytes(secretToKey(secret, specifier));
+    }
+
+    /** Return the secret used to generate this password hash.
+     */
+    public byte[] getSecret() {
+        return secret.clone();
+    }
+
+    /** Return the hashed password in the format used by Tor. */
+    public String getHashedPassword() {
+        return hashedKey;
+    }
+
+    /** Parameter used by RFC2440's s2k algorithm. */
+    private static final int EXPBIAS = 6;
+
+    /** Implement rfc2440 s2k */
+    public static byte[] secretToKey(byte[] secret, byte[] specifier) {
+        MessageDigest d;
+        try {
+            d = MessageDigest.getInstance("SHA-1");
+        } catch (NoSuchAlgorithmException ex) {
+            throw new RuntimeException("Can't run without sha-1.");
+        }
+        int c = (specifier[8])&0xff;
+        int count = (16 + (c&15)) << ((c>>4) + EXPBIAS);
+
+        byte[] tmp = new byte[8+secret.length];
+        System.arraycopy(specifier, 0, tmp, 0, 8);
+        System.arraycopy(secret, 0, tmp, 8, secret.length);
+        while (count > 0) {
+            if (count >= tmp.length) {
+                d.update(tmp);
+                count -= tmp.length;
+            } else {
+                d.update(tmp, 0, count);
+                count = 0;
+            }
+        }
+        byte[] key = new byte[20+9];
+        System.arraycopy(d.digest(), 0, key, 9, 20);
+        System.arraycopy(specifier, 0, key, 0, 9);
+        return key;
+    }
+
+    /** Return a hexadecimal encoding of a byte array. */
+    // XXX There must be a better way to do this in Java.
+    private static final String encodeBytes(byte[] ba) {
+        return Bytes.hex(ba);
+    }
+
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/README

@@ -0,0 +1,4 @@
+We broke the version detection stuff in Tor 0.1.2.16 / 0.2.0.4-alpha.
+Somebody should rip out the v0 control protocol stuff from here, and
+it should start working again. -RD
+

bramble-core/src/main/java/net/freehaven/tor/control/TorControlCommands.java

@@ -0,0 +1,151 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+/** Interface defining constants used by the Tor controller protocol.
+ */
+// XXXX Take documentation for these from control-spec.txt
+public interface TorControlCommands {
+
+    public static final short CMD_ERROR = 0x0000;
+    public static final short CMD_DONE = 0x0001;
+    public static final short CMD_SETCONF = 0x0002;
+    public static final short CMD_GETCONF = 0x0003;
+    public static final short CMD_CONFVALUE = 0x0004;
+    public static final short CMD_SETEVENTS = 0x0005;
+    public static final short CMD_EVENT = 0x0006;
+    public static final short CMD_AUTH = 0x0007;
+    public static final short CMD_SAVECONF = 0x0008;
+    public static final short CMD_SIGNAL = 0x0009;
+    public static final short CMD_MAPADDRESS = 0x000A;
+    public static final short CMD_GETINFO = 0x000B;
+    public static final short CMD_INFOVALUE = 0x000C;
+    public static final short CMD_EXTENDCIRCUIT = 0x000D;
+    public static final short CMD_ATTACHSTREAM = 0x000E;
+    public static final short CMD_POSTDESCRIPTOR = 0x000F;
+    public static final short CMD_FRAGMENTHEADER = 0x0010;
+    public static final short CMD_FRAGMENT = 0x0011;
+    public static final short CMD_REDIRECTSTREAM = 0x0012;
+    public static final short CMD_CLOSESTREAM = 0x0013;
+    public static final short CMD_CLOSECIRCUIT = 0x0014;
+
+    public static final String[] CMD_NAMES = {
+        "ERROR",
+        "DONE",
+        "SETCONF",
+        "GETCONF",
+        "CONFVALUE",
+        "SETEVENTS",
+        "EVENT",
+        "AUTH",
+        "SAVECONF",
+        "SIGNAL",
+        "MAPADDRESS",
+        "GETINFO",
+        "INFOVALUE",
+        "EXTENDCIRCUIT",
+        "ATTACHSTREAM",
+        "POSTDESCRIPTOR",
+        "FRAGMENTHEADER",
+        "FRAGMENT",
+        "REDIRECTSTREAM",
+        "CLOSESTREAM",
+        "CLOSECIRCUIT",
+    };
+
+    public static final short EVENT_CIRCSTATUS = 0x0001;
+    public static final short EVENT_STREAMSTATUS = 0x0002;
+    public static final short EVENT_ORCONNSTATUS = 0x0003;
+    public static final short EVENT_BANDWIDTH = 0x0004;
+    public static final short EVENT_NEWDESCRIPTOR = 0x0006;
+    public static final short EVENT_MSG_DEBUG = 0x0007;
+    public static final short EVENT_MSG_INFO = 0x0008;
+    public static final short EVENT_MSG_NOTICE = 0x0009;
+    public static final short EVENT_MSG_WARN = 0x000A;
+    public static final short EVENT_MSG_ERROR = 0x000B;
+
+    public static final String[] EVENT_NAMES = {
+        "(0)",
+        "CIRC",
+        "STREAM",
+        "ORCONN",
+        "BW",
+        "OLDLOG",
+        "NEWDESC",
+        "DEBUG",
+        "INFO",
+        "NOTICE",
+        "WARN",
+        "ERR",
+    };
+
+    public static final byte CIRC_STATUS_LAUNCHED = 0x01;
+    public static final byte CIRC_STATUS_BUILT = 0x02;
+    public static final byte CIRC_STATUS_EXTENDED = 0x03;
+    public static final byte CIRC_STATUS_FAILED = 0x04;
+    public static final byte CIRC_STATUS_CLOSED = 0x05;
+
+    public static final String[] CIRC_STATUS_NAMES = {
+        "LAUNCHED",
+        "BUILT",
+        "EXTENDED",
+        "FAILED",
+        "CLOSED",
+    };
+
+    public static final byte STREAM_STATUS_SENT_CONNECT = 0x00;
+    public static final byte STREAM_STATUS_SENT_RESOLVE = 0x01;
+    public static final byte STREAM_STATUS_SUCCEEDED = 0x02;
+    public static final byte STREAM_STATUS_FAILED = 0x03;
+    public static final byte STREAM_STATUS_CLOSED = 0x04;
+    public static final byte STREAM_STATUS_NEW_CONNECT = 0x05;
+    public static final byte STREAM_STATUS_NEW_RESOLVE = 0x06;
+    public static final byte STREAM_STATUS_DETACHED = 0x07;
+
+    public static final String[] STREAM_STATUS_NAMES = {
+        "SENT_CONNECT",
+        "SENT_RESOLVE",
+        "SUCCEEDED",
+        "FAILED",
+        "CLOSED",
+        "NEW_CONNECT",
+        "NEW_RESOLVE",
+        "DETACHED"
+    };
+
+    public static final byte OR_CONN_STATUS_LAUNCHED = 0x00;
+    public static final byte OR_CONN_STATUS_CONNECTED = 0x01;
+    public static final byte OR_CONN_STATUS_FAILED = 0x02;
+    public static final byte OR_CONN_STATUS_CLOSED = 0x03;
+
+    public static final String[] OR_CONN_STATUS_NAMES = {
+        "LAUNCHED","CONNECTED","FAILED","CLOSED"
+    };
+
+    public static final byte SIGNAL_HUP = 0x01;
+    public static final byte SIGNAL_INT = 0x02;
+    public static final byte SIGNAL_USR1 = 0x0A;
+    public static final byte SIGNAL_USR2 = 0x0C;
+    public static final byte SIGNAL_TERM = 0x0F;
+
+    public static final String ERROR_MSGS[] = {
+        "Unspecified error",
+        "Internal error",
+        "Unrecognized message type",
+        "Syntax error",
+        "Unrecognized configuration key",
+        "Invalid configuration value",
+        "Unrecognized byte code",
+        "Unauthorized",
+        "Failed authentication attempt",
+        "Resource exhausted",
+        "No such stream",
+        "No such circuit",
+        "No such OR",
+    };
+
+    public static final String HS_ADDRESS = "onionAddress";
+    public static final String HS_PRIVKEY = "onionPrivKey";
+
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/TorControlConnection.java

@@ -0,0 +1,998 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.logging.Logger;
+
+import static java.util.logging.Logger.getLogger;
+
+/**
+ * A connection to a running Tor process as specified in control-spec.txt.
+ */
+public class TorControlConnection implements TorControlCommands {
+
+	private static final Logger LOG =
+			getLogger(TorControlConnection.class.getName());
+
+	private final LinkedList<Waiter> waiters;
+	private final BufferedReader input;
+	private final Writer output;
+
+	private ControlParseThread thread; // Locking: this
+
+	private volatile EventHandler handler;
+	private volatile PrintWriter debugOutput;
+	private volatile IOException parseThreadException;
+
+	static class Waiter {
+
+		List<ReplyLine> response; // Locking: this
+		boolean interrupted;
+
+		List<ReplyLine> getResponse() throws InterruptedException {
+			LOG.info("Entering synchronized (waiter " + hashCode() + ")");
+			synchronized (this) {
+				LOG.info("Entered synchronized (waiter " + hashCode() + ")");
+				while (response == null) {
+					LOG.info("Waiter " + hashCode() + " waiting for response");
+					wait();
+					if (interrupted) {
+						LOG.info("Waiter " + hashCode() + " interrupted");
+						throw new InterruptedException();
+					}
+				}
+				LOG.info("Waiter " + hashCode() + " got response " + response);
+				LOG.info("Leaving synchronized (waiter " + hashCode() + ")");
+				return response;
+			}
+		}
+
+		void setResponse(List<ReplyLine> response) {
+			LOG.info("Entering synchronized (waiter " + hashCode() + ")");
+			synchronized (this) {
+				LOG.info("Entered synchronized (waiter " + hashCode() + ")");
+				LOG.info("Setting response for waiter " + hashCode() + ": "
+						+ response);
+				this.response = response;
+				notifyAll();
+				LOG.info("Leaving synchronized (waiter " + hashCode() + ")");
+			}
+		}
+
+		void interrupt() {
+			LOG.info("Entering synchronized (waiter " + hashCode() + ")");
+			synchronized (this) {
+				LOG.info("Entered synchronized (waiter " + hashCode() + ")");
+				LOG.info("Interrupting waiter " + hashCode());
+				interrupted = true;
+				notifyAll();
+				LOG.info("Leaving synchronized (waiter " + hashCode() + ")");
+			}
+		}
+	}
+
+	static class ReplyLine {
+
+		final String status;
+		final String msg;
+		final String rest;
+
+		ReplyLine(String status, String msg, String rest) {
+			this.status = status;
+			this.msg = msg;
+			this.rest = rest;
+		}
+
+		@Override
+		public String toString() {
+			return status + " " + msg + " " + rest;
+		}
+	}
+
+	/**
+	 * Create a new TorControlConnection to communicate with Tor over
+	 * a given socket.  After calling this constructor, it is typical to
+	 * call launchThread and authenticate.
+	 */
+	public TorControlConnection(Socket connection) throws IOException {
+		this(connection.getInputStream(), connection.getOutputStream());
+	}
+
+	/**
+	 * Create a new TorControlConnection to communicate with Tor over
+	 * an arbitrary pair of data streams.
+	 */
+	public TorControlConnection(InputStream i, OutputStream o) {
+		this(new InputStreamReader(i), new OutputStreamWriter(o));
+	}
+
+	public TorControlConnection(Reader i, Writer o) {
+		this.output = o;
+		if (i instanceof BufferedReader)
+			this.input = (BufferedReader) i;
+		else
+			this.input = new BufferedReader(i);
+		this.waiters = new LinkedList<>();
+	}
+
+	protected final void writeEscaped(String s) throws IOException {
+		StringTokenizer st = new StringTokenizer(s, "\n");
+		while (st.hasMoreTokens()) {
+			String line = st.nextToken();
+			if (line.startsWith("."))
+				line = "." + line;
+			if (line.endsWith("\r"))
+				line += "\n";
+			else
+				line += "\r\n";
+			if (debugOutput != null)
+				debugOutput.print(">> " + line);
+			output.write(line);
+		}
+		output.write(".\r\n");
+		if (debugOutput != null)
+			debugOutput.print(">> .\n");
+	}
+
+	protected static String quote(String s) {
+		StringBuffer sb = new StringBuffer("\"");
+		for (int i = 0; i < s.length(); ++i) {
+			char c = s.charAt(i);
+			switch (c) {
+				case '\r':
+				case '\n':
+				case '\\':
+				case '\"':
+					sb.append('\\');
+			}
+			sb.append(c);
+		}
+		sb.append('\"');
+		return sb.toString();
+	}
+
+	protected final ArrayList<ReplyLine> readReply() throws IOException {
+		ArrayList<ReplyLine> reply = new ArrayList<>();
+		char c;
+		do {
+			String line = input.readLine();
+			if (line == null) {
+				// if line is null, the end of the stream has been reached, i.e.
+				// the connection to Tor has been closed!
+				if (reply.isEmpty()) {
+					// nothing received so far, can exit cleanly
+					return reply;
+				}
+				// received half of a reply before the connection broke down
+				throw new TorControlSyntaxError("Connection to Tor " +
+						" broke down while receiving reply!");
+			}
+			if (debugOutput != null)
+				debugOutput.println("<< " + line);
+			if (line.length() < 4)
+				throw new TorControlSyntaxError(
+						"Line (\"" + line + "\") too short");
+			String status = line.substring(0, 3);
+			c = line.charAt(3);
+			String msg = line.substring(4);
+			String rest = null;
+			if (c == '+') {
+				StringBuffer data = new StringBuffer();
+				while (true) {
+					line = input.readLine();
+					if (debugOutput != null)
+						debugOutput.print("<< " + line);
+					if (line.equals("."))
+						break;
+					else if (line.startsWith("."))
+						line = line.substring(1);
+					data.append(line).append('\n');
+				}
+				rest = data.toString();
+			}
+			reply.add(new ReplyLine(status, msg, rest));
+		} while (c != ' ');
+
+		return reply;
+	}
+
+	protected List<ReplyLine> sendAndWaitForResponse(String s,
+			String rest) throws IOException {
+		LOG.info("Entering synchronized (connection)");
+		synchronized (this) {
+			LOG.info("Entered synchronized (connection)");
+			LOG.info("Sending '" + s + "', '" + rest +
+					"' and waiting for response");
+			if (parseThreadException != null) {
+				LOG.info("Throwing previously caught exception "
+						+ parseThreadException);
+				throw parseThreadException;
+			}
+			checkThread();
+			Waiter w = new Waiter();
+			LOG.info("Created waiter " + w.hashCode());
+			if (debugOutput != null)
+				debugOutput.print(">> " + s);
+			LOG.info("Entering synchronized (waiters)");
+			synchronized (waiters) {
+				LOG.info("Entered synchronized (waiters)");
+				output.write(s);
+				LOG.info("Wrote '" + s + "'");
+				if (rest != null) {
+					writeEscaped(rest);
+					LOG.info("Wrote escaped '" + rest + "'");
+				}
+				output.flush();
+				LOG.info("Flushed output");
+				waiters.addLast(w);
+				LOG.info("Added waiter, " + waiters.size() + " waiting");
+				LOG.info("Leaving synchronized (waiters)");
+			}
+			List<ReplyLine> lst;
+			try {
+				LOG.info("Getting response from waiter " + w.hashCode());
+				lst = w.getResponse();
+				LOG.info("Got response from waiter " + w.hashCode() + ": " +
+						lst);
+			} catch (InterruptedException ex) {
+				throw new IOException("Interrupted");
+			}
+			for (Iterator<ReplyLine> i = lst.iterator(); i.hasNext(); ) {
+				ReplyLine c = i.next();
+				if (!c.status.startsWith("2"))
+					throw new TorControlError("Error reply: " + c.msg);
+			}
+			LOG.info("Leaving synchronized (connection)");
+			return lst;
+		}
+	}
+
+	/**
+	 * Helper: decode a CMD_EVENT command and dispatch it to our
+	 * EventHandler (if any).
+	 */
+	protected void handleEvent(ArrayList<ReplyLine> events) {
+		if (handler == null)
+			return;
+
+		for (Iterator<ReplyLine> i = events.iterator(); i.hasNext(); ) {
+			ReplyLine line = i.next();
+			int idx = line.msg.indexOf(' ');
+			String tp = line.msg.substring(0, idx).toUpperCase();
+			String rest = line.msg.substring(idx + 1);
+			if (tp.equals("CIRC")) {
+				List<String> lst = Bytes.splitStr(null, rest);
+				handler.circuitStatus(lst.get(1),
+						lst.get(0),
+						lst.get(1).equals("LAUNCHED")
+								|| lst.size() < 3 ? ""
+								: lst.get(2));
+			} else if (tp.equals("STREAM")) {
+				List<String> lst = Bytes.splitStr(null, rest);
+				handler.streamStatus(lst.get(1),
+						lst.get(0),
+						lst.get(3));
+				// XXXX circID.
+			} else if (tp.equals("ORCONN")) {
+				List<String> lst = Bytes.splitStr(null, rest);
+				handler.orConnStatus(lst.get(1), lst.get(0));
+			} else if (tp.equals("BW")) {
+				List<String> lst = Bytes.splitStr(null, rest);
+				handler.bandwidthUsed(Integer.parseInt(lst.get(0)),
+						Integer.parseInt(lst.get(1)));
+			} else if (tp.equals("NEWDESC")) {
+				List<String> lst = Bytes.splitStr(null, rest);
+				handler.newDescriptors(lst);
+			} else if (tp.equals("DEBUG") ||
+					tp.equals("INFO") ||
+					tp.equals("NOTICE") ||
+					tp.equals("WARN") ||
+					tp.equals("ERR")) {
+				handler.message(tp, rest);
+			} else {
+				handler.unrecognized(tp, rest);
+			}
+		}
+	}
+
+
+	/**
+	 * Sets <b>w</b> as the PrintWriter for debugging output,
+	 * which writes out all messages passed between Tor and the controller.
+	 * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
+	 * by "\<\<"
+	 */
+	public void setDebugging(PrintWriter w) {
+		debugOutput = w;
+	}
+
+	/**
+	 * Sets <b>s</b> as the PrintStream for debugging output,
+	 * which writes out all messages passed between Tor and the controller.
+	 * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
+	 * by "\<\<"
+	 */
+	public void setDebugging(PrintStream s) {
+		debugOutput = new PrintWriter(s, true);
+	}
+
+	/**
+	 * Set the EventHandler object that will be notified of any
+	 * events Tor delivers to this connection.  To make Tor send us
+	 * events, call setEvents().
+	 */
+	public void setEventHandler(EventHandler handler) {
+		this.handler = handler;
+	}
+
+	/**
+	 * Start a thread to react to Tor's responses in the background.
+	 * This is necessary to handle asynchronous events and synchronous
+	 * responses that arrive independantly over the same socket.
+	 */
+	public Thread launchThread(boolean daemon) {
+		LOG.info("Entering synchronized (connection)");
+		synchronized (this) {
+			LOG.info("Entered synchronized (connection)");
+			ControlParseThread th = new ControlParseThread();
+			LOG.info("Launching parse thread " + th.hashCode());
+			if (daemon)
+				th.setDaemon(true);
+			th.start();
+			this.thread = th;
+			LOG.info("Leaving synchronized (connection)");
+			return th;
+		}
+	}
+
+	protected class ControlParseThread extends Thread {
+
+		@Override
+		public void run() {
+			try {
+				react();
+			} catch (IOException ex) {
+				LOG.info("Parse thread " + hashCode()
+						+ " caught exception " + ex);
+				parseThreadException = ex;
+			}
+		}
+	}
+
+	protected void checkThread() {
+		LOG.info("Entering synchronized (connection)");
+		synchronized (this) {
+			LOG.info("Entered synchronized (connection)");
+			if (thread == null)
+				launchThread(true);
+			LOG.info("Leaving synchronized (connection)");
+		}
+	}
+
+	/**
+	 * helper: implement the main background loop.
+	 */
+	protected void react() throws IOException {
+		while (true) {
+			ArrayList<ReplyLine> lst = readReply();
+			LOG.info("Read reply: " + lst);
+			if (lst.isEmpty()) {
+				// interrupted queued waiters, there won't be any response.
+				LOG.info("Entering synchronized (waiters)");
+				synchronized (waiters) {
+					LOG.info("Entered synchronized (waiters)");
+					if (!waiters.isEmpty()) {
+						for (Waiter w : waiters) {
+							LOG.info("Interrupting waiter " + w.hashCode());
+							w.interrupt();
+						}
+					} else {
+						LOG.info("No waiters");
+					}
+					LOG.info("Leaving synchronized (waiters)");
+				}
+				throw new IOException("Tor is no longer running");
+			}
+			if ((lst.get(0)).status.startsWith("6")) {
+				LOG.info("Reply is an event");
+				handleEvent(lst);
+			} else {
+				LOG.info("Entering synchronized (waiters)");
+				synchronized (waiters) {
+					LOG.info("Entered synchronized (waiters)");
+					if (!waiters.isEmpty()) {
+						Waiter w;
+						w = waiters.removeFirst();
+						LOG.info("Setting response for waiter " + w.hashCode());
+						w.setResponse(lst);
+					} else {
+						LOG.info("No waiters");
+					}
+					LOG.info("Leaving synchronized (waiters)");
+				}
+
+			}
+		}
+	}
+
+	/**
+	 * Change the value of the configuration option 'key' to 'val'.
+	 */
+	public void setConf(String key, String value) throws IOException {
+		List<String> lst = new ArrayList<>();
+		lst.add(key + " " + value);
+		setConf(lst);
+	}
+
+	/**
+	 * Change the values of the configuration options stored in kvMap.
+	 */
+	public void setConf(Map<String, String> kvMap) throws IOException {
+		List<String> lst = new ArrayList<>();
+		for (Iterator<Map.Entry<String, String>> it =
+				kvMap.entrySet().iterator(); it.hasNext(); ) {
+			Map.Entry<String, String> ent = it.next();
+			lst.add(ent.getKey() + " " + ent.getValue() + "\n");
+		}
+		setConf(lst);
+	}
+
+	/**
+	 * Changes the values of the configuration options stored in
+	 * <b>kvList</b>.  Each list element in <b>kvList</b> is expected to be
+	 * String of the format "key value".
+	 * <p>
+	 * Tor behaves as though it had just read each of the key-value pairs
+	 * from its configuration file.  Keywords with no corresponding values have
+	 * their configuration values reset to their defaults.  setConf is
+	 * all-or-nothing: if there is an error in any of the configuration settings,
+	 * Tor sets none of them.
+	 * <p>
+	 * When a configuration option takes multiple values, or when multiple
+	 * configuration keys form a context-sensitive group (see getConf below), then
+	 * setting any of the options in a setConf command is taken to reset all of
+	 * the others.  For example, if two ORBindAddress values are configured, and a
+	 * command arrives containing a single ORBindAddress value, the new
+	 * command's value replaces the two old values.
+	 * <p>
+	 * To remove all settings for a given option entirely (and go back to its
+	 * default value), include a String in <b>kvList</b> containing the key and no value.
+	 */
+	public void setConf(Collection<String> kvList) throws IOException {
+		if (kvList.size() == 0)
+			return;
+		StringBuffer b = new StringBuffer("SETCONF");
+		for (Iterator<String> it = kvList.iterator(); it.hasNext(); ) {
+			String kv = it.next();
+			int i = kv.indexOf(' ');
+			if (i == -1)
+				b.append(" ").append(kv);
+			b.append(" ").append(kv.substring(0, i)).append("=")
+					.append(quote(kv.substring(i + 1)));
+		}
+		b.append("\r\n");
+		sendAndWaitForResponse(b.toString(), null);
+	}
+
+	/**
+	 * Try to reset the values listed in the collection 'keys' to their
+	 * default values.
+	 **/
+	public void resetConf(Collection<String> keys) throws IOException {
+		if (keys.size() == 0)
+			return;
+		StringBuffer b = new StringBuffer("RESETCONF");
+		for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+			String key = it.next();
+			b.append(" ").append(key);
+		}
+		b.append("\r\n");
+		sendAndWaitForResponse(b.toString(), null);
+	}
+
+	/**
+	 * Return the value of the configuration option 'key'
+	 */
+	public List<ConfigEntry> getConf(String key) throws IOException {
+		List<String> lst = new ArrayList<>();
+		lst.add(key);
+		return getConf(lst);
+	}
+
+	/**
+	 * Requests the values of the configuration variables listed in <b>keys</b>.
+	 * Results are returned as a list of ConfigEntry objects.
+	 * <p>
+	 * If an option appears multiple times in the configuration, all of its
+	 * key-value pairs are returned in order.
+	 * <p>
+	 * Some options are context-sensitive, and depend on other options with
+	 * different keywords.  These cannot be fetched directly.  Currently there
+	 * is only one such option: clients should use the "HiddenServiceOptions"
+	 * virtual keyword to get all HiddenServiceDir, HiddenServicePort,
+	 * HiddenServiceNodes, and HiddenServiceExcludeNodes option settings.
+	 */
+	public List<ConfigEntry> getConf(Collection<String> keys)
+			throws IOException {
+		StringBuffer sb = new StringBuffer("GETCONF");
+		for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+			String key = it.next();
+			sb.append(" ").append(key);
+		}
+		sb.append("\r\n");
+		List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+		List<ConfigEntry> result = new ArrayList<>();
+		for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+			String kv = (it.next()).msg;
+			int idx = kv.indexOf('=');
+			if (idx >= 0)
+				result.add(new ConfigEntry(kv.substring(0, idx),
+						kv.substring(idx + 1)));
+			else
+				result.add(new ConfigEntry(kv));
+		}
+		return result;
+	}
+
+	/**
+	 * Request that the server inform the client about interesting events.
+	 * Each element of <b>events</b> is one of the following Strings:
+	 * ["CIRC" | "STREAM" | "ORCONN" | "BW" | "DEBUG" |
+	 * "INFO" | "NOTICE" | "WARN" | "ERR" | "NEWDESC" | "ADDRMAP"] .
+	 * <p>
+	 * Any events not listed in the <b>events</b> are turned off; thus, calling
+	 * setEvents with an empty <b>events</b> argument turns off all event reporting.
+	 */
+	public void setEvents(List<String> events) throws IOException {
+		StringBuffer sb = new StringBuffer("SETEVENTS");
+		for (Iterator<String> it = events.iterator(); it.hasNext(); ) {
+			sb.append(" ").append(it.next());
+		}
+		sb.append("\r\n");
+		sendAndWaitForResponse(sb.toString(), null);
+	}
+
+	/**
+	 * Authenticates the controller to the Tor server.
+	 * <p>
+	 * By default, the current Tor implementation trusts all local users, and
+	 * the controller can authenticate itself by calling authenticate(new byte[0]).
+	 * <p>
+	 * If the 'CookieAuthentication' option is true, Tor writes a "magic cookie"
+	 * file named "control_auth_cookie" into its data directory.  To authenticate,
+	 * the controller must send the contents of this file in <b>auth</b>.
+	 * <p>
+	 * If the 'HashedControlPassword' option is set, <b>auth</b> must contain the salted
+	 * hash of a secret password.  The salted hash is computed according to the
+	 * S2K algorithm in RFC 2440 (OpenPGP), and prefixed with the s2k specifier.
+	 * This is then encoded in hexadecimal, prefixed by the indicator sequence
+	 * "16:".
+	 * <p>
+	 * You can generate the salt of a password by calling
+	 * 'tor --hash-password <password>'
+	 * or by using the provided PasswordDigest class.
+	 * To authenticate under this scheme, the controller sends Tor the original
+	 * secret that was used to generate the password.
+	 */
+	public void authenticate(byte[] auth) throws IOException {
+		String cmd = "AUTHENTICATE " + Bytes.hex(auth) + "\r\n";
+		sendAndWaitForResponse(cmd, null);
+	}
+
+	/**
+	 * Instructs the server to write out its configuration options into its torrc.
+	 */
+	public void saveConf() throws IOException {
+		sendAndWaitForResponse("SAVECONF\r\n", null);
+	}
+
+	/**
+	 * Sends a signal from the controller to the Tor server.
+	 * <b>signal</b> is one of the following Strings:
+	 * <ul>
+	 * <li>"RELOAD" or "HUP" :  Reload config items, refetch directory</li>
+	 * <li>"SHUTDOWN" or "INT" : Controlled shutdown: if server is an OP, exit immediately.
+	 * If it's an OR, close listeners and exit after 30 seconds</li>
+	 * <li>"DUMP" or "USR1" : Dump stats: log information about open connections and circuits</li>
+	 * <li>"DEBUG" or "USR2" : Debug: switch all open logs to loglevel debug</li>
+	 * <li>"HALT" or "TERM" : Immediate shutdown: clean up and exit now</li>
+	 * </ul>
+	 */
+	public void signal(String signal) throws IOException {
+		String cmd = "SIGNAL " + signal + "\r\n";
+		sendAndWaitForResponse(cmd, null);
+	}
+
+	/**
+	 * Send a signal to the Tor process to shut it down or halt it.
+	 * Does not wait for a response.
+	 */
+	public void shutdownTor(String signal) throws IOException {
+		String s = "SIGNAL " + signal + "\r\n";
+		Waiter w = new Waiter();
+		if (debugOutput != null)
+			debugOutput.print(">> " + s);
+		LOG.info("Entering synchronized (waiters)");
+		synchronized (waiters) {
+			LOG.info("Entered synchronized (waiters)");
+			output.write(s);
+			output.flush();
+			LOG.info("Leaving synchronized (waiters)");
+		}
+	}
+
+	/**
+	 * Tells the Tor server that future SOCKS requests for connections to a set of original
+	 * addresses should be replaced with connections to the specified replacement
+	 * addresses.  Each element of <b>kvLines</b> is a String of the form
+	 * "old-address new-address".  This function returns the new address mapping.
+	 * <p>
+	 * The client may decline to provide a body for the original address, and
+	 * instead send a special null address ("0.0.0.0" for IPv4, "::0" for IPv6, or
+	 * "." for hostname), signifying that the server should choose the original
+	 * address itself, and return that address in the reply.  The server
+	 * should ensure that it returns an element of address space that is unlikely
+	 * to be in actual use.  If there is already an address mapped to the
+	 * destination address, the server may reuse that mapping.
+	 * <p>
+	 * If the original address is already mapped to a different address, the old
+	 * mapping is removed.  If the original address and the destination address
+	 * are the same, the server removes any mapping in place for the original
+	 * address.
+	 * <p>
+	 * Mappings set by the controller last until the Tor process exits:
+	 * they never expire. If the controller wants the mapping to last only
+	 * a certain time, then it must explicitly un-map the address when that
+	 * time has elapsed.
+	 */
+	public Map<String, String> mapAddresses(Collection<String> kvLines)
+			throws IOException {
+		StringBuffer sb = new StringBuffer("MAPADDRESS");
+		for (Iterator<String> it = kvLines.iterator(); it.hasNext(); ) {
+			String kv = it.next();
+			int i = kv.indexOf(' ');
+			sb.append(" ").append(kv.substring(0, i)).append("=")
+					.append(quote(kv.substring(i + 1)));
+		}
+		sb.append("\r\n");
+		List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+		Map<String, String> result = new HashMap<>();
+		for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+			String kv = (it.next()).msg;
+			int idx = kv.indexOf('=');
+			result.put(kv.substring(0, idx),
+					kv.substring(idx + 1));
+		}
+		return result;
+	}
+
+	public Map<String, String> mapAddresses(Map<String, String> addresses)
+			throws IOException {
+		List<String> kvList = new ArrayList<>();
+		for (Iterator<Map.Entry<String, String>> it =
+				addresses.entrySet().iterator(); it.hasNext(); ) {
+			Map.Entry<String, String> e = it.next();
+			kvList.add(e.getKey() + " " + e.getValue());
+		}
+		return mapAddresses(kvList);
+	}
+
+	public String mapAddress(String fromAddr, String toAddr)
+			throws IOException {
+		List<String> lst = new ArrayList<>();
+		lst.add(fromAddr + " " + toAddr + "\n");
+		Map<String, String> m = mapAddresses(lst);
+		return m.get(fromAddr);
+	}
+
+	/**
+	 * Queries the Tor server for keyed values that are not stored in the torrc
+	 * configuration file.  Returns a map of keys to values.
+	 * <p>
+	 * Recognized keys include:
+	 * <ul>
+	 * <li>"version" : The version of the server's software, including the name
+	 * of the software. (example: "Tor 0.0.9.4")</li>
+	 * <li>"desc/id/<OR identity>" or "desc/name/<OR nickname>" : the latest server
+	 * descriptor for a given OR, NUL-terminated.  If no such OR is known, the
+	 * corresponding value is an empty string.</li>
+	 * <li>"network-status" : a space-separated list of all known OR identities.
+	 * This is in the same format as the router-status line in directories;
+	 * see tor-spec.txt for details.</li>
+	 * <li>"addr-mappings/all"</li>
+	 * <li>"addr-mappings/config"</li>
+	 * <li>"addr-mappings/cache"</li>
+	 * <li>"addr-mappings/control" : a space-separated list of address mappings, each
+	 * in the form of "from-address=to-address".  The 'config' key
+	 * returns those address mappings set in the configuration; the 'cache'
+	 * key returns the mappings in the client-side DNS cache; the 'control'
+	 * key returns the mappings set via the control interface; the 'all'
+	 * target returns the mappings set through any mechanism.</li>
+	 * <li>"circuit-status" : A series of lines as for a circuit status event. Each line is of the form:
+	 * "CircuitID CircStatus Path"</li>
+	 * <li>"stream-status" : A series of lines as for a stream status event.  Each is of the form:
+	 * "StreamID StreamStatus CircID Target"</li>
+	 * <li>"orconn-status" : A series of lines as for an OR connection status event.  Each is of the
+	 * form: "ServerID ORStatus"</li>
+	 * </ul>
+	 */
+	public Map<String, String> getInfo(Collection<String> keys)
+			throws IOException {
+		StringBuffer sb = new StringBuffer("GETINFO");
+		for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+			sb.append(" ").append(it.next());
+		}
+		sb.append("\r\n");
+		List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+		Map<String, String> m = new HashMap<>();
+		for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+			ReplyLine line = it.next();
+			int idx = line.msg.indexOf('=');
+			if (idx < 0)
+				break;
+			String k = line.msg.substring(0, idx);
+			String v;
+			if (line.rest != null) {
+				v = line.rest;
+			} else {
+				v = line.msg.substring(idx + 1);
+			}
+			m.put(k, v);
+		}
+		return m;
+	}
+
+
+	/**
+	 * Return the value of the information field 'key'
+	 */
+	public String getInfo(String key) throws IOException {
+		List<String> lst = new ArrayList<>();
+		lst.add(key);
+		Map<String, String> m = getInfo(lst);
+		return m.get(key);
+	}
+
+	/**
+	 * An extendCircuit request takes one of two forms: either the <b>circID</b> is zero, in
+	 * which case it is a request for the server to build a new circuit according
+	 * to the specified path, or the <b>circID</b> is nonzero, in which case it is a
+	 * request for the server to extend an existing circuit with that ID according
+	 * to the specified <b>path</b>.
+	 * <p>
+	 * If successful, returns the Circuit ID of the (maybe newly created) circuit.
+	 */
+	public String extendCircuit(String circID, String path) throws IOException {
+		List<ReplyLine> lst = sendAndWaitForResponse(
+				"EXTENDCIRCUIT " + circID + " " + path + "\r\n", null);
+		return (lst.get(0)).msg;
+	}
+
+	/**
+	 * Informs the Tor server that the stream specified by <b>streamID</b> should be
+	 * associated with the circuit specified by <b>circID</b>.
+	 * <p>
+	 * Each stream may be associated with
+	 * at most one circuit, and multiple streams may share the same circuit.
+	 * Streams can only be attached to completed circuits (that is, circuits that
+	 * have sent a circuit status "BUILT" event or are listed as built in a
+	 * getInfo circuit-status request).
+	 * <p>
+	 * If <b>circID</b> is 0, responsibility for attaching the given stream is
+	 * returned to Tor.
+	 * <p>
+	 * By default, Tor automatically attaches streams to
+	 * circuits itself, unless the configuration variable
+	 * "__LeaveStreamsUnattached" is set to "1".  Attempting to attach streams
+	 * via TC when "__LeaveStreamsUnattached" is false may cause a race between
+	 * Tor and the controller, as both attempt to attach streams to circuits.
+	 */
+	public void attachStream(String streamID, String circID)
+			throws IOException {
+		sendAndWaitForResponse(
+				"ATTACHSTREAM " + streamID + " " + circID + "\r\n", null);
+	}
+
+	/**
+	 * Tells Tor about the server descriptor in <b>desc</b>.
+	 * <p>
+	 * The descriptor, when parsed, must contain a number of well-specified
+	 * fields, including fields for its nickname and identity.
+	 */
+	// More documentation here on format of desc?
+	// No need for return value?  control-spec.txt says reply is merely "250 OK" on success...
+	public String postDescriptor(String desc) throws IOException {
+		List<ReplyLine> lst =
+				sendAndWaitForResponse("+POSTDESCRIPTOR\r\n", desc);
+		return (lst.get(0)).msg;
+	}
+
+	/**
+	 * Tells Tor to change the exit address of the stream identified by <b>streamID</b>
+	 * to <b>address</b>. No remapping is performed on the new provided address.
+	 * <p>
+	 * To be sure that the modified address will be used, this event must be sent
+	 * after a new stream event is received, and before attaching this stream to
+	 * a circuit.
+	 */
+	public void redirectStream(String streamID, String address)
+			throws IOException {
+		sendAndWaitForResponse(
+				"REDIRECTSTREAM " + streamID + " " + address + "\r\n",
+				null);
+	}
+
+	/**
+	 * Tells Tor to close the stream identified by <b>streamID</b>.
+	 * <b>reason</b> should be one of the Tor RELAY_END reasons given in tor-spec.txt, as a decimal:
+	 * <ul>
+	 * <li>1 -- REASON_MISC           (catch-all for unlisted reasons)</li>
+	 * <li>2 -- REASON_RESOLVEFAILED  (couldn't look up hostname)</li>
+	 * <li>3 -- REASON_CONNECTREFUSED (remote host refused connection)</li>
+	 * <li>4 -- REASON_EXITPOLICY     (OR refuses to connect to host or port)</li>
+	 * <li>5 -- REASON_DESTROY        (Circuit is being destroyed)</li>
+	 * <li>6 -- REASON_DONE           (Anonymized TCP connection was closed)</li>
+	 * <li>7 -- REASON_TIMEOUT        (Connection timed out, or OR timed out while connecting)</li>
+	 * <li>8 -- (unallocated)</li>
+	 * <li>9 -- REASON_HIBERNATING    (OR is temporarily hibernating)</li>
+	 * <li>10 -- REASON_INTERNAL       (Internal error at the OR)</li>
+	 * <li>11 -- REASON_RESOURCELIMIT  (OR has no resources to fulfill request)</li>
+	 * <li>12 -- REASON_CONNRESET      (Connection was unexpectedly reset)</li>
+	 * <li>13 -- REASON_TORPROTOCOL    (Sent when closing connection because of Tor protocol violations)</li>
+	 * </ul>
+	 * <p>
+	 * Tor may hold the stream open for a while to flush any data that is pending.
+	 */
+	public void closeStream(String streamID, byte reason)
+			throws IOException {
+		sendAndWaitForResponse(
+				"CLOSESTREAM " + streamID + " " + reason + "\r\n", null);
+	}
+
+	/**
+	 * Tells Tor to close the circuit identified by <b>circID</b>.
+	 * If <b>ifUnused</b> is true, do not close the circuit unless it is unused.
+	 */
+	public void closeCircuit(String circID, boolean ifUnused)
+			throws IOException {
+		sendAndWaitForResponse("CLOSECIRCUIT " + circID +
+				(ifUnused ? " IFUNUSED" : "") + "\r\n", null);
+	}
+
+	/**
+	 * Tells Tor to exit when this control connection is closed. This command
+	 * was added in Tor 0.2.2.28-beta.
+	 */
+	public void takeOwnership() throws IOException {
+		sendAndWaitForResponse("TAKEOWNERSHIP\r\n", null);
+	}
+
+	/**
+	 * Tells Tor to generate and set up a new onion service using the best
+	 * supported algorithm.
+	 * <p/>
+	 * ADD_ONION was added in Tor 0.2.7.1-alpha.
+	 */
+	public Map<String, String> addOnion(Map<Integer, String> portLines)
+			throws IOException {
+		return addOnion("NEW:BEST", portLines, null);
+	}
+
+	/**
+	 * Tells Tor to generate and set up a new onion service using the best
+	 * supported algorithm.
+	 * <p/>
+	 * ADD_ONION was added in Tor 0.2.7.1-alpha.
+	 */
+	public Map<String, String> addOnion(Map<Integer, String> portLines,
+			boolean ephemeral, boolean detach)
+			throws IOException {
+		return addOnion("NEW:BEST", portLines, ephemeral, detach);
+	}
+
+	/**
+	 * Tells Tor to set up an onion service using the provided private key.
+	 * <p/>
+	 * ADD_ONION was added in Tor 0.2.7.1-alpha.
+	 */
+	public Map<String, String> addOnion(String privKey,
+			Map<Integer, String> portLines)
+			throws IOException {
+		return addOnion(privKey, portLines, null);
+	}
+
+	/**
+	 * Tells Tor to set up an onion service using the provided private key.
+	 * <p/>
+	 * ADD_ONION was added in Tor 0.2.7.1-alpha.
+	 */
+	public Map<String, String> addOnion(String privKey,
+			Map<Integer, String> portLines,
+			boolean ephemeral, boolean detach)
+			throws IOException {
+		List<String> flags = new ArrayList<>();
+		if (ephemeral)
+			flags.add("DiscardPK");
+		if (detach)
+			flags.add("Detach");
+		return addOnion(privKey, portLines, flags);
+	}
+
+	/**
+	 * Tells Tor to set up an onion service.
+	 * <p/>
+	 * ADD_ONION was added in Tor 0.2.7.1-alpha.
+	 */
+	public Map<String, String> addOnion(String privKey,
+			Map<Integer, String> portLines,
+			List<String> flags)
+			throws IOException {
+		if (privKey.indexOf(':') < 0)
+			throw new IllegalArgumentException("Invalid privKey");
+		if (portLines == null || portLines.size() < 1)
+			throw new IllegalArgumentException(
+					"Must provide at least one port line");
+		StringBuilder b = new StringBuilder();
+		b.append("ADD_ONION ").append(privKey);
+		if (flags != null && flags.size() > 0) {
+			b.append(" Flags=");
+			String separator = "";
+			for (String flag : flags) {
+				b.append(separator).append(flag);
+				separator = ",";
+			}
+		}
+		for (Map.Entry<Integer, String> portLine : portLines.entrySet()) {
+			int virtPort = portLine.getKey();
+			String target = portLine.getValue();
+			b.append(" Port=").append(virtPort);
+			if (target != null && target.length() > 0)
+				b.append(",").append(target);
+		}
+		b.append("\r\n");
+		List<ReplyLine> lst = sendAndWaitForResponse(b.toString(), null);
+		Map<String, String> ret = new HashMap<>();
+		ret.put(HS_ADDRESS, (lst.get(0)).msg.split("=", 2)[1]);
+		if (lst.size() > 2)
+			ret.put(HS_PRIVKEY, (lst.get(1)).msg.split("=", 2)[1]);
+		return ret;
+	}
+
+	/**
+	 * Tells Tor to take down an onion service previously set up with
+	 * addOnion(). The hostname excludes the .onion extension.
+	 * <p/>
+	 * DEL_ONION was added in Tor 0.2.7.1-alpha.
+	 */
+	public void delOnion(String hostname) throws IOException {
+		sendAndWaitForResponse("DEL_ONION " + hostname + "\r\n", null);
+	}
+
+	/**
+	 * Tells Tor to forget any cached client state relating to the hidden
+	 * service with the given hostname (excluding the .onion extension).
+	 */
+	public void forgetHiddenService(String hostname) throws IOException {
+		sendAndWaitForResponse("HSFORGET " + hostname + "\r\n", null);
+	}
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/TorControlError.java

@@ -0,0 +1,39 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+import java.io.IOException;
+
+/**
+ * An exception raised when Tor tells us about an error.
+ */
+public class TorControlError extends IOException {
+
+    static final long serialVersionUID = 3;
+
+    private final int errorType;
+
+    public TorControlError(int type, String s) {
+        super(s);
+        errorType = type;
+    }
+
+    public TorControlError(String s) {
+        this(-1, s);
+    }
+
+    public int getErrorType() {
+        return errorType;
+    }
+
+    public String getErrorMsg() {
+        try {
+            if (errorType == -1)
+                return null;
+            return TorControlCommands.ERROR_MSGS[errorType];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            return "Unrecongized error #"+errorType;
+        }
+    }
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java

@@ -0,0 +1,16 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control;
+
+import java.io.IOException;
+
+/**
+ * An exception raised when Tor behaves in an unexpected way.
+ */
+public class TorControlSyntaxError extends IOException {
+
+    static final long serialVersionUID = 3;
+
+    public TorControlSyntaxError(String s) { super(s); }
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/examples/.cvsignore

@@ -0,0 +1 @@
+*.class

bramble-core/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java

@@ -0,0 +1,44 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control.examples;
+
+import java.io.PrintWriter;
+import java.util.Iterator;
+import net.freehaven.tor.control.EventHandler;
+
+public class DebuggingEventHandler implements EventHandler {
+
+    private final PrintWriter out;
+
+    public DebuggingEventHandler(PrintWriter p) {
+        out = p;
+    }
+
+    public void circuitStatus(String status, String circID, String path) {
+        out.println("Circuit "+circID+" is now "+status+" (path="+path+")");
+    }
+    public void streamStatus(String status, String streamID, String target) {
+        out.println("Stream "+streamID+" is now "+status+" (target="+target+")");
+    }
+    public void orConnStatus(String status, String orName) {
+        out.println("OR connection to "+orName+" is now "+status);
+    }
+    public void bandwidthUsed(long read, long written) {
+        out.println("Bandwidth usage: "+read+" bytes read; "+
+                    written+" bytes written.");
+    }
+    public void newDescriptors(java.util.List<String> orList) {
+        out.println("New descriptors for routers:");
+        for (Iterator<String> i = orList.iterator(); i.hasNext(); )
+            out.println("   "+i.next());
+    }
+    public void message(String type, String msg) {
+        out.println("["+type+"] "+msg.trim());
+    }
+
+    public void unrecognized(String type, String msg) {
+        out.println("unrecognized event ["+type+"] "+msg.trim());
+    }
+
+}
+

bramble-core/src/main/java/net/freehaven/tor/control/examples/Main.java

@@ -0,0 +1,146 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package net.freehaven.tor.control.examples;
+
+import net.freehaven.tor.control.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Iterator;
+
+public class Main implements TorControlCommands {
+
+    public static void main(String args[]) {
+        if (args.length < 1) {
+            System.err.println("No command given.");
+            return;
+        }
+        try {
+            if (args[0].equals("set-config")) {
+                setConfig(args);
+            } else if (args[0].equals("get-config")) {
+                getConfig(args);
+            } else if (args[0].equals("get-info")) {
+                getInfo(args);
+            } else if (args[0].equals("listen")) {
+                listenForEvents(args);
+            } else if (args[0].equals("signal")) {
+                signal(args);
+            } else if (args[0].equals("auth")) {
+                authDemo(args);
+            } else {
+                System.err.println("Unrecognized command: "+args[0]);
+            }
+        } catch (EOFException ex) {
+            System.out.println("Control socket closed by Tor.");
+        } catch (TorControlError ex) {
+            System.err.println("Error from Tor process: "+
+                               ex+" ["+ex.getErrorMsg()+"]");
+        } catch (IOException ex) {
+            System.err.println("IO exception when talking to Tor process: "+
+                               ex);
+            ex.printStackTrace(System.err);
+        }
+    }
+
+    private static TorControlConnection getConnection(String[] args,
+        boolean daemon) throws IOException {
+        Socket s = new Socket("127.0.0.1", 9100);
+        TorControlConnection conn = new TorControlConnection(s);
+        conn.launchThread(daemon);
+        conn.authenticate(new byte[0]);
+        return conn;
+    }
+
+    private static TorControlConnection getConnection(String[] args)
+        throws IOException {
+        return getConnection(args, true);
+    }
+
+    public static void setConfig(String[] args) throws IOException {
+        // Usage: "set-config [-save] key value key value key value"
+        TorControlConnection conn = getConnection(args);
+        ArrayList<String> lst = new ArrayList<String>();
+        int i = 1;
+        boolean save = false;
+        if (args[i].equals("-save")) {
+            save = true;
+            ++i;
+        }
+        for (; i < args.length; i +=2) {
+            lst.add(args[i]+" "+args[i+1]);
+        }
+        conn.setConf(lst);
+        if (save) {
+            conn.saveConf();
+        }
+    }
+
+    public static void getConfig(String[] args) throws IOException {
+        // Usage: get-config key key key
+        TorControlConnection conn = getConnection(args);
+        List<ConfigEntry> lst = conn.getConf(Arrays.asList(args).subList(1,args.length));
+        for (Iterator<ConfigEntry> i = lst.iterator(); i.hasNext(); ) {
+            ConfigEntry e = i.next();
+            System.out.println("KEY: "+e.key);
+            System.out.println("VAL: "+e.value);
+        }
+    }
+
+    public static void getInfo(String[] args) throws IOException {
+        TorControlConnection conn = getConnection(args);
+        Map<String,String> m = conn.getInfo(Arrays.asList(args).subList(1,args.length));
+        for (Iterator<Map.Entry<String, String>> i = m.entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry<String,String> e = i.next();
+            System.out.println("KEY: "+e.getKey());
+            System.out.println("VAL: "+e.getValue());
+        }
+    }
+
+    public static void listenForEvents(String[] args) throws IOException {
+        // Usage: listen [circ|stream|orconn|bw|newdesc|info|notice|warn|error]*
+        TorControlConnection conn = getConnection(args, false);
+        ArrayList<String> lst = new ArrayList<String>();
+        for (int i = 1; i < args.length; ++i) {
+            lst.add(args[i]);
+        }
+        conn.setEventHandler(
+            new DebuggingEventHandler(new PrintWriter(System.out, true)));
+        conn.setEvents(lst);
+    }
+
+    public static void signal(String[] args) throws IOException {
+        // Usage signal [reload|shutdown|dump|debug|halt]
+        TorControlConnection conn = getConnection(args, false);
+        // distinguish shutdown signal from other signals
+        if ("SHUTDOWN".equalsIgnoreCase(args[1])
+        		|| "HALT".equalsIgnoreCase(args[1])) {
+        	conn.shutdownTor(args[1].toUpperCase());
+        } else {
+        	conn.signal(args[1].toUpperCase());
+        }
+    }
+
+    public static void authDemo(String[] args) throws IOException {
+
+        PasswordDigest pwd = PasswordDigest.generateDigest();
+        Socket s = new Socket("127.0.0.1", 9100);
+        TorControlConnection conn = new TorControlConnection(s);
+        conn.launchThread(true);
+        conn.authenticate(new byte[0]);
+
+        conn.setConf("HashedControlPassword", pwd.getHashedPassword());
+
+        s = new Socket("127.0.0.1", 9100);
+        conn = new TorControlConnection(s);
+        conn.launchThread(true);
+        conn.authenticate(pwd.getSecret());
+    }
+
+}
+

bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java

@@ -4,8 +4,8 @@ import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
-import org.briarproject.bramble.api.identity.Identity;
 import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.util.IoUtils;
@@ -161,8 +161,8 @@ class AccountManagerImpl implements AccountManager {
 		synchronized (stateChangeLock) {
 			if (hasDatabaseKey())
 				throw new AssertionError("Already have a database key");
-			Identity identity = identityManager.createIdentity(name);
-			identityManager.registerIdentity(identity);
+			LocalAuthor localAuthor = identityManager.createLocalAuthor(name);
+			identityManager.registerLocalAuthor(localAuthor);
 			SecretKey key = crypto.generateSecretKey();
 			if (!encryptAndStoreDatabaseKey(key, password)) return false;
 			databaseKey = key;

bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java

@@ -3,9 +3,6 @@ package org.briarproject.bramble.client;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.crypto.KeyParser;
-import org.briarproject.bramble.api.crypto.PrivateKey;
-import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.data.BdfReader;
@@ -308,15 +305,14 @@ class ClientHelperImpl implements ClientHelper {
 	}
 
 	@Override
-	public byte[] sign(String label, BdfList toSign, PrivateKey privateKey)
+	public byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException {
 		return crypto.sign(label, toByteArray(toSign), privateKey);
 	}
 
 	@Override
 	public void verifySignature(byte[] signature, String label, BdfList signed,
-			PublicKey publicKey)
-			throws FormatException, GeneralSecurityException {
+			byte[] publicKey) throws FormatException, GeneralSecurityException {
 		if (!crypto.verifySignature(signature, label, toByteArray(signed),
 				publicKey)) {
 			throw new GeneralSecurityException("Invalid signature");
@@ -331,29 +327,11 @@ class ClientHelperImpl implements ClientHelper {
 		if (formatVersion != FORMAT_VERSION) throw new FormatException();
 		String name = author.getString(1);
 		checkLength(name, 1, MAX_AUTHOR_NAME_LENGTH);
-		byte[] publicKeyBytes = author.getRaw(2);
-		checkLength(publicKeyBytes, 1, MAX_PUBLIC_KEY_LENGTH);
-		KeyParser parser = crypto.getSignatureKeyParser();
-		PublicKey publicKey;
-		try {
-			publicKey = parser.parsePublicKey(publicKeyBytes);
-		} catch (GeneralSecurityException e) {
-			throw new FormatException();
-		}
+		byte[] publicKey = author.getRaw(2);
+		checkLength(publicKey, 1, MAX_PUBLIC_KEY_LENGTH);
 		return authorFactory.createAuthor(formatVersion, name, publicKey);
 	}
 
-	@Override
-	public PublicKey parseAndValidateAgreementPublicKey(byte[] publicKeyBytes)
-			throws FormatException {
-		KeyParser parser = crypto.getAgreementKeyParser();
-		try {
-			return parser.parsePublicKey(publicKeyBytes);
-		} catch (GeneralSecurityException e) {
-			throw new FormatException();
-		}
-	}
-
 	@Override
 	public TransportProperties parseAndValidateTransportProperties(
 			BdfDictionary properties) throws FormatException {

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java

@@ -77,7 +77,7 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 	private volatile LocalAuthor localAuthor;
 	private volatile DuplexTransportConnection conn;
 	private volatile TransportId transportId;
-	private volatile SecretKey masterKey;
+	private volatile SecretKey masterSecret;
 	private volatile boolean alice;
 
 	@Inject
@@ -104,13 +104,13 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 	}
 
 	@Override
-	public void startExchange(LocalAuthor localAuthor, SecretKey masterKey,
+	public void startExchange(LocalAuthor localAuthor, SecretKey masterSecret,
 			DuplexTransportConnection conn, TransportId transportId,
 			boolean alice) {
 		this.localAuthor = localAuthor;
 		this.conn = conn;
 		this.transportId = transportId;
-		this.masterKey = masterKey;
+		this.masterSecret = masterSecret;
 		this.alice = alice;
 		start();
 	}
@@ -142,9 +142,9 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 		}
 
 		// Derive the header keys for the transport streams
-		SecretKey aliceHeaderKey = crypto.deriveKey(ALICE_KEY_LABEL, masterKey,
-				new byte[] {PROTOCOL_VERSION});
-		SecretKey bobHeaderKey = crypto.deriveKey(BOB_KEY_LABEL, masterKey,
+		SecretKey aliceHeaderKey = crypto.deriveKey(ALICE_KEY_LABEL,
+				masterSecret, new byte[] {PROTOCOL_VERSION});
+		SecretKey bobHeaderKey = crypto.deriveKey(BOB_KEY_LABEL, masterSecret,
 				new byte[] {PROTOCOL_VERSION});
 
 		// Create the readers
@@ -163,9 +163,9 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 						.createRecordWriter(streamWriter.getOutputStream());
 
 		// Derive the nonces to be signed
-		byte[] aliceNonce = crypto.mac(ALICE_NONCE_LABEL, masterKey,
+		byte[] aliceNonce = crypto.mac(ALICE_NONCE_LABEL, masterSecret,
 				new byte[] {PROTOCOL_VERSION});
-		byte[] bobNonce = crypto.mac(BOB_NONCE_LABEL, masterKey,
+		byte[] bobNonce = crypto.mac(BOB_NONCE_LABEL, masterSecret,
 				new byte[] {PROTOCOL_VERSION});
 		byte[] localNonce = alice ? aliceNonce : bobNonce;
 		byte[] remoteNonce = alice ? bobNonce : aliceNonce;
@@ -293,7 +293,7 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 			throws DbException {
 		return db.transactionWithResult(false, txn -> {
 			ContactId contactId = contactManager.addContact(txn, remoteAuthor,
-					localAuthor.getId(), masterKey, timestamp, alice,
+					localAuthor.getId(), masterSecret, timestamp, alice,
 					true, true);
 			transportPropertyManager.addRemoteProperties(txn, contactId,
 					remoteProperties);

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.contact;
 
-import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -19,44 +18,47 @@ import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.transport.KeyManager;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Random;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.BASE32_LINK_BYTES;
+import static java.util.Collections.emptyList;
+import static org.briarproject.bramble.api.contact.PendingContact.PendingContactState.WAITING_FOR_CONNECTION;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
 import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNKNOWN;
 import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED;
 import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
-import static org.briarproject.bramble.util.StringUtils.getRandomBase32String;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
 
 @ThreadSafe
 @NotNullByDefault
 class ContactManagerImpl implements ContactManager {
 
+	private static final int LINK_LENGTH = 64;
 	private static final String REMOTE_CONTACT_LINK =
-			"briar://" + getRandomBase32String(BASE32_LINK_BYTES);
+			"briar://" + getRandomBase32String(LINK_LENGTH);
+	private static final Pattern LINK_REGEX =
+			Pattern.compile("(briar://)?([a-z2-7]{" + LINK_LENGTH + "})");
 
 	private final DatabaseComponent db;
 	private final KeyManager keyManager;
 	private final IdentityManager identityManager;
-	private final PendingContactFactory pendingContactFactory;
 	private final List<ContactHook> hooks;
 
 	@Inject
 	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager,
-			IdentityManager identityManager,
-			PendingContactFactory pendingContactFactory) {
+			IdentityManager identityManager) {
 		this.db = db;
 		this.keyManager = keyManager;
 		this.identityManager = identityManager;
-		this.pendingContactFactory = pendingContactFactory;
 		hooks = new CopyOnWriteArrayList<>();
 	}
 
@@ -67,11 +69,10 @@ class ContactManagerImpl implements ContactManager {
 
 	@Override
 	public ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			SecretKey rootKey, long timestamp, boolean alice, boolean verified,
+			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException {
-		ContactId c = db.addContact(txn, remote, local, verified);
-		keyManager.addContactWithRotationKeys(txn, c, rootKey, timestamp,
-				alice, active);
+		ContactId c = db.addContact(txn, remote, local, verified, active);
+		keyManager.addContact(txn, c, master, timestamp, alice, active);
 		Contact contact = db.getContact(txn, c);
 		for (ContactHook hook : hooks) hook.addingContact(txn, contact);
 		return c;
@@ -79,45 +80,62 @@ class ContactManagerImpl implements ContactManager {
 
 	@Override
 	public ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			boolean verified) throws DbException {
-		ContactId c = db.addContact(txn, remote, local, verified);
+			boolean verified, boolean active) throws DbException {
+		ContactId c = db.addContact(txn, remote, local, verified, active);
 		Contact contact = db.getContact(txn, c);
 		for (ContactHook hook : hooks) hook.addingContact(txn, contact);
 		return c;
 	}
 
 	@Override
-	public ContactId addContact(Author remote, AuthorId local,
-			SecretKey rootKey, long timestamp, boolean alice, boolean verified,
-			boolean active) throws DbException {
+	public ContactId addContact(Author remote, AuthorId local, SecretKey master,
+			long timestamp, boolean alice, boolean verified, boolean active)
+			throws DbException {
 		return db.transactionWithResult(false, txn ->
-				addContact(txn, remote, local, rootKey, timestamp, alice,
+				addContact(txn, remote, local, master, timestamp, alice,
 						verified, active));
 	}
 
 	@Override
-	public String getHandshakeLink() {
+	public String getRemoteContactLink() {
 		// TODO replace with real implementation
 		return REMOTE_CONTACT_LINK;
 	}
 
-	@Override
-	public PendingContact addPendingContact(String link, String alias)
-			throws DbException, FormatException {
-		PendingContact p =
-				pendingContactFactory.createPendingContact(link, alias);
-		db.transaction(false, txn -> db.addPendingContact(txn, p));
-		return p;
+	@SuppressWarnings("SameParameterValue")
+	private static String getRandomBase32String(int length) {
+		Random random = new Random();
+		char[] c = new char[length];
+		for (int i = 0; i < length; i++) {
+			int character = random.nextInt(32);
+			if (character < 26) c[i] = (char) ('a' + character);
+			else c[i] = (char) ('2' + (character - 26));
+		}
+		return new String(c);
 	}
 
 	@Override
-	public Collection<PendingContact> getPendingContacts() throws DbException {
-		return db.transactionWithResult(true, db::getPendingContacts);
+	public boolean isValidRemoteContactLink(String link) {
+		return LINK_REGEX.matcher(link).matches();
 	}
 
 	@Override
-	public void removePendingContact(PendingContactId p) throws DbException {
-		db.transaction(false, txn -> db.removePendingContact(txn, p));
+	public PendingContact addRemoteContactRequest(String link, String alias) {
+		// TODO replace with real implementation
+		PendingContactId id = new PendingContactId(link.getBytes());
+		return new PendingContact(id, alias, WAITING_FOR_CONNECTION,
+				System.currentTimeMillis());
+	}
+
+	@Override
+	public Collection<PendingContact> getPendingContacts() {
+		// TODO replace with real implementation
+		return emptyList();
+	}
+
+	@Override
+	public void removePendingContact(PendingContact pendingContact) {
+		// TODO replace with real implementation
 	}
 
 	@Override
@@ -146,8 +164,12 @@ class ContactManagerImpl implements ContactManager {
 	}
 
 	@Override
-	public Collection<Contact> getContacts() throws DbException {
-		return db.transactionWithResult(true, db::getContacts);
+	public Collection<Contact> getActiveContacts() throws DbException {
+		Collection<Contact> contacts =
+				db.transactionWithResult(true, db::getContacts);
+		List<Contact> active = new ArrayList<>(contacts.size());
+		for (Contact c : contacts) if (c.isActive()) active.add(c);
+		return active;
 	}
 
 	@Override
@@ -155,6 +177,12 @@ class ContactManagerImpl implements ContactManager {
 		db.transaction(false, txn -> removeContact(txn, c));
 	}
 
+	@Override
+	public void setContactActive(Transaction txn, ContactId c, boolean active)
+			throws DbException {
+		db.setContactActive(txn, c, active);
+	}
+
 	@Override
 	public void setContactAlias(Transaction txn, ContactId c,
 			@Nullable String alias) throws DbException {

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactModule.java

@@ -28,10 +28,4 @@ public class ContactModule {
 			ContactExchangeTaskImpl contactExchangeTask) {
 		return contactExchangeTask;
 	}
-
-	@Provides
-	PendingContactFactory providePendingContactFactory(
-			PendingContactFactoryImpl pendingContactFactory) {
-		return pendingContactFactory;
-	}
 }

bramble-core/src/main/java/org/briarproject/bramble/contact/PendingContactFactory.java

@@ -1,18 +0,0 @@
-package org.briarproject.bramble.contact;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.UnsupportedVersionException;
-import org.briarproject.bramble.api.contact.PendingContact;
-
-interface PendingContactFactory {
-
-	/**
-	 * Creates a {@link PendingContact} from the given handshake link and alias.
-	 *
-	 * @throws UnsupportedVersionException If the link uses a format version
-	 * that is not supported
-	 * @throws FormatException If the link is invalid
-	 */
-	PendingContact createPendingContact(String link, String alias)
-			throws FormatException;
-}

bramble-core/src/main/java/org/briarproject/bramble/contact/PendingContactFactoryImpl.java

@@ -1,70 +0,0 @@
-package org.briarproject.bramble.contact;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.UnsupportedVersionException;
-import org.briarproject.bramble.api.contact.PendingContact;
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.crypto.KeyParser;
-import org.briarproject.bramble.api.crypto.PublicKey;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.util.Base32;
-
-import java.security.GeneralSecurityException;
-import java.util.regex.Matcher;
-
-import javax.inject.Inject;
-
-import static java.lang.System.arraycopy;
-import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.FORMAT_VERSION;
-import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.ID_LABEL;
-import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_REGEX;
-import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.RAW_LINK_BYTES;
-import static org.briarproject.bramble.api.contact.PendingContactState.WAITING_FOR_CONNECTION;
-
-class PendingContactFactoryImpl implements PendingContactFactory {
-
-	private final CryptoComponent crypto;
-	private final Clock clock;
-
-	@Inject
-	PendingContactFactoryImpl(CryptoComponent crypto, Clock clock) {
-		this.crypto = crypto;
-		this.clock = clock;
-	}
-
-	@Override
-	public PendingContact createPendingContact(String link, String alias)
-			throws FormatException {
-		PublicKey publicKey = parseHandshakeLink(link);
-		PendingContactId id = getPendingContactId(publicKey);
-		long timestamp = clock.currentTimeMillis();
-		return new PendingContact(id, publicKey, alias, WAITING_FOR_CONNECTION,
-				timestamp);
-	}
-
-	private PublicKey parseHandshakeLink(String link) throws FormatException {
-		Matcher matcher = LINK_REGEX.matcher(link);
-		if (!matcher.find()) throw new FormatException();
-		// Discard 'briar://' and anything before or after the link
-		link = matcher.group(2);
-		byte[] base32 = Base32.decode(link, false);
-		if (base32.length != RAW_LINK_BYTES) throw new AssertionError();
-		byte version = base32[0];
-		if (version != FORMAT_VERSION)
-			throw new UnsupportedVersionException(version < FORMAT_VERSION);
-		byte[] publicKeyBytes = new byte[base32.length - 1];
-		arraycopy(base32, 1, publicKeyBytes, 0, publicKeyBytes.length);
-		try {
-			KeyParser parser = crypto.getAgreementKeyParser();
-			return parser.parsePublicKey(publicKeyBytes);
-		} catch (GeneralSecurityException e) {
-			throw new FormatException();
-		}
-	}
-
-	private PendingContactId getPendingContactId(PublicKey publicKey) {
-		byte[] hash = crypto.hash(ID_LABEL, publicKey.getEncoded());
-		return new PendingContactId(hash);
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java

@@ -4,16 +4,12 @@ import net.i2p.crypto.eddsa.EdDSAPrivateKey;
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
 import net.i2p.crypto.eddsa.KeyPairGenerator;
 
-import org.briarproject.bramble.api.crypto.AgreementPrivateKey;
-import org.briarproject.bramble.api.crypto.AgreementPublicKey;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.crypto.SignaturePrivateKey;
-import org.briarproject.bramble.api.crypto.SignaturePublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 import org.briarproject.bramble.util.ByteUtils;
@@ -35,8 +31,6 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.INFO;
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_AGREEMENT;
-import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
 import static org.briarproject.bramble.util.ByteUtils.INT_32_BYTES;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.now;
@@ -86,8 +80,8 @@ class CryptoComponentImpl implements CryptoComponent {
 		signatureKeyPairGenerator = new KeyPairGenerator();
 		signatureKeyPairGenerator.initialize(SIGNATURE_KEY_PAIR_BITS,
 				secureRandom);
-		agreementKeyParser = new AgreementKeyParser();
-		signatureKeyParser = new SignatureKeyParser();
+		agreementKeyParser = new Curve25519KeyParser();
+		signatureKeyParser = new EdKeyParser();
 		messageEncrypter = new MessageEncrypter(secureRandom);
 	}
 
@@ -131,9 +125,9 @@ class CryptoComponentImpl implements CryptoComponent {
 	// Package access for testing
 	byte[] performRawKeyAgreement(PrivateKey priv, PublicKey pub)
 			throws GeneralSecurityException {
-		if (!priv.getKeyType().equals(KEY_TYPE_AGREEMENT))
+		if (!(priv instanceof Curve25519PrivateKey))
 			throw new IllegalArgumentException();
-		if (!pub.getKeyType().equals(KEY_TYPE_AGREEMENT))
+		if (!(pub instanceof Curve25519PublicKey))
 			throw new IllegalArgumentException();
 		long start = now();
 		byte[] secret = curve25519.calculateAgreement(pub.getEncoded(),
@@ -149,8 +143,8 @@ class CryptoComponentImpl implements CryptoComponent {
 	@Override
 	public KeyPair generateAgreementKeyPair() {
 		Curve25519KeyPair keyPair = curve25519.generateKeyPair();
-		PublicKey pub = new AgreementPublicKey(keyPair.getPublicKey());
-		PrivateKey priv = new AgreementPrivateKey(keyPair.getPrivateKey());
+		PublicKey pub = new Curve25519PublicKey(keyPair.getPublicKey());
+		PrivateKey priv = new Curve25519PrivateKey(keyPair.getPrivateKey());
 		return new KeyPair(pub, priv);
 	}
 
@@ -164,9 +158,9 @@ class CryptoComponentImpl implements CryptoComponent {
 		java.security.KeyPair keyPair =
 				signatureKeyPairGenerator.generateKeyPair();
 		EdDSAPublicKey edPublicKey = (EdDSAPublicKey) keyPair.getPublic();
-		PublicKey publicKey = new SignaturePublicKey(edPublicKey.getAbyte());
+		PublicKey publicKey = new EdPublicKey(edPublicKey.getAbyte());
 		EdDSAPrivateKey edPrivateKey = (EdDSAPrivateKey) keyPair.getPrivate();
-		PrivateKey privateKey = new SignaturePrivateKey(edPrivateKey.getSeed());
+		PrivateKey privateKey = new EdPrivateKey(edPrivateKey.getSeed());
 		return new KeyPair(publicKey, privateKey);
 	}
 
@@ -201,22 +195,21 @@ class CryptoComponentImpl implements CryptoComponent {
 	}
 
 	@Override
-	public byte[] sign(String label, byte[] toSign, PrivateKey privateKey)
+	public byte[] sign(String label, byte[] toSign, byte[] privateKey)
 			throws GeneralSecurityException {
+		PrivateKey key = signatureKeyParser.parsePrivateKey(privateKey);
 		Signature sig = new EdSignature();
-		sig.initSign(privateKey);
+		sig.initSign(key);
 		updateSignature(sig, label, toSign);
 		return sig.sign();
 	}
 
 	@Override
 	public boolean verifySignature(byte[] signature, String label,
-			byte[] signed, PublicKey publicKey)
-			throws GeneralSecurityException {
-		if (!publicKey.getKeyType().equals(KEY_TYPE_SIGNATURE))
-			throw new IllegalArgumentException();
+			byte[] signed, byte[] publicKey) throws GeneralSecurityException {
+		PublicKey key = signatureKeyParser.parsePublicKey(publicKey);
 		Signature sig = new EdSignature();
-		sig.initVerify(publicKey);
+		sig.initVerify(key);
 		updateSignature(sig, label, signed);
 		return sig.verify(signature);
 	}

bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519KeyParser.java

@@ -1,7 +1,5 @@
 package org.briarproject.bramble.crypto;
 
-import org.briarproject.bramble.api.crypto.AgreementPrivateKey;
-import org.briarproject.bramble.api.crypto.AgreementPublicKey;
 import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
@@ -9,24 +7,21 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.security.GeneralSecurityException;
 
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
 @NotNullByDefault
-class AgreementKeyParser implements KeyParser {
+class Curve25519KeyParser implements KeyParser {
 
 	@Override
 	public PublicKey parsePublicKey(byte[] encodedKey)
 			throws GeneralSecurityException {
 		if (encodedKey.length != 32) throw new GeneralSecurityException();
-		return new AgreementPublicKey(encodedKey);
+		return new Curve25519PublicKey(encodedKey);
 	}
 
 	@Override
 	public PrivateKey parsePrivateKey(byte[] encodedKey)
 			throws GeneralSecurityException {
 		if (encodedKey.length != 32) throw new GeneralSecurityException();
-		return new AgreementPrivateKey(clamp(encodedKey));
+		return new Curve25519PrivateKey(clamp(encodedKey));
 	}
 
 	static byte[] clamp(byte[] b) {

bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519PrivateKey.java

@@ -0,0 +1,18 @@
+package org.briarproject.bramble.crypto;
+
+import org.briarproject.bramble.api.Bytes;
+import org.briarproject.bramble.api.crypto.PrivateKey;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+class Curve25519PrivateKey extends Bytes implements PrivateKey {
+
+	Curve25519PrivateKey(byte[] bytes) {
+		super(bytes);
+	}
+
+	@Override
+	public byte[] getEncoded() {
+		return getBytes();
+	}
+}