tor

commit fdc7549b61443a1ffd723c5a497b9c96c78d4a1a
parent d949a2f924bfabd4aacf48e884d99cd6a8db61ef
Author: Alexander Færøy <ahf@torproject.org>
Date:   Wed, 20 Oct 2021 17:36:06 +0000

Merge branch 'maint-0.3.5' into maint-0.4.5

Diffstat:
A
changes/bug40371
 | 
6
++++++
M
src/feature/relay/dns.c
 | 
9
---------

2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/changes/bug40371 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
@@ -211,20 +211,11 @@ 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)
 {
   init_cache_map();
-  evdns_set_random_bytes_fn(dns_randfn_);
   if (server_mode(get_options())) {
     int r = configure_nameservers(1);
     return r;