March 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.3] add a changes file for the rust libc update
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 3cc382b93e6ae55b86c50463493507c6d01250cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 08:10:54 2018 -0400 add a changes file for the rust libc update --- changes/bug25664 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug25664 b/changes/bug25664 new file mode 100644 index 000000000..c8b3ca618 --- /dev/null +++ b/changes/bug25664 @@ -0,0 +1,3 @@ + o New system requirements: + - When built with Rust, Tor now depends on version 0.2.39 of the libc + crate. Closes tickets 25310 and 25664.

1 0

[tor/maint-0.3.3] Bug 25664: Update libc version requirement for Rust
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 684aef40f9f003adf211ae29de47905b1109a06c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 28 10:19:31 2018 +0000 Bug 25664: Update libc version requirement for Rust When merging the patches for #25310 the libc version requirement in `GettingStartedRust.md` and `configure.ac` did not get updated to the now needed 0.2.39. --- configure.ac | 2 +- doc/HACKING/GettingStartedRust.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6c6add187..2b9bc8595 100644 --- a/configure.ac +++ b/configure.ac @@ -275,7 +275,7 @@ fi AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version -rust_crates="libc-0.2.22" +rust_crates="libc-0.2.39" AC_SUBST(rust_crates) ifdef([AC_C_FLEXIBLE_ARRAY_MEMBER], [ diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index f5914bc87..a533ba8a2 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -65,7 +65,7 @@ fetching dependencies from Cargo or specifying a local directory. You'll need the following Rust dependencies (as of this writing): - libc==0.2.22 + libc==0.2.39 We vendor our Rust dependencies in a separate repo using [cargo-vendor](https://github.com/alexcrichton/cargo-vendor). To use

1 0

[tor/master] add a changes file for the rust libc update
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 3cc382b93e6ae55b86c50463493507c6d01250cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 08:10:54 2018 -0400 add a changes file for the rust libc update --- changes/bug25664 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug25664 b/changes/bug25664 new file mode 100644 index 000000000..c8b3ca618 --- /dev/null +++ b/changes/bug25664 @@ -0,0 +1,3 @@ + o New system requirements: + - When built with Rust, Tor now depends on version 0.2.39 of the libc + crate. Closes tickets 25310 and 25664.

1 0

[tor/master] Bug 25664: Update libc version requirement for Rust
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 684aef40f9f003adf211ae29de47905b1109a06c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 28 10:19:31 2018 +0000 Bug 25664: Update libc version requirement for Rust When merging the patches for #25310 the libc version requirement in `GettingStartedRust.md` and `configure.ac` did not get updated to the now needed 0.2.39. --- configure.ac | 2 +- doc/HACKING/GettingStartedRust.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6c6add187..2b9bc8595 100644 --- a/configure.ac +++ b/configure.ac @@ -275,7 +275,7 @@ fi AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version -rust_crates="libc-0.2.22" +rust_crates="libc-0.2.39" AC_SUBST(rust_crates) ifdef([AC_C_FLEXIBLE_ARRAY_MEMBER], [ diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index f5914bc87..a533ba8a2 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -65,7 +65,7 @@ fetching dependencies from Cargo or specifying a local directory. You'll need the following Rust dependencies (as of this writing): - libc==0.2.22 + libc==0.2.39 We vendor our Rust dependencies in a separate repo using [cargo-vendor](https://github.com/alexcrichton/cargo-vendor). To use

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit a3c1d78c29a6827f623c83ca8f45798019206bc9 Merge: 6317aa2cc 3cc382b93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 08:11:46 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25664 | 3 +++ configure.ac | 2 +- doc/HACKING/GettingStartedRust.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Bug 25664: Update libc version requirement for Rust
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 684aef40f9f003adf211ae29de47905b1109a06c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 28 10:19:31 2018 +0000 Bug 25664: Update libc version requirement for Rust When merging the patches for #25310 the libc version requirement in `GettingStartedRust.md` and `configure.ac` did not get updated to the now needed 0.2.39. --- configure.ac | 2 +- doc/HACKING/GettingStartedRust.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6c6add187..2b9bc8595 100644 --- a/configure.ac +++ b/configure.ac @@ -275,7 +275,7 @@ fi AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"]) dnl List all external rust crates we depend on here. Include the version -rust_crates="libc-0.2.22" +rust_crates="libc-0.2.39" AC_SUBST(rust_crates) ifdef([AC_C_FLEXIBLE_ARRAY_MEMBER], [ diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index f5914bc87..a533ba8a2 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -65,7 +65,7 @@ fetching dependencies from Cargo or specifying a local directory. You'll need the following Rust dependencies (as of this writing): - libc==0.2.22 + libc==0.2.39 We vendor our Rust dependencies in a separate repo using [cargo-vendor](https://github.com/alexcrichton/cargo-vendor). To use

