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

[tor/master] Add a unit test for tor_log_mallinfo()
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit fe00a481fc4a6a514c46978b9476684398933336 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 17:15:10 2018 -0400 Add a unit test for tor_log_mallinfo() --- src/test/test_util.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index c3c0e6df3..b395110cd 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6262,6 +6262,57 @@ test_util_get_unquoted_path(… [View More]

1 0

[tor/master] Add unit tests for parsing "extended" format of config lines.
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit f124037cdeac666e7e76a47f8aef2108b40672b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 6 16:57:51 2018 -0400 Add unit tests for parsing "extended" format of config lines. --- src/test/test_config.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 907e3a1fb..bf21a8d51 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5745,6 +5745,72 @… [View More]@ test_config_compute_max_mem_in_queues(void *data) #undef MEGABYTE } +static void +test_config_extended_fmt(void *arg) +{ + (void)arg; + config_line_t *lines = NULL, *lp; + const char string1[] = + "thing1 is here\n" + "+thing2 is over here\n" + "/thing3\n" + "/thing4 is back here\n"; + + /* Try with the "extended" flag disabled. */ + int r = config_get_lines(string1, &lines, 0); + tt_int_op(r, OP_EQ, 0); + lp = lines; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "thing1"); + tt_str_op(lp->value, OP_EQ, "is here"); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL); + lp = lp->next; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "+thing2"); + tt_str_op(lp->value, OP_EQ, "is over here"); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL); + lp = lp->next; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "/thing3"); + tt_str_op(lp->value, OP_EQ, ""); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL); + lp = lp->next; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "/thing4"); + tt_str_op(lp->value, OP_EQ, "is back here"); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL); + lp = lp->next; + config_free_lines(lines); + + /* Try with the "extended" flag enabled. */ + r = config_get_lines(string1, &lines, 1); + tt_int_op(r, OP_EQ, 0); + lp = lines; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "thing1"); + tt_str_op(lp->value, OP_EQ, "is here"); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL); + lp = lp->next; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "thing2"); + tt_str_op(lp->value, OP_EQ, "is over here"); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_APPEND); + lp = lp->next; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "thing3"); + tt_str_op(lp->value, OP_EQ, ""); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_CLEAR); + lp = lp->next; + tt_ptr_op(lp, OP_NE, NULL); + tt_str_op(lp->key, OP_EQ, "thing4"); + tt_str_op(lp->value, OP_EQ, ""); + tt_int_op(lp->command, OP_EQ, CONFIG_LINE_CLEAR); + lp = lp->next; + + done: + config_free_lines(lines); +} + #define CONFIG_TEST(name, flags) \ { #name, test_config_ ## name, flags, NULL, NULL } @@ -5795,5 +5861,6 @@ struct testcase_t config_tests[] = { CONFIG_TEST(check_bridge_distribution_setting_unrecognised, 0), CONFIG_TEST(include_opened_file_list, 0), CONFIG_TEST(compute_max_mem_in_queues, 0), + CONFIG_TEST(extended_fmt, 0), END_OF_TESTCASES }; [View Less]

1 0

[tor-browser-build/master] Bump OpenSSL version to 1.0.2p
by gk＠torproject.org 21 Aug '18

21 Aug '18

commit 4ac367e5eb035b9fa79a58de9a324f77ee2a9db8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 21 15:24:57 2018 +0000 Bump OpenSSL version to 1.0.2p --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index fe1c5fa..d3ed959 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2o +version: 1.0.2p filename:… [View More]

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit df874ed0f198156ca59bdca24259b229dbd55102 Merge: 700f5bcc4 4c0c4d4ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:01:41 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26873 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Add changes file for 26873. I missed this when merging earlier.
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit 4c0c4d4ade2f5e87202055d44a1226c4af8397dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:01:38 2018 -0400 Add changes file for 26873. I missed this when merging earlier. --- changes/bug26873 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug26873 b/changes/bug26873 new file mode 100644 index 000000000..565f8bf0b --- /dev/null +++ b/changes/bug26873 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Fix compilation of the unit … [View More]

1 0

[tor/release-0.3.3] Add changes file for 26873. I missed this when merging earlier.
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit 4c0c4d4ade2f5e87202055d44a1226c4af8397dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:01:38 2018 -0400 Add changes file for 26873. I missed this when merging earlier. --- changes/bug26873 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug26873 b/changes/bug26873 new file mode 100644 index 000000000..565f8bf0b --- /dev/null +++ b/changes/bug26873 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Fix compilation of the unit … [View More]

1 0

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

21 Aug '18

commit d32ffe58001bd7219ae43e52989cb2db093cd169 Merge: 4f2ef558e 4c0c4d4ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:01:41 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26873 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit 9bc947dc18b71449454992c0cecf3b6811b74603 Merge: aab6aea19 df874ed0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:01:41 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26873 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/release-0.3.4] Add changes file for 26873. I missed this when merging earlier.
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit 4c0c4d4ade2f5e87202055d44a1226c4af8397dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:01:38 2018 -0400 Add changes file for 26873. I missed this when merging earlier. --- changes/bug26873 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug26873 b/changes/bug26873 new file mode 100644 index 000000000..565f8bf0b --- /dev/null +++ b/changes/bug26873 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Fix compilation of the unit … [View More]

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 21 Aug '18

21 Aug '18

commit cc7a75dc03d34ffd038292a6ff0acf42d649cc4f Merge: 71e563f26 df874ed0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:01:41 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26873 | 4 ++++ 1 file changed, 4 insertions(+)

1 0