September 2014 - tor-commits - lists.torproject.org

[tor/master] Add script to detect and remove unCish malloc-then-cast pattern
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit ef9a0d204838768055194bd47acdb0074c2f13cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 16 10:57:00 2014 -0400 Add script to detect and remove unCish malloc-then-cast pattern Also, apply it. --- scripts/coccinelle/malloc_cast.cocci | 38 ++++++++++++++++++++++++++++++++++ src/or/circuitstats.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/scripts/coccinelle/malloc_cast.cocci b/scripts/coccinelle/malloc_cast.cocci new file mode 100644 index 0000000..20321d4 --- /dev/null +++ b/scripts/coccinelle/malloc_cast.cocci @@ -0,0 +1,38 @@ +@cast_malloc@ +expression e; +type T; +@@ +- (T *)tor_malloc(e) ++ tor_malloc(e) + +@cast_malloc_zero@ +expression e; +type T; +identifier func; +@@ +- (T *)tor_malloc_zero(e) ++ tor_malloc_zero(e) + +@cast_calloc@ +expression a, b; +type T; +identifier func; +@@ +- (T *)tor_calloc(a, b) ++ tor_calloc(a, b) + +@cast_realloc@ +expression e; +expression p; +type T; +@@ +- (T *)tor_realloc(p, e) ++ tor_realloc(p, e) + +@cast_reallocarray@ +expression a,b; +expression p; +type T; +@@ +- (T *)tor_reallocarray(p, a, b) ++ tor_reallocarray(p, a, b) diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 88a1f9b..c24259c 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -691,7 +691,7 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) if (cbt->total_build_times < CBT_NCIRCUITS_TO_OBSERVE) num_modes = 1; - nth_max_bin = (build_time_t*)tor_calloc(num_modes, sizeof(build_time_t)); + nth_max_bin = tor_calloc(num_modes, sizeof(build_time_t)); /* Determine the N most common build times */ for (i = 0; i < nbins; i++) {

1 0

[tor/master] clients now send correct address for rendezvous point
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit 0c3b3650aa831183c76b044466e89eaee36d5684 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 13 21:49:37 2014 -0400 clients now send correct address for rendezvous point Clients now send the correct address for their chosen rendezvous point when trying to access a hidden service. They used to send the wrong address, which would still work some of the time because they also sent the identity digest of the rendezvous point, and if the hidden service happened to try connecting to the rendezvous point from a relay that already had a connection open to it, the relay would reuse that connection. Now connections to hidden services should be more robust and faster. Also, this bug meant that clients were leaking to the hidden service whether they were on a little-endian (common) or big-endian (rare) system, which for some users might have reduced their anonymity. Fixes bug 13151; bugfix on 0.2.1.5-alpha. --- changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changes/bug13151-client b/changes/bug13151-client new file mode 100644 index 0000000..1218dfd --- /dev/null +++ b/changes/bug13151-client @@ -0,0 +1,13 @@ + o Major bugfixes: + - Clients now send the correct address for their chosen rendezvous + point when trying to access a hidden service. They used to send + the wrong address, which would still work some of the time because + they also sent the identity digest of the rendezvous point, and if + the hidden service happened to try connecting to the rendezvous + point from a relay that already had a connection open to it, + the relay would reuse that connection. Now connections to hidden + services should be more robust and faster. Also, this bug meant + that clients were leaking to the hidden service whether they were + on a little-endian (common) or big-endian (rare) system, which for + some users might have reduced their anonymity. Fixes bug 13151; + bugfix on 0.2.1.5-alpha. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index bb4bd9b..7abbfd6 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -269,7 +269,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, extend_info_t *extend_info = rendcirc->build_state->chosen_exit; int klen; /* nul pads */ - set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4h(&extend_info->addr)); + set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4n(&extend_info->addr)); set_uint16(tmp+v3_shift+5, htons(extend_info->port)); memcpy(tmp+v3_shift+7, extend_info->identity_digest, DIGEST_LEN); klen = crypto_pk_asn1_encode(extend_info->onion_key,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit be0e26272b3e795b902394acc9b66642fcdc1f21 Merge: 550c033 0c3b365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 16 11:10:02 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/master] Add coccinelle script to remove pointless callocs
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit 1bb10353ff30626dae0540de7422e90b30bd68a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 16 11:11:17 2014 -0400 Add coccinelle script to remove pointless callocs --- scripts/coccinelle/uncalloc.cocci | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/coccinelle/uncalloc.cocci b/scripts/coccinelle/uncalloc.cocci new file mode 100644 index 0000000..bf3f741 --- /dev/null +++ b/scripts/coccinelle/uncalloc.cocci @@ -0,0 +1,13 @@ + +@@ +expression a; +@@ +- tor_calloc(1, a) ++ tor_malloc_zero(a) + +@@ +expression a; +@@ +- tor_calloc(a, 1) ++ tor_malloc_zero(a) +

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit feee44577133e0f76add0ae9c03d2b722f05cbb8 Merge: 1bb1035 be0e262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 16 11:11:48 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.5] clients now send correct address for rendezvous point
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit 0c3b3650aa831183c76b044466e89eaee36d5684 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 13 21:49:37 2014 -0400 clients now send correct address for rendezvous point Clients now send the correct address for their chosen rendezvous point when trying to access a hidden service. They used to send the wrong address, which would still work some of the time because they also sent the identity digest of the rendezvous point, and if the hidden service happened to try connecting to the rendezvous point from a relay that already had a connection open to it, the relay would reuse that connection. Now connections to hidden services should be more robust and faster. Also, this bug meant that clients were leaking to the hidden service whether they were on a little-endian (common) or big-endian (rare) system, which for some users might have reduced their anonymity. Fixes bug 13151; bugfix on 0.2.1.5-alpha. --- changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changes/bug13151-client b/changes/bug13151-client new file mode 100644 index 0000000..1218dfd --- /dev/null +++ b/changes/bug13151-client @@ -0,0 +1,13 @@ + o Major bugfixes: + - Clients now send the correct address for their chosen rendezvous + point when trying to access a hidden service. They used to send + the wrong address, which would still work some of the time because + they also sent the identity digest of the rendezvous point, and if + the hidden service happened to try connecting to the rendezvous + point from a relay that already had a connection open to it, + the relay would reuse that connection. Now connections to hidden + services should be more robust and faster. Also, this bug meant + that clients were leaking to the hidden service whether they were + on a little-endian (common) or big-endian (rare) system, which for + some users might have reduced their anonymity. Fixes bug 13151; + bugfix on 0.2.1.5-alpha. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index bb4bd9b..7abbfd6 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -269,7 +269,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, extend_info_t *extend_info = rendcirc->build_state->chosen_exit; int klen; /* nul pads */ - set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4h(&extend_info->addr)); + set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4n(&extend_info->addr)); set_uint16(tmp+v3_shift+5, htons(extend_info->port)); memcpy(tmp+v3_shift+7, extend_info->identity_digest, DIGEST_LEN); klen = crypto_pk_asn1_encode(extend_info->onion_key,

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit be0e26272b3e795b902394acc9b66642fcdc1f21 Merge: 550c033 0c3b365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 16 11:10:02 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] clients now send correct address for rendezvous point
by nickm＠torproject.org 16 Sep '14

