Merge branch '574-upgrade-tor' into 'master'

Upgrade Tor to 0.2.9 Closes #574 See merge request !542

Merge branch '574-upgrade-tor' into 'master'
Upgrade Tor to 0.2.9 Closes #574 See merge request !542
d24de68d · Torsten Grote · f5dc6f24 · 37454392 · d24de68d · d24de68d
Commit d24de68d authored 7 years ago by Torsten Grote
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -32,31 +32,31 @@ dependencies {
 def torBinaryDir = 'src/main/res/raw'

 task downloadTorGeoIp(type: Download) {
-	src 'https://briarproject.org/build/geoip-2015-12-01.zip'
+	src 'https://briarproject.org/build/geoip-2017-05-02.zip'
 	dest "$torBinaryDir/geoip.zip"
 	onlyIfNewer true
 }

 task downloadTorBinaryArm(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-arm.zip'
+	src 'https://briarproject.org/build/tor-0.2.9.11-arm.zip'
 	dest "$torBinaryDir/tor_arm.zip"
 	onlyIfNewer true
 }

 task downloadTorBinaryArmPie(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-arm-pie.zip'
+	src 'https://briarproject.org/build/tor-0.2.9.11-arm-pie.zip'
 	dest "$torBinaryDir/tor_arm_pie.zip"
 	onlyIfNewer true
 }

 task downloadTorBinaryX86(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-x86.zip'
+	src 'https://briarproject.org/build/tor-0.2.9.11-x86.zip'
 	dest "$torBinaryDir/tor_x86.zip"
 	onlyIfNewer true
 }

 task downloadTorBinaryX86Pie(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.7.6-x86-pie.zip'
+	src 'https://briarproject.org/build/tor-0.2.9.11-x86-pie.zip'
 	dest "$torBinaryDir/tor_x86_pie.zip"
 	onlyIfNewer true
 }
@@ -64,31 +64,31 @@ task downloadTorBinaryX86Pie(type: Download) {
 task verifyTorGeoIp(type: Verify, dependsOn: 'downloadTorGeoIp') {
 	src "$torBinaryDir/geoip.zip"
 	algorithm 'SHA-256'
-	checksum '9bcdaf0a7ba0933735328d8ec466c25c25dbb459efc2bce9e55c774eabea5162'
+	checksum '51f4d1272fb867e1f3b36b67a584e2a33c40b40f62305457d799fd399cd77c9b'
 }

 task verifyTorBinaryArm(type: Verify, dependsOn: 'downloadTorBinaryArm') {
 	src "$torBinaryDir/tor_arm.zip"
 	algorithm 'SHA-256'
-	checksum '83272962eda701cd5d74d2418651c4ff0f0b1dff51f558a292d1a1c42bf12146'
+	checksum '1da6008663a8ad98b349e62acbbf42c379f65ec504fa467cb119c187cd5a4c6b'
 }

 task verifyTorBinaryArmPie(type: Verify, dependsOn: 'downloadTorBinaryArmPie') {
 	src "$torBinaryDir/tor_arm_pie.zip"
 	algorithm 'SHA-256'
-	checksum 'd0300d1e45de11ebb24ed62b9c492be9c2e88590b7822195ab38c7a76ffcf646'
+	checksum 'eb061f880829e05f104690ac744848133f2dacef04759d425a2cff0df32c271e'
 }

 task verifyTorBinaryX86(type: Verify, dependsOn: 'downloadTorBinaryX86') {
 	src "$torBinaryDir/tor_x86.zip"
 	algorithm 'SHA-256'
-	checksum 'b8813d97b01ee1b9c9a4233c1b9bbe9f9f6b494ae6f9cbd84de8a3911911615e'
+	checksum 'f5308aff8303daca082f82227d02b51ddedba4ab1d1420739ada0427ae5dbb41'
 }

 task verifyTorBinaryX86Pie(type: Verify, dependsOn: 'downloadTorBinaryX86Pie') {
 	src "$torBinaryDir/tor_x86_pie.zip"
 	algorithm 'SHA-256'
-	checksum '9c66e765aa196dc089951a1b2140cc8290305c2fcbf365121f99e01a233baf4e'
+	checksum '889a6c81ac73d05d35ed610ca5a913cee44d333e4ae1749c2a107f2f7dd8197b'
 }

 project.afterEvaluate {

--- a/patches/tor.patch
+++ b/patches/tor.patch
 diff --git a/src/or/control.c b/src/or/control.c
-index 220e7e5..a54c8a2 100644
+index c8c5062..f38ba23 100644
 --- a/src/or/control.c
 +++ b/src/or/control.c
-@@ -176,6 +176,8 @@ static int handle_control_hsfetch(control_connection_t *conn, uint32_t len,
+@@ -196,6 +196,8 @@ static int handle_control_hsfetch(control_connection_t *conn, uint32_t len,
                                   const char *body);
 static int handle_control_hspost(control_connection_t *conn, uint32_t len,
                                  const char *body);
@@ -11,10 +11,10 @@ index 220e7e5..a54c8a2 100644
 static int handle_control_add_onion(control_connection_t *conn, uint32_t len,
                                     const char *body);
 static int handle_control_del_onion(control_connection_t *conn, uint32_t len,
-@@ -3725,6 +3727,33 @@ handle_control_hspost(control_connection_t *conn,
+@@ -4246,6 +4248,33 @@ handle_control_hspost(control_connection_t *conn,
   return 0;
 }
- 
+
 +/** Called when we get an HSFORGET command: parse the hidden service's onion
 + * address and purge any cached state related to the service. */
 +static int
@@ -45,7 +45,7 @@ index 220e7e5..a54c8a2 100644
 /** Called when we get a ADD_ONION command; parse the body, and set up
  * the new ephemeral Onion Service. */
 static int
-@@ -4396,6 +4425,9 @@ connection_control_process_inbuf(control_connection_t *conn)
+@@ -5065,6 +5094,9 @@ connection_control_process_inbuf(control_connection_t *conn)
   } else if (!strcasecmp(conn->incoming_cmd, "+HSPOST")) {
     if (handle_control_hspost(conn, cmd_data_len, args))
       return -1;
@@ -56,13 +56,13 @@ index 220e7e5..a54c8a2 100644
     int ret = handle_control_add_onion(conn, cmd_data_len, args);
     memwipe(args, 0, cmd_data_len); /* Scrub the private key. */
 diff --git a/src/or/rendcache.c b/src/or/rendcache.c
-index d4bdd68..b9d79b8 100644
+index aa69d73..473a6a4 100644
 --- a/src/or/rendcache.c
 +++ b/src/or/rendcache.c
-@@ -535,6 +535,34 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e)
+@@ -587,6 +587,34 @@ rend_cache_lookup_v2_desc_as_service(const char *query, rend_cache_entry_t **e)
   return ret;
 }
- 
+
 +/** Remove any cached descriptors for <b>service_id</b>. */
 +void
 +rend_cache_remove_entry(const char *service_id)
@@ -95,25 +95,25 @@ index d4bdd68..b9d79b8 100644
  * copy the pointer to it to *<b>desc</b>.  Return 1 on success, 0 on
  * well-formed-but-not-found, and -1 on failure.
 diff --git a/src/or/rendcache.h b/src/or/rendcache.h
-index 0512058..2c8ebfd 100644
+index 270b614..69d1b1b 100644
 --- a/src/or/rendcache.h
 +++ b/src/or/rendcache.h
-@@ -56,6 +56,7 @@ void rend_cache_purge(void);
+@@ -61,6 +61,7 @@ void rend_cache_purge(void);
 void rend_cache_free_all(void);
 int rend_cache_lookup_entry(const char *query, int version,
                             rend_cache_entry_t **entry_out);
 +void rend_cache_remove_entry(const char *service_id);
+ int rend_cache_lookup_v2_desc_as_service(const char *query,
+                                          rend_cache_entry_t **entry_out);
 int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc);
- /** Return value from rend_cache_store_v2_desc_as_{dir,client}. */
- typedef enum {
 diff --git a/src/or/rendclient.c b/src/or/rendclient.c
-index a39e518..909e47f 100644
+index a93bc94..f311e1f 100644
 --- a/src/or/rendclient.c
 +++ b/src/or/rendclient.c
 @@ -32,6 +32,9 @@ static extend_info_t *rend_client_get_random_intro_impl(
                           const rend_cache_entry_t *rend_query,
                           const int strict, const int warnings);
- 
+
 +static void purge_hid_serv_from_last_hid_serv_requests(
 +                          const char *onion_address);
 +
@@ -123,7 +123,7 @@ index a39e518..909e47f 100644
 @@ -43,6 +46,15 @@ rend_client_purge_state(void)
   rend_client_purge_last_hid_serv_requests();
 }
- 
+
 +/** Purge all cached state relating to the given hidden service. */
 +void
 +rend_client_purge_hidden_service(const char *onion_address)
@@ -137,14 +137,17 @@ index a39e518..909e47f 100644
  * send the introduction request. */
 void
 diff --git a/src/or/rendclient.h b/src/or/rendclient.h
-index 124433e..b27d2db 100644
+index b8f8c2f..b1da48c 100644
 --- a/src/or/rendclient.h
 +++ b/src/or/rendclient.h
 @@ -15,6 +15,7 @@
 #include "rendcache.h"
- 
+
 void rend_client_purge_state(void);
 +void rend_client_purge_hidden_service(const char *onion_address);
- 
+
 void rend_client_introcirc_has_opened(origin_circuit_t *circ);
 void rend_client_rendcirc_has_opened(origin_circuit_t *circ);
+--
+2.9.3
+