From: Federico G. Schwindt <fgsch@lodoss.net>
Date: Wed, 23 Oct 2013 15:00:26 +0000 (+0100)
Subject: Check and call arc4random_stir() if present
X-Git-Tag: rel-21~5
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=8e6db769ac549cfe26042f7d51ae8a301d8fc569;hp=8a041373bb81f75a91a00e692979619938199989;ds=sidebyside

Check and call arc4random_stir() if present

FreeBSD prior to 10.0 does not automatically stir on fork(). Same with
current NetBSD. If arc4random_stir() is present assume is needed and
call it instead of srand().
---

diff --git a/configure.ng b/configure.ng
index 16f970f8..e3f51cf0 100644
--- a/configure.ng
+++ b/configure.ng
@@ -187,9 +187,9 @@ AC_CHECK_FUNCS([ \
 
 # Optional functions
 AC_CHECK_FUNCS_ONCE([ \
-	arc4random gai_strerror getaddrinfo getnameinfo inet_aton sigaction \
-	sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r \
-	waitpid])
+	arc4random arc4random_stir gai_strerror getaddrinfo getnameinfo inet_aton
+	sigaction sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat \
+	strtok_r waitpid])
 
 # -- Configuration options --
 
diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c
index d290f3bd..a5afb501 100644
--- a/src/ngircd/proc.c
+++ b/src/ngircd/proc.c
@@ -77,6 +77,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout
 		return -1;
 	case 0:
 		/* New child process: */
+#ifdef HAVE_ARC4RANDOM_STIR
+		arc4random_stir();
+#endif
 #ifndef HAVE_ARC4RANDOM
 		srand(seed ^ (unsigned int)time(NULL) ^ getpid());
 #endif