From: Michal Nowak <mnowak@isc.org>
Date: Thu, 23 Jul 2026 14:47:31 +0000 (+0200)
Subject: Restore arc4random() detection dropped in the v9.21.14 merge
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=261b14bc8bbe68a4061f7c5b5cd90cadd282fc27;p=thirdparty%2Fbind9.git

Restore arc4random() detection dropped in the v9.21.14 merge

Commit 4db9e5d90e2 ("Use arc4random for CSPRNG when available", part
of the CVE-2025-40780 fix) guarded the arc4random() code paths in
lib/isc/random.h and lib/isc/random.c with HAVE_ARC4RANDOM and added
the corresponding function check to meson.build.  The manual conflict
resolution in merge c2a672bbaef ("Merge tag 'v9.21.14'") kept the code
changes but dropped the meson.build hunk, so HAVE_ARC4RANDOM was never
defined and platforms with arc4random() (macOS and the BSDs) silently
fell back to the internal ChaCha-based CSPRNG.  Restore the check.

Assisted-by: Claude:claude-fable-5
---

diff --git a/meson.build b/meson.build
index 1cd8d27305f..a8981dc06ce 100644
--- a/meson.build
+++ b/meson.build
@@ -548,6 +548,9 @@ foreach fn, header : {
     'sched_getaffinity': '#include <sched.h>',
     'sched_yield': '#include <sched.h>',
 
+    # CSPRNG
+    'arc4random': '#include <stdlib.h>',
+
     # Misc.
     'chroot': '#include <unistd.h>',
     'clock_gettime': '#include <time.h>',