From e6a4dd6ff593b3bf8eb71f3df44bd2b687956ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= Date: Sat, 25 Mar 2023 12:22:06 +0100 Subject: [PATCH] WIP: for macos, use tor binaries from Tor Browser --- .../bramble/plugin/tor/UnixTorPluginFactory.java | 2 +- briar-headless/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java index 4d3aeaaa5..4e182cb65 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java @@ -68,7 +68,7 @@ public class UnixTorPluginFactory extends TorPluginFactory { else if (arch.equals("aarch64")) return "aarch64"; else if (arch.equals("arm")) return "armhf"; } else if (isMac()) { - if (arch.equals("aarch64")) return "aarch64"; + return "any"; } return null; } diff --git a/briar-headless/build.gradle b/briar-headless/build.gradle index f28a29226..2952bff59 100644 --- a/briar-headless/build.gradle +++ b/briar-headless/build.gradle @@ -41,9 +41,9 @@ dependencies { windows "org.briarproject:obfs4proxy-windows:$obfs4proxy_version" windows "org.briarproject:snowflake-windows:$snowflake_version" - macos "org.briarproject:tor-macos:$tor_version" - macos "org.briarproject:obfs4proxy-macos:$obfs4proxy_version" - macos "org.briarproject:snowflake-macos:$snowflake_version" + macos "org.briarproject:tor-macos-torbrowser:$tor_version" + macos "org.briarproject:obfs4proxy-macos-torbrowser:$obfs4proxy_version" + macos "org.briarproject:snowflake-macos-torbrowser:$snowflake_version" implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10' implementation 'io.javalin:javalin:3.5.0'