tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX PHP 7.x should use random_bytes for entropy ahead of deprecated mcrypt lib

Browse Source
This commit is contained in:
Robbie Averill 2016-12-29 23:46:08 +13:00
parent 088d4ff222
commit 6f4162ed74
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Security/RandomGenerator.php
View File

@ -24,6 +24,11 @@ class RandomGenerator
{ {
$isWin = preg_match('/WIN/', PHP_OS); $isWin = preg_match('/WIN/', PHP_OS);
// PHP 7.1 preference, since mcrypt is deprecated
if (function_exists('random_bytes')) {
return bin2hex(random_bytes(64));
}
// TODO Fails with "Could not gather sufficient random data" on IIS, temporarily disabled on windows // TODO Fails with "Could not gather sufficient random data" on IIS, temporarily disabled on windows
if (!$isWin) { if (!$isWin) {
if (function_exists('mcrypt_create_iv')) { if (function_exists('mcrypt_create_iv')) {