1 0

[tor/release-0.3.3] add a changes file for the rust libc update
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 3cc382b93e6ae55b86c50463493507c6d01250cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 08:10:54 2018 -0400 add a changes file for the rust libc update --- changes/bug25664 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug25664 b/changes/bug25664 new file mode 100644 index 000000000..c8b3ca618 --- /dev/null +++ b/changes/bug25664 @@ -0,0 +1,3 @@ + o New system requirements: + - When built with Rust, Tor now depends on version 0.2.39 of the libc + crate. Closes tickets 25310 and 25664.

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit e31487b4edde5e2e45491f5c32c421acd133ada6 Merge: 08cd7a1bf 3cc382b93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 08:11:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25664 | 3 +++ configure.ac | 2 +- doc/HACKING/GettingStartedRust.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.3] Fix bracketed IPv6 string validation
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit b0ba4aa7e98af030e0e1be19a58ab7a6f00fa423 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Feb 12 19:52:47 2018 +0100 Fix bracketed IPv6 string validation --- src/common/util.c | 15 ++++++++++++++- src/test/test_socks.c | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 7c715fb3c..ea0ec3dae 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1079,9 +1079,22 @@ string_is_valid_ipv6_address(const char *string) int string_is_valid_dest(const char *string) { - return string_is_valid_ipv4_address(string) || + char *tmp = NULL; + int retval; + + tor_assert(string); + tor_assert(strlen(string) > 0); + + if (string[0] == '[' && string[strlen(string) - 1] == ']') + string = tmp = tor_strndup(string + 1, strlen(string) - 2); + + retval = string_is_valid_ipv4_address(string) || string_is_valid_ipv6_address(string) || string_is_valid_hostname(string); + + tor_free(tmp); + + return retval; } /** Return true iff <b>string</b> matches a pattern of DNS names diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 70509e43e..3f9cc887b 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -355,7 +355,7 @@ test_socks_5_supported_commands(void *ptr) ADD_DATA(buf, "[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"); ADD_DATA(buf, "\x01\x02"); tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, 1), - OP_EQ, -1); + OP_EQ, 1); tt_str_op("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]", OP_EQ, socks->address);

1 0

[tor/maint-0.3.3] Call strlen() once
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 5986589b48de6addf99436df1feeea1362767acb Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Feb 12 21:08:17 2018 +0100 Call strlen() once --- src/common/util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index ea0ec3dae..d8891c6a5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1081,12 +1081,13 @@ string_is_valid_dest(const char *string) { char *tmp = NULL; int retval; + size_t len = strlen(string); tor_assert(string); - tor_assert(strlen(string) > 0); + tor_assert(len > 0); - if (string[0] == '[' && string[strlen(string) - 1] == ']') - string = tmp = tor_strndup(string + 1, strlen(string) - 2); + if (string[0] == '[' && string[len - 1] == ']') + string = tmp = tor_strndup(string + 1, len - 2); retval = string_is_valid_ipv4_address(string) || string_is_valid_ipv6_address(string) ||

1 0