entrouvert
/
simplesamlphp
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove more legacy code that's no longer necessary since we are requiring PHP >= 5.3.0. Deprecate SimpleSAML_Utilities::generateRandomBytesMTrand(). 

git-svn-id: http://simplesamlphp.googlecode.com/svn/trunk@3362 44740490-163a-0410-bde0-09ae8108e29a
This commit is contained in:
jaimepc@gmail.com 2014-02-09 17:11:23 +00:00
parent 3e2125fdd0
commit 23db5d5e3d
2 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/SimpleSAML/Utilities.php
View File

@ -1028,7 +1028,12 @@ class SimpleSAML_Utilities {
}
public static function generateRandomBytesMTrand($length) {
/**
* @deprecated
* @param int $length The amount of random bytes to generate.
* @return string A string of $length random bytes.
*/
public static function generateRandomBytesMTrand($length) {
/* Use mt_rand to generate $length random bytes. */
$data = '';
@ -1043,47 +1048,17 @@ class SimpleSAML_Utilities {
/**
* This function generates a binary string containing random bytes.
*
* It will use /dev/urandom if available, and fall back to the builtin mt_rand()-function if not.
* It is implemented as a wrapper of the openssl_random_pseudo_bytes function,
* available since PHP 5.3.0.
*
* @param $length The number of random bytes to return.
* @return A string of lenght $length with random bytes.
* @param int $length The number of random bytes to return.
* @param boolean $fallback Deprecated.
* @return string A string of $length random bytes.
*/
public static function generateRandomBytes($length, $fallback = TRUE) {
static $fp = NULL;
assert('is_int($length)');
if (function_exists('openssl_random_pseudo_bytes')) {
return openssl_random_pseudo_bytes($length);
}
if($fp === NULL) {
if (@file_exists('/dev/urandom')) {
$fp = @fopen('/dev/urandom', 'rb');
} else {
$fp = FALSE;
}
}
if($fp !== FALSE) {
/* Read random bytes from /dev/urandom. */
$data = fread($fp, $length);
if($data === FALSE) {
throw new Exception('Error reading random data.');
}
if(strlen($data) != $length) {
SimpleSAML_Logger::warning('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
if ($fallback) {
$data = self::generateRandomBytesMTrand($length);
} else {
throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
}
}
} else {
/* Use mt_rand to generate $length random bytes. */
$data = self::generateRandomBytesMTrand($length);
}
return $data;
return openssl_random_pseudo_bytes($length);
}

2
lib/SimpleSAML/Utils/Crypto.php
View File

@ -30,7 +30,7 @@ class SimpleSAML_Utils_Crypto {
if(!$salt) {
// Default 8 byte salt, but 4 byte for LDAP SHA1 hashes
$bytes = ($algo == 'SSHA1') ? 4 : 8;
$salt = SimpleSAML_Utilities::generateRandomBytes($bytes, TRUE);
$salt = SimpleSAML_Utilities::generateRandomBytes($bytes);
}
if($algo[0] == 'S' && in_array(substr(strtolower($algo),1), hash_algos())) {