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

[tor/release-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit db112329a0358a8e9138c782ee48c5e3f3d1f35d Merge: 44e105c27f f20f5a4e37 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:35:35 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Stop calling evdns_set_random_bytes_fn()
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit f20f5a4e376d254e069fed66a321bc9cdd537096 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 16 17:26:59 2021 -0400 Stop calling evdns_set_random_bytes_fn() This function has been a no-op since Libevent 2.0.4-alpha, when libevent got an arc4random() implementation. Libevent has finally removed it, which will break our compilation unless we stop calling it. (This is currently breaking compilation in OSS-fuzz.) Closes #40371. --- changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug40371 b/changes/bug40371 new file mode 100644 index 0000000000..8cc7117f9f --- /dev/null +++ b/changes/bug40371 @@ -0,0 +1,6 @@ + o Minor bugfixes (compatibility): + - Fix compatibility with the most recent Libevent versions, which + no longer have an evdns_set_random_bytes() function. Because + this function has been a no-op since Libevent 2.0.4-alpha, + it is safe for us to just stop calling it. Fixes bug 40371; + bugfix on 0.2.1.7-alpha. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index e20a39482f..075d7d7063 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -224,7 +224,6 @@ int dns_init(void) { init_cache_map(); - evdns_set_random_bytes_fn(dns_randfn_); if (server_mode(get_options())) { int r = configure_nameservers(1); return r;

1 0

[tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit fdc7549b61443a1ffd723c5a497b9c96c78d4a1a Merge: d949a2f924 5a043825d0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:36:06 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.6] Remove unused function: dns_randfn_() in dns.c.
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 5a043825d0b208343da4864ec9e071118b83cd06 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 10 13:07:24 2021 +0000 Remove unused function: dns_randfn_() in dns.c. This patch unbreaks the current build after tor!369 landed. See: https://bugs.torproject.org/tpo/core/tor/40371 --- src/feature/relay/dns.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 075d7d7063..49ed8bd790 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -211,14 +211,6 @@ evdns_log_cb(int warn, const char *msg) tor_log(severity, LD_EXIT, "eventdns: %s", msg); } -/** Helper: passed to eventdns.c as a callback so it can generate random - * numbers for transaction IDs and 0x20-hack coding. */ -static void -dns_randfn_(char *b, size_t n) -{ - crypto_rand(b,n); -} - /** Initialize the DNS subsystem; called by the OR process. */ int dns_init(void)

1 0

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit fdc7549b61443a1ffd723c5a497b9c96c78d4a1a Merge: d949a2f924 5a043825d0 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:36:06 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/main] Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit db112329a0358a8e9138c782ee48c5e3f3d1f35d Merge: 44e105c27f f20f5a4e37 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:35:35 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/369' into maint-0.3.5 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/main] Merge branch 'maint-0.4.6' into main
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 2a7c0a95eed1741b1e877579c565b4a9e810ff34 Merge: e7abab8782 16cbbf04c4 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:36:07 2021 +0000 Merge branch 'maint-0.4.6' into main

1 0

[tor/main] Remove unused function: dns_randfn_() in dns.c.
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 5a043825d0b208343da4864ec9e071118b83cd06 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon May 10 13:07:24 2021 +0000 Remove unused function: dns_randfn_() in dns.c. This patch unbreaks the current build after tor!369 landed. See: https://bugs.torproject.org/tpo/core/tor/40371 --- src/feature/relay/dns.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 075d7d7063..49ed8bd790 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -211,14 +211,6 @@ evdns_log_cb(int warn, const char *msg) tor_log(severity, LD_EXIT, "eventdns: %s", msg); } -/** Helper: passed to eventdns.c as a callback so it can generate random - * numbers for transaction IDs and 0x20-hack coding. */ -static void -dns_randfn_(char *b, size_t n) -{ - crypto_rand(b,n); -} - /** Initialize the DNS subsystem; called by the OR process. */ int dns_init(void)

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 16cbbf04c49715d2ba94e079597aeed284a6398d Merge: caa305a5ad fdc7549b61 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 17:36:07 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.3.5] Stop calling evdns_set_random_bytes_fn()
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit f20f5a4e376d254e069fed66a321bc9cdd537096 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 16 17:26:59 2021 -0400 Stop calling evdns_set_random_bytes_fn() This function has been a no-op since Libevent 2.0.4-alpha, when libevent got an arc4random() implementation. Libevent has finally removed it, which will break our compilation unless we stop calling it. (This is currently breaking compilation in OSS-fuzz.) Closes #40371. --- changes/bug40371 | 6 ++++++ src/feature/relay/dns.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug40371 b/changes/bug40371 new file mode 100644 index 0000000000..8cc7117f9f --- /dev/null +++ b/changes/bug40371 @@ -0,0 +1,6 @@ + o Minor bugfixes (compatibility): + - Fix compatibility with the most recent Libevent versions, which + no longer have an evdns_set_random_bytes() function. Because + this function has been a no-op since Libevent 2.0.4-alpha, + it is safe for us to just stop calling it. Fixes bug 40371; + bugfix on 0.2.1.7-alpha. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index e20a39482f..075d7d7063 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -224,7 +224,6 @@ int dns_init(void) { init_cache_map(); - evdns_set_random_bytes_fn(dns_randfn_); if (server_mode(get_options())) { int r = configure_nameservers(1); return r;

1 0