Start buildina and using arc4random

configure.ac

@@ -152,7 +152,8 @@ PDNS_FROM_GIT
 dnl Checks for library functions.
 dnl the *_r functions are in posix so we can use them unconditionally, but the ext/yahttp code is
 dnl using the defines.
-AC_CHECK_FUNCS_ONCE([strcasestr localtime_r gmtime_r recvmmsg sched_setscheduler getrandom arc4random])
+AC_CHECK_FUNCS_ONCE([strcasestr localtime_r gmtime_r recvmmsg sched_setscheduler])
+AC_CHECK_FUNCS_ONCE([getrandom getentropy arc4random arc4random_uniform arc4random_buf])
 
 AM_CONDITIONAL([HAVE_RECVMMSG], [test "x$ac_cv_func_recvmmsg" = "xyes"])
 
@@ -345,6 +346,7 @@ AC_CONFIG_FILES([
   docs/Makefile
   pdns/pdns.init
   ext/Makefile
+  ext/arc4random/Makefile
   ext/ipcrypt/Makefile
   ext/yahttp/Makefile
   ext/yahttp/yahttp/Makefile

ext/Makefile.am

@@ -1,9 +1,11 @@
 SUBDIRS = \
+	arc4random \
 	ipcrypt \
 	json11 \
 	yahttp
 
 DIST_SUBDIRS = \
+	arc4random \
 	ipcrypt \
 	json11 \
 	yahttp

pdns/Makefile.am

@@ -1,4 +1,5 @@
 JSON11_LIBS = $(top_builddir)/ext/json11/libjson11.la
+ARC4RANDOM_LIBS = $(top_builddir)/ext/arc4random/libarc4random.la
 
 AM_CPPFLAGS += \
 	-I$(top_srcdir)/ext/json11 \
@@ -18,6 +19,7 @@ AM_CXXFLAGS = \
 AM_LDFLAGS = \
 	$(PROGRAM_LDFLAGS) \
 	$(LIBCRYPTO_LIBS) \
+	$(ARC4RANDOM_LIBS) \
 	$(THREADFLAGS)
 
 AM_LFLAGS = -i
@@ -214,7 +216,7 @@ pdns_server_SOURCES = \
 	digests.hh \
 	distributor.hh \
 	dns.cc dns.hh \
-	dns_random.cc dns_random.hh \
+	dns_random.hh \
 	dnsbackend.cc dnsbackend.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
@@ -355,7 +357,6 @@ pdnsutil_SOURCES = \
 	credentials.cc credentials.hh \
 	dbdnsseckeeper.cc \
 	dns.cc \
-	dns_random.cc \
 	dnsbackend.cc \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
@@ -454,7 +455,6 @@ zone2sql_SOURCES = \
 	bindparser.yy \
 	bindparserclasses.hh \
 	dns.cc \
-	dns_random_urandom.cc \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc \
@@ -520,7 +520,6 @@ zone2ldap_SOURCES = \
 	bindlexer.l \
 	bindparser.yy \
 	bindparserclasses.hh \
-	dns_random_urandom.cc \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc \
@@ -603,7 +602,7 @@ calidns_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
 	calidns.cc \
-	dns_random_urandom.cc dns_random.hh \
+	dns_random.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
@@ -654,7 +653,6 @@ stubquery_SOURCES = \
 	arguments.cc arguments.hh \
 	base32.cc \
 	base64.cc \
-	dns_random_urandom.cc \
 	dnslabeltext.cc \
 	dnsname.cc \
 	dnsparser.cc \
@@ -679,7 +677,7 @@ stubquery_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
 saxfr_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
-	dns_random_urandom.cc dns_random.hh \
+	dns_random.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
@@ -719,7 +717,7 @@ ixfrdist_SOURCES = \
 	base64.cc base64.hh \
 	credentials.cc credentials.hh \
 	dns.cc \
-	dns_random_urandom.cc dns_random.hh \
+	dns_random.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
@@ -785,7 +783,7 @@ ixplore_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
 	dns.cc \
-	dns_random_urandom.cc dns_random.hh \
+	dns_random.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
@@ -896,7 +894,7 @@ tsig_tests_SOURCES = \
 	base64.cc base64.hh \
 	digests.hh \
 	dns.cc \
-	dns_random_urandom.cc dns_random.hh \
+	dns_random.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
@@ -933,7 +931,7 @@ speedtest_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
 	credentials.cc credentials.hh \
-	dns_random.cc dns_random.hh \
+	dns_random.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
@@ -980,7 +978,7 @@ dnsbulktest_SOURCES = \
 	arguments.cc arguments.hh \
 	base32.cc \
 	base64.cc \
-	dns_random.cc dns_random.hh \
+	dns_random.hh \
 	dnsbulktest.cc \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
@@ -1134,7 +1132,6 @@ pdns_notify_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
 	dns.cc \
-	dns_random.cc \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
@@ -1341,7 +1338,6 @@ testrunner_SOURCES = \
 	credentials.cc credentials.hh \
 	dbdnsseckeeper.cc \
 	dns.cc \
-	dns_random.cc \
 	dnsbackend.cc \
 	dnslabeltext.cc \
 	dnsname.cc \

pdns/auth-main.cc

@@ -1303,8 +1303,6 @@ int main(int argc, char** argv)
 
     openssl_thread_setup();
     openssl_seed();
-    /* setup rng */
-    dns_random_init();
 
 #ifdef HAVE_LUA_RECORDS
     MiniCurl::init();

pdns/calidns.cc

@@ -299,7 +299,6 @@ try
 
   Netmask ecsRange;
   if (g_vm.count("ecs")) {
-    dns_random_init("0123456789abcdef");
 
     try {
       ecsRange = Netmask(g_vm["ecs"].as<string>());