- tor-commits - lists.torproject.org

[orbot/master] Merge branch '1984-bridges' of https://github.com/mrphs/orbot into dev_nima_1984_bridges
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit 043b151fb1ea57f9e9843c89cb2c18bb4e087ae0 Merge: c8584f6 5eb628b Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 11:05:37 2016 -0500 Merge branch '1984-bridges' of https://github.com/mrphs/orbot into dev_nima_1984_bridges assets/bridges.txt | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[orbot/master] update to orbot ant build version
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit 9a8e4dd80f9b2a6542900f4a8595f2495f4021ef Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 12:33:12 2016 -0500 update to orbot ant build version --- external/superuser-commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/superuser-commands b/external/superuser-commands index be997be..d38520e 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit be997be8fff6dc00cd249fdfd128d6820461db99 +Subproject commit d38520e6c80aaf84bcc1c0eb0f5c904c0e8b79af

1 0

[orbot/master] update git submodules
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit 00f82f0913f6e5ac4be1070034acf3a3be2bc18f Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 13:19:15 2016 -0500 update git submodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 517f919..665ab2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ ignore = dirty [submodule "external/superuser-commands"] path = external/superuser-commands - url = https://github.com/dschuermann/superuser-commands.git + url = https://github.com/guardianproject/RootCommands.git ignore = dirty [submodule "external/polipo"] path = external/polipo

1 0

[orbot/master] handle NPE better for dev.gp.info #6686
by n8fr8＠torproject.org 22 Feb '16

22 Feb '16

commit e9d28a4445f3dc055f05649792965b249102933c Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 15:07:40 2016 -0500 handle NPE better for dev.gp.info #6686 in some cases the connection becomes null while you are interacting with it --- src/org/torproject/android/service/TorService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 94e3317..12da009 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -2245,9 +2245,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setConf("DisableNetwork","0"); } - catch (IOException ioe) + catch (Exception ioe) { - ioe.printStackTrace(); + Log.e(TAG, "Connection exception occured resetting exits",ioe); } } } @@ -2270,12 +2270,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setConf("DisableNetwork","1"); conn.setConf("DisableNetwork","0"); - } - catch (IOException ioe) + catch (Exception ioe) { - ioe.printStackTrace(); + Log.e(TAG, "Connection exception occured resetting exits",ioe); } } }

1 0

