diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 4768979e2..9e3d20f65 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -54,8 +54,7 @@ dependencies { implementation "org.briarproject:onionwrapper-android:$onionwrapper_version" tor "org.briarproject:tor-android:$tor_version" - tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version" - tor "org.briarproject:snowflake-android:$snowflake_version" + tor "org.briarproject:lyrebird-android:$lyrebird_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index 4e3ce3c5e..ff914e3e4 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -25,12 +25,11 @@ dependencyVerification { 'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047', 'org.briarproject:dont-kill-me-lib:0.2.8:dont-kill-me-lib-0.2.8.aar:e21173e480ee3f2364c142cc14db8dc6447be91bde9e62e4985c485ea0af9126', 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', + 'org.briarproject:lyrebird-android:0.5.0-2:lyrebird-android-0.5.0-2.jar:5ca2bd723c9eea692cab39ef70272407610b8dc359d267a3486e2f9d3a65d88b', 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', - 'org.briarproject:obfs4proxy-android:0.0.14-tor2:obfs4proxy-android-0.0.14-tor2.jar:a0a93770d6760ce57d9dbd31cc7177687374e00c3361dac22ab75e3b6e0f289e', - 'org.briarproject:onionwrapper-android:0.1.1:onionwrapper-android-0.1.1.aar:d761854dac454616b3e0ca099b2cd17060365ce4316afe495cc7ae86b6c81d15', - 'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b', - 'org.briarproject:snowflake-android:2.9.1:snowflake-android-2.9.1.jar:8d6195637edbe3717d205c2e524e9d3cb742b90fc67b10565d16262af134e489', - 'org.briarproject:tor-android:0.4.8.9-1:tor-android-0.4.8.9-1.jar:8fbaaf0cb1663abd12852b7fc51a804534b7e7d865b4dec3fc4e9ec0e79f3ad5', + 'org.briarproject:onionwrapper-android:0.1.2:onionwrapper-android-0.1.2.aar:15231f0b2ad44df8eb1dd362a989ba3f88ebdc9b02a9128daa72a8da83651bf0', + 'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257', + 'org.briarproject:tor-android:0.4.8.13:tor-android-0.4.8.13.jar:056fee77e7c6f1b60bc61234a882e53ee140ad4c4680015eec570f8d29a3430f', 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', 'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172', 'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9', diff --git a/bramble-core/witness.gradle b/bramble-core/witness.gradle index 7745b2579..0599fe3f7 100644 --- a/bramble-core/witness.gradle +++ b/bramble-core/witness.gradle @@ -34,7 +34,7 @@ dependencyVerification { 'org.bouncycastle:bcprov-jdk15to18:1.71:bcprov-jdk15to18-1.71.jar:143aaa4a40edd5fc2a18db7900059f6c16f4d931b94b94b20f7e2238e6662886', 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', - 'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b', + 'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257', 'org.briarproject:socks-socket:0.1:socks-socket-0.1.jar:e5898822d10f5390363c5dddb945891648c92cf93ba50709e07f0d173ec0eb4b', 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', 'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172', diff --git a/bramble-java/witness.gradle b/bramble-java/witness.gradle index 1ba5bc2e0..ed6ee2151 100644 --- a/bramble-java/witness.gradle +++ b/bramble-java/witness.gradle @@ -25,8 +25,8 @@ dependencyVerification { 'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047', 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', - 'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b', - 'org.briarproject:onionwrapper-java:0.1.1:onionwrapper-java-0.1.1.jar:96dbf1f5c72381b7c124d2d43748fcbe18db9cc8e3c950160954e10a6042f83d', + 'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257', + 'org.briarproject:onionwrapper-java:0.1.2:onionwrapper-java-0.1.2.jar:9cab70d6ead3528f9d2975c9bebe24c12c3bed4687d2aa0d3447694ebf747353', 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', 'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172', 'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9', diff --git a/briar-headless/build.gradle b/briar-headless/build.gradle index d04382630..cf369ecba 100644 --- a/briar-headless/build.gradle +++ b/briar-headless/build.gradle @@ -34,16 +34,13 @@ dependencies { implementation project(':briar-core') linux "org.briarproject:tor-linux:$tor_version" - linux "org.briarproject:obfs4proxy-linux:$obfs4proxy_version" - linux "org.briarproject:snowflake-linux:$snowflake_version" + linux "org.briarproject:lyrebird-linux:$lyrebird_version" windows "org.briarproject:tor-windows:$tor_version" - windows "org.briarproject:obfs4proxy-windows:$obfs4proxy_version" - windows "org.briarproject:snowflake-windows:$snowflake_version" + windows "org.briarproject:lyrebird-windows:$lyrebird_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:lyrebird-macos:$lyrebird_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'io.javalin:javalin:3.5.0' diff --git a/briar-headless/witness.gradle b/briar-headless/witness.gradle index 65d4f6f39..d31cfb2fa 100644 --- a/briar-headless/witness.gradle +++ b/briar-headless/witness.gradle @@ -39,18 +39,15 @@ dependencyVerification { 'org.apiguardian:apiguardian-api:1.1.0:apiguardian-api-1.1.0.jar:a9aae9ff8ae3e17a2a18f79175e82b16267c246fbbd3ca9dfbbb290b08dcfdd4', 'org.bouncycastle:bcprov-jdk15to18:1.71:bcprov-jdk15to18-1.71.jar:143aaa4a40edd5fc2a18db7900059f6c16f4d931b94b94b20f7e2238e6662886', 'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b', + 'org.briarproject:lyrebird-linux:0.5.0-2:lyrebird-linux-0.5.0-2.jar:8537a7b6d9cdcf880053df8b27250245f6920de4b3c54e58823edfddaf0336fc', + 'org.briarproject:lyrebird-macos:0.5.0-2:lyrebird-macos-0.5.0-2.jar:a166aa9f1085cb6f5c9e3f0e7ed94d61f8331889e8848755154cdff07ded25c2', + 'org.briarproject:lyrebird-windows:0.5.0-2:lyrebird-windows-0.5.0-2.jar:5ffafef98e75336b36301665b541cca894c11ea28d2b9a095562b47df6bae1f1', 'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011', - 'org.briarproject:obfs4proxy-linux:0.0.14-tor2:obfs4proxy-linux-0.0.14-tor2.jar:bb2431092b5ad998ad620b0223e725c0f7e43f1b02af2f097a2544edc1fd9738', - 'org.briarproject:obfs4proxy-macos:0.0.14-tor2:obfs4proxy-macos-0.0.14-tor2.jar:4a688d3a14d2510dd312213488c8f39ee08e609e47a7300aa12e31ceacb16ce2', - 'org.briarproject:obfs4proxy-windows:0.0.14-tor2:obfs4proxy-windows-0.0.14-tor2.jar:b5fbd00a8c35ccf095b265370752390e4cd46055331049c4dfcc236dc9c650ac', - 'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b', - 'org.briarproject:onionwrapper-java:0.1.1:onionwrapper-java-0.1.1.jar:96dbf1f5c72381b7c124d2d43748fcbe18db9cc8e3c950160954e10a6042f83d', - 'org.briarproject:snowflake-linux:2.9.1:snowflake-linux-2.9.1.jar:36b2f406f67a1bf3b4a6cecbba2e153ad939209cc9c22299e4161019dbae0e03', - 'org.briarproject:snowflake-macos:2.9.1:snowflake-macos-2.9.1.jar:0344fbac47026933c416bb25ffb534c819025db5dc9f132621492f959149807b', - 'org.briarproject:snowflake-windows:2.9.1:snowflake-windows-2.9.1.jar:54ac2f66c907bf1a256d695b7ea292851f7f8f8f960d5fb4822daa9babc182d4', - 'org.briarproject:tor-linux:0.4.8.9-1:tor-linux-0.4.8.9-1.jar:601b7bd5f0872f9501ef438bd3ce5ed22f8a3a7b77d6f2b063852987d87ed853', - 'org.briarproject:tor-macos:0.4.8.9-1:tor-macos-0.4.8.9-1.jar:8a01ce4c87399ae101f64249497e5406a737b55b87a79ae484ed061f3ea7387e', - 'org.briarproject:tor-windows:0.4.8.9-1:tor-windows-0.4.8.9-1.jar:e122e632fdcd4caa3c59f50f51168ec7ae235315bc0798391ba37b60766257b3', + 'org.briarproject:onionwrapper-core:0.1.2:onionwrapper-core-0.1.2.jar:65620cb183d6c392aec21f2e822a499329f89933e2235f7084eaf93ee2d36257', + 'org.briarproject:onionwrapper-java:0.1.2:onionwrapper-java-0.1.2.jar:9cab70d6ead3528f9d2975c9bebe24c12c3bed4687d2aa0d3447694ebf747353', + 'org.briarproject:tor-linux:0.4.8.13:tor-linux-0.4.8.13.jar:0b3151bfa26eb1c24ed75fa595da2e5c8c2dad11e182db39fc617c5223270ae7', + 'org.briarproject:tor-macos:0.4.8.13:tor-macos-0.4.8.13.jar:e3ebf87efbc948803058e2e1222c90f8393ce895325dcc2cba1088484c28175b', + 'org.briarproject:tor-windows:0.4.8.13:tor-windows-0.4.8.13.jar:d113cf976a27bef02975893db2fb981d782f21ce1995eef971b3400b81de830d', 'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a', 'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172', 'org.eclipse.jetty.websocket:websocket-api:9.4.20.v20190813:websocket-api-9.4.20.v20190813.jar:779a29060cc17bdeeeba147efc884ebff972cfff93dad2d37b11c93f95d4f67b', diff --git a/build.gradle b/build.gradle index a2174e0e1..572cd27f4 100644 --- a/build.gradle +++ b/build.gradle @@ -29,15 +29,14 @@ buildscript { dagger_version = "2.51.1" okhttp_version = "4.12.0" jackson_version = "2.13.4" - tor_version = "0.4.8.9-1" - obfs4proxy_version = "0.0.14-tor2" - snowflake_version = "2.9.1" + tor_version = "0.4.8.13" + lyrebird_version = "0.5.0-2" jsoup_version = '1.15.3' bouncy_castle_version = '1.71' // 1.72 accidentally depends on Java 7 junit_version = "4.13.2" jmock_version = '2.12.0' mockwebserver_version = '4.10.0' - onionwrapper_version = '0.1.1' + onionwrapper_version = '0.1.2' } dependencies { // upgrading this let's us run into https://github.com/gradle/gradle/issues/20330