diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-10-20 17:36:07 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-10-20 17:36:07 +0000 |
| commit | 16cbbf04c49715d2ba94e079597aeed284a6398d (patch) | |
| tree | 2c9521bf9014e995c0d74476f63a486699f25b7c | |
| parent | caa305a5adec8a0a50006d1bed3e6b019e016dd4 (diff) | |
| parent | fdc7549b61443a1ffd723c5a497b9c96c78d4a1a (diff) | |
| download | tor-16cbbf04c49715d2ba94e079597aeed284a6398d.tar.gz tor-16cbbf04c49715d2ba94e079597aeed284a6398d.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
| -rw-r--r-- | changes/bug40371 | 6 | ||||
| -rw-r--r-- | src/feature/relay/dns.c | 9 |
2 files changed, 6 insertions, 9 deletions
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 ed8d235e92..6a703f2ab3 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -212,20 +212,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; |