October 2019 - tor-commits - lists.torproject.org

[tor/master] Changes file for bug 31001
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 97d73db7c36ec3fac2974726012f76bff63f9dfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 09:21:08 2019 -0400 Changes file for bug 31001 --- changes/ticket31001 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket31001 b/changes/ticket31001 new file mode 100644 index 000000000..2ce1cbdf3 --- /dev/null +++ b/changes/ticket31001 @@ -0,0 +1,6 @@ + o Minor bugfixes (compatibility, standards compliance): + - Fix a bug that would invoke undefined behavior on certain operating + systems when trying to asprintf() a string exactly INT_MAX bytes + long. We don't believe this is exploitable, but it's better + to fix it anyway. Fixes bug 31001; bugfix on 0.2.2.11-alpha. + Found and fixed by Tobias Stoeckmann.

1 0

[tor/master] Tidy whitespace around some STMT_BEGINs and STMT_ENDs
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 339c18d6c745208b939d3db08f7cd0f2a6504d7c Author: teor <teor(a)torproject.org> Date: Wed Oct 23 07:37:39 2019 +1000 Tidy whitespace around some STMT_BEGINs and STMT_ENDs --- src/app/config/config.c | 3 ++- src/feature/nodelist/node_select.c | 2 +- src/test/test_dir.c | 1 - src/tools/tor-resolve.c | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 337ae9357..68305aa65 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4494,7 +4494,8 @@ options_validate(or_options_t *old_options, or_options_t *options, or_options_free(dflt_options); \ REJECT(#arg " may only be changed in testing Tor " \ "networks!"); \ - } STMT_END + } \ + STMT_END /* Check for options that can only be changed from the defaults in testing networks. */ diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index 719b4b1b2..8ac0b664c 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -147,7 +147,7 @@ router_pick_dirserver_generic(smartlist_t *sourcelist, try_ip_pref = 0; \ goto retry_label; \ } \ - STMT_END \ + STMT_END /* Common retry code for router_pick_directory_server_impl and * router_pick_trusteddirserver_impl. Retry without excluding nodes, but with diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6329ff775..73a25dfed 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -635,7 +635,6 @@ setup_dir_formats_options(const char *arg, or_options_t *options) STMT_BEGIN \ tt_assert(r1); \ tt_assert(rp1); \ -\ tt_int_op(rp1->addr,OP_EQ, r1->addr); \ tt_int_op(rp1->or_port,OP_EQ, r1->or_port); \ tt_int_op(rp1->dir_port,OP_EQ, r1->dir_port); \ diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 5d97696c1..25bda2654 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -45,8 +45,10 @@ #define RESPONSE_LEN_4 8 #define log_sock_error(act, _s) \ - STMT_BEGIN log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act, \ - tor_socket_strerror(tor_socket_errno(_s))); STMT_END + STMT_BEGIN \ + log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act, \ + tor_socket_strerror(tor_socket_errno(_s))); \ + STMT_END static void usage(void) ATTR_NORETURN;

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 1ea19d7a5bf538f5b9f0988c2375966f88d87867 Merge: 21c3488af 7660a7cf7 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:24:30 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 `git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 003be727c4a88c04424cb13429cf36f887e92f5c Merge: 1ea19d7a5 41bc1fac8 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:28:03 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 changes/bug23507 | 5 +++++ changes/bug23818_v2 | 6 ++++++ changes/bug23818_v3 | 6 ++++++ src/feature/hs/hs_circuit.c | 28 ++++++++++++++++++++++------ src/feature/hs/hs_circuit.h | 3 ++- src/feature/hs/hs_service.c | 30 +++++++++++++++++++++++------- src/feature/rend/rendservice.c | 19 +++++++++++++++---- 7 files changed, 79 insertions(+), 18 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit c77162e4e95fdfd6a5cc422802dee943750b14b7 Merge: 27965f1ef da5c8277e Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:32:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 .appveyor.yml | 6 +++--- .travis.yml | 6 ++++-- changes/ticket31372_appveyor | 4 ++++ changes/ticket31372_travis | 4 ++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --cc .travis.yml index 1523ba8ca,64f8380bc..8f7e8e4be --- a/.travis.yml +++ b/.travis.yml @@@ -15,13 -15,17 +15,15 @@@ compiler os: - linux - - osx -## The build matrix in the following stanza expands into builds for each -## OS and compiler. +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: env: global: - ## The Travis CI environment allows us two cores, so let's use both. - - MAKEFLAGS="-j 2" + ## The Travis CI environment allows us two cores, so let's use both. Also, + ## let's use the "-k" flag so that we get all of the compilation failures, + ## not just the first one. + - MAKEFLAGS="-k -j 2" ## We turn on hardening by default ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later - HARDENING_OPTIONS="--enable-expensive-hardening"

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 Merge: 003be727c 05fa1689e Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:30:48 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 7660a7cf7d4191e44aba0bf3e02a001d7e979d29 Merge: 511aeba8e 97d73db7c Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:20:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 changes/ticket31001 | 6 ++++++ src/common/compat.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 641f1304475402c975ede04b11e9be7c8675411b Merge: 4013e50cb 246fdd874 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:35:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0 .appveyor.yml | 6 +++--- .travis.yml | 6 ++++-- changes/ticket31372_appveyor | 4 ++++ changes/ticket31372_travis | 4 ++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --cc .travis.yml index c48294f36,595be57a9..6078210c5 --- a/.travis.yml +++ b/.travis.yml @@@ -15,13 -15,17 +15,15 @@@ compiler os: - linux - - osx -## The build matrix in the following stanza expands into builds for each -## OS and compiler. +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: env: global: - ## The Travis CI environment allows us two cores, so let's use both. - - MAKEFLAGS="-j 2" + ## The Travis CI environment allows us two cores, so let's use both. Also, + ## let's use the "-k" flag so that we get all of the compilation failures, + ## not just the first one. + - MAKEFLAGS="-k -j 2" ## We turn on hardening by default ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later - HARDENING_OPTIONS="--enable-expensive-hardening"

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 8682442c7629c2ede5198a00ab1cf8f4e21991d6 Merge: 7660a7cf7 6ed3d8dbd Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:32:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 .travis.yml | 6 ++++-- changes/ticket31372_travis | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --cc .travis.yml index 7c7fcf4f6,759710737..d429e1537 --- a/.travis.yml +++ b/.travis.yml @@@ -8,13 -8,17 +8,15 @@@ compiler os: - linux - - osx -## The build matrix in the following stanza expands into builds for each -## OS and compiler. +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: env: global: - ## The Travis CI environment allows us two cores, so let's use both. - - MAKEFLAGS="-j 2" + ## The Travis CI environment allows us two cores, so let's use both. Also, + ## let's use the "-k" flag so that we get all of the compilation failures, + ## not just the first one. + - MAKEFLAGS="-k -j 2" ## We turn on hardening by default ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later - HARDENING_OPTIONS="--enable-expensive-hardening"

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9 Merge: 641f13044 d175e7081 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 08:47:08 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug12399 | 3 +++ changes/bug23507 | 5 +++++ changes/bug23818_v2 | 6 ++++++ changes/bug23818_v3 | 6 ++++++ src/feature/hs/hs_circuit.c | 28 ++++++++++++++++++++++------ src/feature/hs/hs_circuit.h | 3 ++- src/feature/hs/hs_service.c | 30 +++++++++++++++++++++++------- src/feature/rend/rendmid.c | 3 ++- src/feature/rend/rendservice.c | 19 +++++++++++++++---- 9 files changed, 84 insertions(+), 19 deletions(-)

1 0