upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 05:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[master] use arc4random_stir() when available

Browse source 
4499.	[port]		MacOSX: silence deprecated function warning
			by using arc4random_stir() when available
			instead of arc4random_addrandom(). [RT #43503]
This commit is contained in:
Evan Hunt 2016-11-01 14:00:16 -07:00
parent 7960fc596b
commit 3fb62a5a4e
5 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
4499. [port] MacOSX: silence deprecated function warning
by using arc4random_stir() when available
instead of arc4random_addrandom(). [RT #43503]
4498. [test] Simplify prerequisite checks in system tests.
[RT #43516]

3
config.h.in
View file

@ -64,6 +64,9 @@
/** define if arc4random() exists */
#undef HAVE_ARC4RANDOM
/** define if arc4random_stir() exists */
#undef HAVE_ARC4RANDOM_STIR
/** define if arc4random_addrandom() exists */
#undef HAVE_ARC4RANDOM_ADDRANDOM

10
configure vendored
View file

@ -14578,8 +14578,8 @@ fi
#
# Do we have arc4random(), etc ? arc4random_addrandom() has been removed
# from OpenBSD 5.5 onwards.
# Do we have arc4random(), etc ?
# Will use stir and if not exist addrandom
#
ac_fn_c_check_func "$LINENO" "arc4random" "ac_cv_func_arc4random"
if test "x$ac_cv_func_arc4random" = xyes; then :
@ -14587,6 +14587,12 @@ if test "x$ac_cv_func_arc4random" = xyes; then :
fi
ac_fn_c_check_func "$LINENO" "arc4random_stir" "ac_cv_func_arc4random_stir"
if test "x$ac_cv_func_arc4random_stir" = xyes; then :
$as_echo "#define HAVE_ARC4RANDOM_STIR 1" >>confdefs.h
fi
ac_fn_c_check_func "$LINENO" "arc4random_addrandom" "ac_cv_func_arc4random_addrandom"
if test "x$ac_cv_func_arc4random_addrandom" = xyes; then :
$as_echo "#define HAVE_ARC4RANDOM_ADDRANDOM 1" >>confdefs.h

5
configure.in
View file

@ -1156,10 +1156,11 @@ fi
AC_SUBST(CHECK_DSA)
#
# Do we have arc4random(), etc ? arc4random_addrandom() has been removed
# from OpenBSD 5.5 onwards.
# Do we have arc4random(), etc ?
# Will use stir and if not exist addrandom
#
AC_CHECK_FUNC(arc4random, AC_DEFINE(HAVE_ARC4RANDOM))
AC_CHECK_FUNC(arc4random_stir, AC_DEFINE(HAVE_ARC4RANDOM_STIR))
AC_CHECK_FUNC(arc4random_addrandom, AC_DEFINE(HAVE_ARC4RANDOM_ADDRANDOM))
sinclude(config.threads.in)dnl

13
lib/isc/random.c
View file

@ -101,17 +101,12 @@ isc_random_seed(isc_uint32_t seed) {
#ifndef HAVE_ARC4RANDOM
srand(seed);
#elif defined(HAVE_ARC4RANDOM_STIR)
/* Formally not necessary... */
UNUSED(seed);
arc4random_stir();
#elif defined(HAVE_ARC4RANDOM_ADDRANDOM)
arc4random_addrandom((u_char *) &seed, sizeof(isc_uint32_t));
#else
/*
* If arcrandom() is available and no corresponding seeding
* function arc4random_addrandom() is available, no seeding is
* done on such platforms (e.g., OpenBSD 5.5). This is because
* the OS itself is supposed to seed the RNG and it is assumed
* that no explicit seeding is required.
*/
UNUSED(seed);
#endif
}