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

[tor/maint-0.4.1] Fix #28525 changes file that is breaking CI.
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit c35aded00a19f26f3124584e7d0f561cf579efec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Mar 12 20:11:51 2019 +0200 Fix #28525 changes file that is breaking CI. --- changes/bug28525 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/changes/bug28525 b/changes/bug28525 index 392a9265e..988ffb219 100644 --- a/changes/bug28525 +++ b/changes/bug28525 @@ -1,8 +1,7 @@ - o Minor bugfixes (address selection): + o Minor features (address selection): - Make Tor aware of the RFC 6598 (Carrier Grade NAT) IP range, which is the subnet 100.64.0.0/10. This is deployed by many ISPs as an alternative to RFC 1918 that does not break existing internal networks. This patch fixes security issues caused by RFC 6518 by blocking control ports on these addresses and warns users if client ports or ExtORPorts are listening on - a RFC 6598 address. Fixes bug 28525; bugfix on 0.4.1.1-alpha. Patch by - Neel Chauhan. + a RFC 6598 address. Closes ticket 28525. Patch by Neel Chauhan.

1 0

[tor/maint-0.4.1] test/relay: add a missing typedef
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 031ed59dbaf62d9cebd09f98f563c228fe6822f6 Author: teor <teor(a)torproject.org> Date: Wed Apr 17 11:14:05 2019 +1000 test/relay: add a missing typedef In 0.3.4 and later, these functions are declared in rephist.h: STATIC uint64_t find_largest_max(bw_array_t *b); STATIC void commit_max(bw_array_t *b); STATIC void advance_obs(bw_array_t *b); But in 0.2.9, they are declared in rephist.c and test_relay.c. So compilers fail with a "must use 'struct' tag" error. We add the missing struct typedef in test_relay.c, to match the declarations in rephist.c. (Merge commit 813019cc57 moves these functions into rephist.h instead.) Fixes bug 30184; not in any released version of Tor. --- src/test/test_relay.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 57dcb2406..d4ebb2338 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -19,6 +19,8 @@ static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan); static void test_relay_append_cell_to_circuit_queue(void *arg); + +typedef struct bw_array_t bw_array_t; uint64_t find_largest_max(bw_array_t *b); void commit_max(bw_array_t *b); void advance_obs(bw_array_t *b);

1 0

[tor/maint-0.4.1] Merge branch 'bug30184_029' into bug30184_034
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit dfdd877647ef496b2b4a82e8c1e6040692ecebb5 Merge: 48e990359 031ed59db Author: teor <teor(a)torproject.org> Date: Wed Apr 17 11:51:32 2019 +1000 Merge branch 'bug30184_029' into bug30184_034 "ours" merge, because 0.3.4 has a different set of changes, which already compile.

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 45f30ba5faf1c27fd8404c2fb95b1a79b9f59984 Merge: 05018d55c 63b404911 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 13:53:34 2019 +1000 Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9 changes/bug28525 | 8 ++++++++ src/common/address.c | 19 +++++++++++++++---- src/test/test_addr.c | 18 ++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 1ba2bd3599e94bb2fa533cde9e1ef296b4124ce4 Merge: e3ba9b7a7 8f0b29961 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 14:01:50 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5 changes/bug30561 | 6 ++++++ src/lib/string/printf.c | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 8a4635a5fe951dd9fa917eb670c8d3138b3d0b90 Merge: 7502881de fb3f46140 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 14:05:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0 changes/bug30781 | 4 ++++ src/feature/dirparse/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.4.1] Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 37bd7fa50d0901a87084b71299cc8c8786cd1cd8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 13:14:28 2019 -0400 Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9 --- src/or/buffers.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 394ba0ccb..b36e4ab50 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -394,10 +394,6 @@ buf_free(buf_t *buf) { if (!buf) return; - if (BUG(buf_out->datalen >= INT_MAX || buf_in->datalen >= INT_MAX)) - return; - if (BUG(buf_out->datalen >= INT_MAX - buf_in->datalen)) - return; buf_clear(buf); buf->magic = 0xdeadbeef; @@ -2067,4 +2063,3 @@ assert_buf_ok(buf_t *buf) tor_assert(buf->datalen == total); } } -

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 6205810f8ed93c15f3f7be7fbb98d1cad15ae29c Merge: d4184fca3 dfdd87764 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 13:50:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 654769bcec3e98bea5e3ac48b2aabffcbe55375e Merge: 1ba2bd359 c8c2e2b8f Author: teor <teor(a)torproject.org> Date: Fri Aug 9 14:05:26 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5 changes/bug30781 | 4 ++++ src/feature/dirparse/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
by teor＠torproject.org 10 Aug '19

10 Aug '19

commit 1a9555e28352c0807527126a2e5b3fd6b95fe8a0 Merge: 6205810f8 08ddf1f62 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 13:53:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5 changes/bug28525 | 8 ++++++++ src/lib/net/address.c | 19 +++++++++++++++---- src/test/test_addr.c | 18 ++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-)

1 0