16 Sep '14

commit 0c3b3650aa831183c76b044466e89eaee36d5684 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 13 21:49:37 2014 -0400 clients now send correct address for rendezvous point Clients now send the correct address for their chosen rendezvous point when trying to access a hidden service. They used to send the wrong address, which would still work some of the time because they also sent the identity digest of the rendezvous point, and if the hidden service happened to try connecting to the rendezvous point from a relay that already had a connection open to it, the relay would reuse that connection. Now connections to hidden services should be more robust and faster. Also, this bug meant that clients were leaking to the hidden service whether they were on a little-endian (common) or big-endian (rare) system, which for some users might have reduced their anonymity. Fixes bug 13151; bugfix on 0.2.1.5-alpha. --- changes/bug13151-client | 13 +++++++++++++ src/or/rendclient.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changes/bug13151-client b/changes/bug13151-client new file mode 100644 index 0000000..1218dfd --- /dev/null +++ b/changes/bug13151-client @@ -0,0 +1,13 @@ + o Major bugfixes: + - Clients now send the correct address for their chosen rendezvous + point when trying to access a hidden service. They used to send + the wrong address, which would still work some of the time because + they also sent the identity digest of the rendezvous point, and if + the hidden service happened to try connecting to the rendezvous + point from a relay that already had a connection open to it, + the relay would reuse that connection. Now connections to hidden + services should be more robust and faster. Also, this bug meant + that clients were leaking to the hidden service whether they were + on a little-endian (common) or big-endian (rare) system, which for + some users might have reduced their anonymity. Fixes bug 13151; + bugfix on 0.2.1.5-alpha. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index bb4bd9b..7abbfd6 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -269,7 +269,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, extend_info_t *extend_info = rendcirc->build_state->chosen_exit; int klen; /* nul pads */ - set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4h(&extend_info->addr)); + set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4n(&extend_info->addr)); set_uint16(tmp+v3_shift+5, htons(extend_info->port)); memcpy(tmp+v3_shift+7, extend_info->identity_digest, DIGEST_LEN); klen = crypto_pk_asn1_encode(extend_info->onion_key,

1 0

[onionoo/master] Add next_major_version_scheduled field.
by karsten＠torproject.org 16 Sep '14

16 Sep '14

commit f04a923ecccb1dbcdcfbe3cb7da4e24a331a1422 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 16 15:39:51 2014 +0200 Add next_major_version_scheduled field. Discussed with iwakeh in #12905. --- ChangeLog | 8 +- .../torproject/onionoo/server/ResponseBuilder.java | 16 +++- web/protocol.html | 90 +++++++++++++++++++- 3 files changed, 105 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a1fe71..533541b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ Changes in version ?.?.? - 2014-??-?? + o Minor protocol changes: + - Add optional field "next_major_version_scheduled", changing protocol + version to 1.1. Implements #12905. + Changes in version 1.0.0 - 2014-09-16 - - First assigned version number. + + o Major protocol changes. + - First assigned version number. diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index c951fd3..d304c4d 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -69,12 +69,20 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "1.0"; + private static final String PROTOCOL_VERSION = "1.1"; + + private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { - String header = "{\"version\":\"" + PROTOCOL_VERSION - + "\",\n\"relays_published\":\"" + relaysPublishedString - + "\",\n\"relays\":["; + String nextMajorVersionScheduledLine = + NEXT_MAJOR_VERSION_SCHEDULED == null + ? "" + : String.format("\"next_major_version_scheduled\":\"%s\",\n", + NEXT_MAJOR_VERSION_SCHEDULED); + String header = String.format("{\"version\":\"%s\",\n" + + "%s\"relays_published\":\"%s\",\n\"relays\":[", + PROTOCOL_VERSION, nextMajorVersionScheduledLine, + relaysPublishedString); this.charsWritten += header.length(); pw.write(header); int written = 0; diff --git a/web/protocol.html b/web/protocol.html index 9a46c9e..e55d167 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -135,8 +135,8 @@ If you want to be informed of upcoming protocol changes, subscribe to the mailing list. -All responses contain a "version" string that indicates whether clients -know whether they can parse the document or not. +All responses contain a "version" string that +indicates whether clients can parse the document or not. Version strings consist of a major and a minor version number. The major version number is raised when previously required fields are dropped or turned into optional fields, when request parameters or @@ -147,12 +147,22 @@ If clients support the same major version given in a response but only a lower minor version, they should be able to parse the document but may not understand all fields. If clients support a lower major version, they should not attempt to parse -a document, because there may be backward-incompatible changes. -The following versions have been used in the past six months: +a document, because there may be backward-incompatible changes. + +Responses may also contain the optional +"next_major_version_scheduled" field that announces when +the next major version is scheduled to be deployed. +Clients should inform their users that they should upgrade to the next +major protocol version before the provided date. + +The following versions have been used in the past six months or are +scheduled to be deployed in the next months: <ul> <li>1.0: First assigned version number on August 31, 2014.</li> +<li>1.1: Added optional "next_major_version_scheduled" +field on September 16, 2014.</li> </ul> </div>  @@ -502,6 +512,18 @@ Onionoo protocol version string. </li> <li> +next_major_version_scheduled +<code class="typeof">string</code> +optional + +UTC date (YYYY-MM-DD) when the next major protocol version is scheduled to +be deployed. +Omitted if no major protocol changes are planned. +Added on September 16, 2014. + +</li> + +<li> relays_published <code class="typeof">string</code> required @@ -665,6 +687,18 @@ Onionoo protocol version string. </li> <li> +next_major_version_scheduled +<code class="typeof">string</code> +optional + +UTC date (YYYY-MM-DD) when the next major protocol version is scheduled to +be deployed. +Omitted if no major protocol changes are planned. +Added on September 16, 2014. + +</li> + +<li> relays_published <code class="typeof">string</code> required @@ -1450,6 +1484,18 @@ Onionoo protocol version string. </li> <li> +next_major_version_scheduled +<code class="typeof">string</code> +optional + +UTC date (YYYY-MM-DD) when the next major protocol version is scheduled to +be deployed. +Omitted if no major protocol changes are planned. +Added on September 16, 2014. + +</li> + +<li> relays_published <code class="typeof">string</code> required @@ -1623,6 +1669,18 @@ Onionoo protocol version string. </li> <li> +next_major_version_scheduled +<code class="typeof">string</code> +optional + +UTC date (YYYY-MM-DD) when the next major protocol version is scheduled to +be deployed. +Omitted if no major protocol changes are planned. +Added on September 16, 2014. + +</li> + +<li> relays_published <code class="typeof">string</code> required @@ -1828,6 +1886,18 @@ Onionoo protocol version string. </li> <li> +next_major_version_scheduled +<code class="typeof">string</code> +optional + +UTC date (YYYY-MM-DD) when the next major protocol version is scheduled to +be deployed. +Omitted if no major protocol changes are planned. +Added on September 16, 2014. + +</li> + +<li> relays_published <code class="typeof">string</code> required @@ -2006,6 +2076,18 @@ Onionoo protocol version string. </li> <li> +next_major_version_scheduled +<code class="typeof">string</code> +optional + +UTC date (YYYY-MM-DD) when the next major protocol version is scheduled to +be deployed. +Omitted if no major protocol changes are planned. +Added on September 16, 2014. + +</li> + +<li> relays_published <code class="typeof">string</code> required

1 0

[onionoo/master] Add version strings to jars in classpath.
by karsten＠torproject.org 16 Sep '14

16 Sep '14

commit aeabc6af45231a952655c8b652768fd535db325e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 15 12:40:00 2014 +0200 Add version strings to jars in classpath. This is mostly for documentation purposes. Suggested by iwakeh in #13088. --- build.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.xml b/build.xml index b4a9031..d6e1278 100644 --- a/build.xml +++ b/build.xml @@ -16,15 +16,15 @@ <path id="classpath"> <pathelement path="${classes}"/> <fileset dir="/usr/share/java"> - <include name="commons-codec.jar"/> - <include name="commons-compress.jar"/> - <include name="commons-lang.jar"/> - <include name="gson.jar"/> - <include name="junit4.jar"/> + <include name="commons-codec-1.6.jar"/> + <include name="commons-compress-1.4.1.jar"/> + <include name="commons-lang-2.6.jar"/> + <include name="gson-2.1.jar"/> + <include name="junit4-4.10.jar"/> <include name="servlet-api-3.0.jar"/> - <include name="logback-classic.jar"/> - <include name="logback-core.jar"/> - <include name="slf4j-api.jar"/> + <include name="logback-classic-1.0.4.jar"/> + <include name="logback-core-1.0.4.jar"/> + <include name="slf4j-api-1.6.5.jar"/> </fileset> <fileset dir="deps/metrics-lib"> <include name="descriptor.jar"/> @@ -96,13 +96,13 @@ <include name="descriptor.jar"/> </lib> <lib dir="/usr/share/java"> - <include name="slf4j-api.jar"/> - <include name="logback-classic.jar"/> - <include name="logback-core.jar"/> - <include name="commons-codec.jar"/> - <include name="commons-compress.jar"/> - <include name="commons-lang.jar"/> - <include name="gson.jar"/> + <include name="slf4j-api-1.6.5.jar"/> + <include name="logback-classic-1.0.4.jar"/> + <include name="logback-core-1.0.4.jar"/> + <include name="commons-codec-1.6.jar"/> + <include name="commons-compress-1.4.1.jar"/> + <include name="commons-lang-2.6.jar"/> + <include name="gson-2.1.jar"/> </lib> <classes dir="${classes}"/> <zipfileset dir="${config}"

1 0