[tor/master] Add a missing free in parsing an :auto port
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit bb431ad3dfae6941a0bd615b17283ca8c0a5fe4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 15:51:43 2016 -0500 Add a missing free in parsing an :auto port Fixes bug 18374; bugfix on 0.2.3.3-alpha. --- changes/bug18374 | 3 +++ src/or/config.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug18374 b/changes/bug18374 new file mode 100644 index 0000000..4764c53 --- /dev/null +++ b/changes/bug18374 @@ -0,0 +1,3 @@ + o Minor bugfixes (configuration): + - Fix a tiny memory leak when parsing a port configuration ending in + ":auto". Fixes bug 18374; bugfix on 0.2.3.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 5273d5a..ba02e9f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6373,6 +6373,7 @@ parse_port_config(smartlist_t *out, tor_free(addrtmp); goto err; } + tor_free(addrtmp); } else { /* Try parsing integer port before address, because, who knows? "9050" might be a valid address. */

1 0

[tor/master] asan does not like TO_CONN(NULL)
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit ef42c00cf0b3a10673a80dd8cf98c683fb68a33e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 15:45:37 2016 -0500 asan does not like TO_CONN(NULL) --- changes/test_asan | 3 +++ src/test/test_dir_handle_get.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/changes/test_asan b/changes/test_asan new file mode 100644 index 0000000..ce0aa97 --- /dev/null +++ b/changes/test_asan @@ -0,0 +1,3 @@ + o Testing: + - Fix several warnings from clang's address sanitizer produced in the + unit tests. diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index e1ac50e..c81ed7b 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2255,7 +2255,6 @@ status_vote_next_consensus_signatures_test(char **header, char **body, static void test_dir_handle_get_status_vote_next_consensus_signatures_not_found(void* data) { - dir_connection_t *conn = NULL; char *header = NULL, *body = NULL; size_t body_used; (void) data; @@ -2266,7 +2265,6 @@ test_dir_handle_get_status_vote_next_consensus_signatures_not_found(void* data) tt_str_op(NOT_FOUND, OP_EQ, header); done: - connection_free_(TO_CONN(conn)); tor_free(header); tor_free(body); } @@ -2308,7 +2306,6 @@ test_dir_handle_get_status_vote_next_consensus_signatures(void* data) static void test_dir_handle_get_status_vote_next_consensus_signatures_busy(void* data) { - dir_connection_t *conn = NULL; char *header = NULL, *body = NULL; size_t body_used; (void) data; @@ -2328,7 +2325,6 @@ test_dir_handle_get_status_vote_next_consensus_signatures_busy(void* data) done: UNMOCK(get_options); NS_UNMOCK(dirvote_get_pending_detached_signatures); - connection_free_(TO_CONN(conn)); tor_free(header); tor_free(body); or_options_free(mock_options); mock_options = NULL;

1 0

[tor/master] Define O_NOFOLLOW on platforms that do not have it
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 1e9950847c1035244b0c15c50276b06014286e6b Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Feb 19 12:45:36 2016 +0000 Define O_NOFOLLOW on platforms that do not have it Fixes #18339 --- src/common/util.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/util.h b/src/common/util.h index d05ffa7..d42b5b2 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -29,6 +29,9 @@ #ifndef O_TEXT #define O_TEXT 0 #endif +#ifndef O_NOFOLLOW +#define O_NOFOLLOW 0 +#endif /* Replace assert() with a variant that sends failures to the log before * calling assert() normally.

1 0

[tor/master] Update to trunnel 1.4.4 to fix 18373
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit a508119169388fbef84204cb7f8e25b84823b71e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 14:19:29 2016 -0500 Update to trunnel 1.4.4 to fix 18373 --- changes/trunnel_update | 5 +++++ src/ext/trunnel/trunnel-impl.h | 2 +- src/ext/trunnel/trunnel.c | 2 +- src/ext/trunnel/trunnel.h | 2 +- src/trunnel/ed25519_cert.c | 8 +++++--- src/trunnel/ed25519_cert.h | 2 +- src/trunnel/link_handshake.c | 20 +++++++++++++------- src/trunnel/link_handshake.h | 2 +- src/trunnel/pwbox.c | 14 +++++++++----- src/trunnel/pwbox.h | 2 +- 10 files changed, 38 insertions(+), 21 deletions(-) diff --git a/changes/trunnel_update b/changes/trunnel_update new file mode 100644 index 0000000..4f8c185 --- /dev/null +++ b/changes/trunnel_update @@ -0,0 +1,5 @@ + o Minor bugfixes (code correctness): + - Update to the latest version of Trunnel, which tries harder + to avoid generating code that can invoke memcpy(p,NULL,0). + Bug found by clang address sanitizer. Fixes bug 18373. Bugfix + on 0.2.7.2-alpha. diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index a97caf2..dfe5f89 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/src/ext/trunnel/trunnel-impl.h @@ -1,4 +1,4 @@ -/* trunnel-impl.h -- copied from Trunnel v1.4.3 +/* trunnel-impl.h -- copied from Trunnel v1.4.4 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index 25a46d9..0ed75aa 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,4 +1,4 @@ -/* trunnel.c -- copied from Trunnel v1.4.3 +/* trunnel.c -- copied from Trunnel v1.4.4 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 6140a39..62e87ee 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,4 +1,4 @@ -/* trunnel.h -- copied from Trunnel v1.4.3 +/* trunnel.h -- copied from Trunnel v1.4.4 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c index ee010db..f495743 100644 --- a/src/trunnel/ed25519_cert.c +++ b/src/trunnel/ed25519_cert.c @@ -1,4 +1,4 @@ -/* ed25519_cert.c -- generated by Trunnel v1.4.3. +/* ed25519_cert.c -- generated by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -289,7 +289,8 @@ ed25519_cert_extension_encode(uint8_t *output, const size_t avail, const ed25519 trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->un_unparsed.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->un_unparsed.elts_, elt_len); written += elt_len; ptr += elt_len; } break; @@ -374,7 +375,8 @@ ed25519_cert_extension_parse_into(ed25519_cert_extension_t *obj, const uint8_t * /* Parse u8 un_unparsed[] */ TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->un_unparsed, remaining, {}); obj->un_unparsed.n_ = remaining; - memcpy(obj->un_unparsed.elts_, ptr, remaining); + if (remaining) + memcpy(obj->un_unparsed.elts_, ptr, remaining); ptr += remaining; remaining -= remaining; break; } diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h index face810..75a82d8 100644 --- a/src/trunnel/ed25519_cert.h +++ b/src/trunnel/ed25519_cert.h @@ -1,4 +1,4 @@ -/* ed25519_cert.h -- generated by by Trunnel v1.4.3. +/* ed25519_cert.h -- generated by by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c index f9b55f0..3ef7341 100644 --- a/src/trunnel/link_handshake.c +++ b/src/trunnel/link_handshake.c @@ -1,4 +1,4 @@ -/* link_handshake.c -- generated by Trunnel v1.4.3. +/* link_handshake.c -- generated by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -537,7 +537,8 @@ certs_cell_cert_encode(uint8_t *output, const size_t avail, const certs_cell_cer trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->body.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->body.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -589,7 +590,8 @@ certs_cell_cert_parse_into(certs_cell_cert_t *obj, const uint8_t *input, const s CHECK_REMAINING(obj->cert_len, truncated); TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->body, obj->cert_len, {}); obj->body.n_ = obj->cert_len; - memcpy(obj->body.elts_, ptr, obj->cert_len); + if (obj->cert_len) + memcpy(obj->body.elts_, ptr, obj->cert_len); ptr += obj->cert_len; remaining -= obj->cert_len; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; @@ -840,7 +842,8 @@ rsa_ed_crosscert_encode(uint8_t *output, const size_t avail, const rsa_ed_crossc trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->sig.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->sig.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -899,7 +902,8 @@ rsa_ed_crosscert_parse_into(rsa_ed_crosscert_t *obj, const uint8_t *input, const CHECK_REMAINING(obj->sig_len, truncated); TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->sig, obj->sig_len, {}); obj->sig.n_ = obj->sig_len; - memcpy(obj->sig.elts_, ptr, obj->sig_len); + if (obj->sig_len) + memcpy(obj->sig.elts_, ptr, obj->sig_len); ptr += obj->sig_len; remaining -= obj->sig_len; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; @@ -1467,7 +1471,8 @@ auth1_encode(uint8_t *output, const size_t avail, const auth1_t *obj, const auth trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->sig.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->sig.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -1576,7 +1581,8 @@ auth1_parse_into(auth1_t *obj, const uint8_t *input, const size_t len_in, const /* Parse u8 sig[] */ TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->sig, remaining, {}); obj->sig.n_ = remaining; - memcpy(obj->sig.elts_, ptr, remaining); + if (remaining) + memcpy(obj->sig.elts_, ptr, remaining); ptr += remaining; remaining -= remaining; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h index 60bc28f..2749ec7 100644 --- a/src/trunnel/link_handshake.h +++ b/src/trunnel/link_handshake.h @@ -1,4 +1,4 @@ -/* link_handshake.h -- generated by by Trunnel v1.4.3. +/* link_handshake.h -- generated by by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index a80fbb9..9b348a9 100644 --- a/src/trunnel/pwbox.c +++ b/src/trunnel/pwbox.c @@ -1,4 +1,4 @@ -/* pwbox.c -- generated by Trunnel v1.4.3. +/* pwbox.c -- generated by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -362,7 +362,8 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj) trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->skey_header.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->skey_header.elts_, elt_len); written += elt_len; ptr += elt_len; } @@ -380,7 +381,8 @@ pwbox_encoded_encode(uint8_t *output, size_t avail, const pwbox_encoded_t *obj) trunnel_assert(written <= avail); if (avail - written < elt_len) goto truncated; - memcpy(ptr, obj->data.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->data.elts_, elt_len); written += elt_len; ptr += elt_len; } trunnel_assert(written <= avail); @@ -460,7 +462,8 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_ CHECK_REMAINING(obj->header_len, truncated); TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->skey_header, obj->header_len, {}); obj->skey_header.n_ = obj->header_len; - memcpy(obj->skey_header.elts_, ptr, obj->header_len); + if (obj->header_len) + memcpy(obj->skey_header.elts_, ptr, obj->header_len); ptr += obj->header_len; remaining -= obj->header_len; /* Parse u8 iv[16] */ @@ -476,7 +479,8 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_ /* Parse u8 data[] */ TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->data, remaining, {}); obj->data.n_ = remaining; - memcpy(obj->data.elts_, ptr, remaining); + if (remaining) + memcpy(obj->data.elts_, ptr, remaining); ptr += remaining; remaining -= remaining; if (remaining != 0) goto fail; diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h index c357932..e69e2c1 100644 --- a/src/trunnel/pwbox.h +++ b/src/trunnel/pwbox.h @@ -1,4 +1,4 @@ -/* pwbox.h -- generated by by Trunnel v1.4.3. +/* pwbox.h -- generated by by Trunnel v1.4.4. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */

