archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.0'

Browse source 
* PHP-7.0:
  Remove arc4random
This commit is contained in:
Leigh 2015-10-26 20:58:10 +00:00
commit a685c53d34
2 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/standard/config.m4
View file

@ -592,11 +592,6 @@ dnl Check for atomic operation API availability in Solaris
dnl dnl
AC_CHECK_HEADERS([atomic.h]) AC_CHECK_HEADERS([atomic.h])
dnl
dnl Check for arc4random on BSD systems
dnl
AC_CHECK_DECLS([arc4random_buf])
dnl dnl
dnl Check for getrandom on newer Linux kernels dnl Check for getrandom on newer Linux kernels
dnl dnl

2
ext/standard/random.c
View file

@ -87,8 +87,6 @@ static int php_random_bytes(void *bytes, size_t size)
zend_throw_exception(zend_ce_exception, "Could not gather sufficient random data", 0); zend_throw_exception(zend_ce_exception, "Could not gather sufficient random data", 0);
return FAILURE; return FAILURE;
} }
#elif HAVE_DECL_ARC4RANDOM_BUF
arc4random_buf(bytes, size);
#elif HAVE_DECL_GETRANDOM #elif HAVE_DECL_GETRANDOM
/* Linux getrandom(2) syscall */ /* Linux getrandom(2) syscall */
size_t read_bytes = 0; size_t read_bytes = 0;