Project

General

Profile

Download (2.26 KB)

Bug #22369 » 13989_4-3_trunk_v4a.diff

Administrator Admin, 2010-07-26 23:24

View differences:

t3lib/class.t3lib_div.php (working copy)
if (TYPO3_OS != 'WIN' && ($fh = @fopen('/dev/urandom', 'rb'))) {
$output = fread($fh, $count);
fclose($fh);
} elseif (TYPO3_OS == 'WIN') {
if (class_exists('COM')) {
try {
$com = new COM('CAPICOM.Utilities.1');
$output = base64_decode($com->GetRandom($count, 0));
} catch(Exception $e) {
// CAPICOM not installed
}
}
if ($output === '' && version_compare(PHP_VERSION, '5.3.0', '>=')) {
if (function_exists('mcrypt_create_iv')) {
$output = mcrypt_create_iv($count, MCRYPT_DEV_URANDOM);
} elseif (function_exists('openssl_random_pseudo_bytes')) {
$isStrong = null;
$output = openssl_random_pseudo_bytes($count, $isStrong);
// skip ssl since it wasn't using the strong algo
if ($isStrong !== TRUE) {
$output = '';
}
}
}
}
// fallback if /dev/urandom is not available
// fallback if other random byte generation failed until now
if (!isset($output{$count - 1})) {
// We initialize with the somewhat random.
$randomState = $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']
. microtime() . getmypid();
. base_convert(memory_get_usage() % pow(10, 6), 10, 2)
. microtime() . uniqid('') . getmypid();
while (!isset($output{$count - 1})) {
$randomState = md5(microtime() . mt_rand() . $randomState);
$output .= md5(mt_rand() . $randomState, true);
$randomState = sha1(microtime() . mt_rand() . $randomState);
$output .= sha1(mt_rand() . $randomState, true);
}
$output = substr($output, strlen($output) - $count, $count);
}
......
}
/**
* Returns a hex representation of a random byte string.
*
* @param integer Number of hex characters to return
* @return string Random Bytes
*/
public static function getRandomHexString($count) {
return substr(bin2hex(self::generateRandomBytes(intval(($count + 1) / 2))), 0, $count);
}
/**
* Returns a given string with underscores as UpperCamelCase.
* Example: Converts blog_example to BlogExample
*
(19-19/19)