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

BUGFIX Revert remove of function_exists() check for mcrypt in

Browse Source 
7d84aff01e, as we don't expect mcrypt to actually be available,
since fallbacks in RandomGenerator are available.
This commit is contained in:
Sean Harvey 2012-04-18 18:44:33 +12:00
parent 97e44c0915
commit 926daa29e2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/RandomGenerator.php
View File

@ -21,8 +21,10 @@ class RandomGenerator {
// 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) {
$e = mcrypt_create_iv(64, MCRYPT_DEV_URANDOM); if(function_exists('mcrypt_create_iv')) {
if($e !== false) return $e; $e = mcrypt_create_iv(64, MCRYPT_DEV_URANDOM);
if($e !== false) return $e;
}
} }
// Fall back to SSL methods - may slow down execution by a few ms // Fall back to SSL methods - may slow down execution by a few ms