1 0

[trunnel/master] In generated code, never pass NULL to memcpy even with length 0
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 4dfe3f98c031a05f2da84211ce857dbec514f4ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 14:12:00 2016 -0500 In generated code, never pass NULL to memcpy even with length 0 The C standard says that you can never say memcpy(x, NULL, 0), even though most libcs permit it. Found with asan. --- lib/trunnel/CodeGen.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 038cdd8..16047b3 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -2190,7 +2190,8 @@ class EncodeFnGenerator(CodeGenerator): self.checkAvail("elt_len", sva) self.popIndent(2) self.format(""" - memcpy(ptr, obj->{c_name}.elts_, elt_len); + if (elt_len) + memcpy(ptr, obj->{c_name}.elts_, elt_len); written += elt_len; ptr += elt_len; }}""", c_name=sva.c_name) return @@ -2597,7 +2598,8 @@ class ParseFnGenerator(CodeGenerator): self.format(""" TRUNNEL_DYNARRAY_EXPAND({tp}, &obj->{c_name}, {w}, {{}}); obj->{c_name}.n_ = {w}; - memcpy({elt}, ptr, {w}); + if ({w}) + memcpy({elt}, ptr, {w}); """, w=w, elt=elt, tp=tp, c_name=sva.c_name) self.format('ptr += {w}; remaining -= {w};\n', w=w)

1 0

[trunnel/master] bump version to 1.4.4
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit 5c0c45ab8e66ec7299e553d2e7d92289a2796cf4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 14:13:03 2016 -0500 bump version to 1.4.4 --- lib/trunnel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py index 3078c7b..c875874 100644 --- a/lib/trunnel/__init__.py +++ b/lib/trunnel/__init__.py @@ -3,4 +3,4 @@ # a package. # -__version__ = "1.4.3" +__version__ = "1.4.4"

1 0