From cb859e998de80ac05daa950ae17805235391f53b Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 8 Feb 2021 15:44:35 -0300 Subject: [PATCH 1/2] Upgrade Tor to 0.3.5.13 --- bramble-android/build.gradle | 2 +- bramble-android/witness.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 867cc9892..3ddc860e8 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -38,7 +38,7 @@ configurations { dependencies { implementation project(path: ':bramble-core', configuration: 'default') - tor 'org.briarproject:tor-android:0.3.5.12@zip' + tor 'org.briarproject:tor-android:0.3.5.13@zip' tor 'org.briarproject:obfs4proxy-android:0.0.11-2@zip' annotationProcessor 'com.google.dagger:dagger-compiler:2.24' diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index 0e011b20a..5d611b218 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -76,7 +76,7 @@ dependencyVerification { 'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca', 'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349', 'org.briarproject:obfs4proxy-android:0.0.11-2:obfs4proxy-android-0.0.11-2.zip:57e55cbe87aa2aac210fdbb6cd8cdeafe15f825406a08ebf77a8b787aa2c6a8a', - 'org.briarproject:tor-android:0.3.5.12:tor-android-0.3.5.12.zip:db71fb3290acff79d572af0752570eaf6aad7c4d88c9b9aa0b4d5afe2b9ead9c', + 'org.briarproject:tor-android:0.3.5.13:tor-android-0.3.5.13.zip:e0978db136731dae07774b722970cdae1e462fb5adc82845dd80a7e2d87f356c', 'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d', 'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a', 'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df', From 3d9515e308d29e1e55ce2513253a2f657f75dc5c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 9 Feb 2021 10:07:05 +0000 Subject: [PATCH 2/2] Also upgrade obfs4proxy and bramble-java's Tor. --- bramble-java/build.gradle | 4 ++-- bramble-java/witness.gradle | 4 ++-- briar-api/witness.gradle | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bramble-java/build.gradle b/bramble-java/build.gradle index f92835aab..5c2153813 100644 --- a/bramble-java/build.gradle +++ b/bramble-java/build.gradle @@ -16,8 +16,8 @@ dependencies { implementation fileTree(dir: 'libs', include: '*.jar') implementation 'net.java.dev.jna:jna:4.5.2' implementation 'net.java.dev.jna:jna-platform:4.5.2' - tor 'org.briarproject:tor:0.3.5.12@zip' - tor 'org.briarproject:obfs4proxy:0.0.7@zip' + tor 'org.briarproject:tor:0.3.5.13@zip' + tor 'org.briarproject:obfs4proxy:0.0.11-2@zip' annotationProcessor 'com.google.dagger:dagger-compiler:2.24' diff --git a/bramble-java/witness.gradle b/bramble-java/witness.gradle index ccc763a55..77f3c556b 100644 --- a/bramble-java/witness.gradle +++ b/bramble-java/witness.gradle @@ -23,8 +23,8 @@ 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.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8', - 'org.briarproject:obfs4proxy:0.0.7:obfs4proxy-0.0.7.zip:5b2f693262ce43a7e130f7cc7d5d1617925330640a2eb6d71085e95df8ee0642', - 'org.briarproject:tor:0.3.5.12:tor-0.3.5.12.zip:2f542c4befd216f2226bf7c76e3b8b2d99af6f146a8cb28bf727f42014587006', + 'org.briarproject:obfs4proxy:0.0.11-2:obfs4proxy-0.0.11-2.zip:152790964947a8a40b168d3a479cede8e6d9388411ec5ab5ff48027bd5e15d31', + 'org.briarproject:tor:0.3.5.13:tor-0.3.5.13.zip:1c5f0b821ee2aadb0ea04aa96caab3ca0a08370cce8de81c2dfe04d172f8a2a0', 'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d', 'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a', 'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53', diff --git a/briar-api/witness.gradle b/briar-api/witness.gradle index d65148d71..1c1e01f7e 100644 --- a/briar-api/witness.gradle +++ b/briar-api/witness.gradle @@ -1,8 +1,10 @@ dependencyVerification { verify = [ + 'junit:junit:4.13.1:junit-4.13.1.jar:c30719db974d6452793fe191b3638a5777005485bae145924044530ffa5f6122', 'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619', 'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90', 'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52', + 'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9', 'org.ow2.asm:asm-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d', ] }