tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-27 15:09:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #607 from willrossi/trac6416

Browse Source 
FIX: check GetRandom() exists for RandomGenerator.
This commit is contained in:
Sean Harvey 2012-07-01 18:38:53 -07:00
commit bea58b1193
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/RandomGenerator.php
View File

@ -47,8 +47,10 @@ class RandomGenerator {
if($isWin && class_exists('COM')) {
try {
$comObj = new COM('CAPICOM.Utilities.1');
$e = base64_decode($comObj->GetRandom(64, 0));
return $e;
if(is_callable(array($comObj,'GetRandom'))) {
return base64_decode($comObj->GetRandom(64, 0));
}
} catch (Exception $ex) {
}
}
@ -66,6 +68,5 @@ class RandomGenerator {
*/
function generateHash($algorithm = 'whirlpool') {
return hash($algorithm, $this->generateEntropy());
}
}
}
}