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

BUGFIX Limiting usage of mcrypt_create_iv() in RandomGenerator->generateEntropy() to *nix platforms to avoid fatal errors (specically in IIS) (from r114510)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@114512 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-12-05 04:53:39 +00:00 committed by Sam Minnee
parent 310f8f6a03
commit 6255cdf20a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
security/RandomGenerator.php
View File

@ -11,12 +11,21 @@
class RandomGenerator { class RandomGenerator {
/** /**
* Note: Returned values are not guaranteed to be crypto-safe,
* depending on the used retrieval method.
*
* @return string Returns a random series of bytes * @return string Returns a random series of bytes
*/ */
function generateEntropy() { function generateEntropy() {
$isWin = preg_match('/WIN/', PHP_OS);
// TODO Fails with "Could not gather sufficient random data" on IIS, temporarily disabled on windows
if(!$isWin) {
// mcrypt with urandom is only available on PHP 5.3 or newer // mcrypt with urandom is only available on PHP 5.3 or newer
if(version_compare(PHP_VERSION, '5.3.0', '>=')) { if(version_compare(PHP_VERSION, '5.3.0', '>=') && function_exists('mcrypt_create_iv')) {
return mcrypt_create_iv(64, MCRYPT_DEV_URANDOM); $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
@ -27,7 +36,7 @@ class RandomGenerator {
} }
// Read from the unix random number generator // Read from the unix random number generator
if (is_readable('/dev/urandom') && ($h = fopen('/dev/urandom', 'rb'))) { if(!$isWin && is_readable('/dev/urandom') && ($h = fopen('/dev/urandom', 'rb'))) {
$e = fread($h, 64); $e = fread($h, 64);
fclose($h); fclose($h);
return $e; return $e;
@ -36,7 +45,7 @@ class RandomGenerator {
// Warning: Both methods below are considered weak // Warning: Both methods below are considered weak
// try to read from the windows RNG // try to read from the windows RNG
if (class_exists('COM')) { if($isWin && class_exists('COM')) {
try { try {
$comObj = new COM('CAPICOM.Utilities.1'); $comObj = new COM('CAPICOM.Utilities.1');
$e = base64_decode($comObj->GetRandom(64, 0)); $e = base64_decode($comObj->GetRandom(64, 0));