From 34a5b69100a9a363b680a3b6f67370a1395368c9 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 4 Jun 2019 12:21:17 +0100
Subject: [PATCH] Reuse TransportCrypto#isAlice().

---
 .../briarproject/bramble/contact/HandshakeCrypto.java    | 3 ---
 .../bramble/contact/HandshakeCryptoImpl.java             | 9 ---------
 .../bramble/contact/HandshakeManagerImpl.java            | 6 +++++-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java
index 88d5a6fd5..bab35e6d1 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCrypto.java
@@ -10,9 +10,6 @@ import java.security.GeneralSecurityException;
 @NotNullByDefault
 interface HandshakeCrypto {
 
-	boolean isLocalPeerAlice(PublicKey theirStaticPublicKey,
-			KeyPair ourStaticKeyPair);
-
 	KeyPair generateEphemeralKeyPair();
 
 	/**
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java
index 5f77187e4..199bf16af 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeCryptoImpl.java
@@ -11,7 +11,6 @@ import java.security.GeneralSecurityException;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.api.Bytes.compare;
 import static org.briarproject.bramble.contact.HandshakeConstants.ALICE_PROOF_LABEL;
 import static org.briarproject.bramble.contact.HandshakeConstants.BOB_PROOF_LABEL;
 import static org.briarproject.bramble.contact.HandshakeConstants.MASTER_KEY_LABEL;
@@ -27,14 +26,6 @@ class HandshakeCryptoImpl implements HandshakeCrypto {
 		this.crypto = crypto;
 	}
 
-	@Override
-	public boolean isLocalPeerAlice(PublicKey theirStaticPublicKey,
-			KeyPair ourStaticKeyPair) {
-		byte[] ours = ourStaticKeyPair.getPublic().getEncoded();
-		byte[] theirs = theirStaticPublicKey.getEncoded();
-		return compare(ours, theirs) < 0;
-	}
-
 	@Override
 	public KeyPair generateEphemeralKeyPair() {
 		return crypto.generateAgreementKeyPair();
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java
index 73be7bf2d..7edeaf786 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/HandshakeManagerImpl.java
@@ -11,6 +11,7 @@ import org.briarproject.bramble.api.crypto.AgreementPublicKey;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
+import org.briarproject.bramble.api.crypto.TransportCrypto;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.TransactionManager;
@@ -54,6 +55,7 @@ class HandshakeManagerImpl implements HandshakeManager {
 	private final TransactionManager db;
 	private final IdentityManager identityManager;
 	private final ContactManager contactManager;
+	private final TransportCrypto transportCrypto;
 	private final HandshakeCrypto handshakeCrypto;
 	private final RecordReaderFactory recordReaderFactory;
 	private final RecordWriterFactory recordWriterFactory;
@@ -62,12 +64,14 @@ class HandshakeManagerImpl implements HandshakeManager {
 	HandshakeManagerImpl(DatabaseComponent db,
 			IdentityManager identityManager,
 			ContactManager contactManager,
+			TransportCrypto transportCrypto,
 			HandshakeCrypto handshakeCrypto,
 			RecordReaderFactory recordReaderFactory,
 			RecordWriterFactory recordWriterFactory) {
 		this.db = db;
 		this.identityManager = identityManager;
 		this.contactManager = contactManager;
+		this.transportCrypto = transportCrypto;
 		this.handshakeCrypto = handshakeCrypto;
 		this.recordReaderFactory = recordReaderFactory;
 		this.recordWriterFactory = recordWriterFactory;
@@ -84,7 +88,7 @@ class HandshakeManagerImpl implements HandshakeManager {
 		});
 		PublicKey theirStaticPublicKey = keys.getFirst();
 		KeyPair ourStaticKeyPair = keys.getSecond();
-		boolean alice = handshakeCrypto.isLocalPeerAlice(theirStaticPublicKey,
+		boolean alice = transportCrypto.isAlice(theirStaticPublicKey,
 				ourStaticKeyPair);
 		RecordReader recordReader = recordReaderFactory.createRecordReader(in);
 		RecordWriter recordWriter = recordWriterFactory