mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
#1736 - Make Security::get_encryption_algorithms() a dynamic function again.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48220 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
cf7f46f870
commit
27849e2418
@ -634,10 +634,19 @@ class Security extends Controller {
|
||||
* encryption algorithms.
|
||||
*/
|
||||
public static function get_encryption_algorithms() {
|
||||
// We return all the hashes that don't have commas in the name, as database exports get confused by comma in ENUM keys. :-(
|
||||
return array(
|
||||
'md4', 'md5', 'sha1', 'sha256', 'sha384', 'sha512', 'ripemd128', 'ripemd160', 'whirlpool', 'snefru', 'gost', 'alder32', 'crc32', 'crc32b'
|
||||
);
|
||||
$result = function_exists('hash_algos') ? hash_algos() : array();
|
||||
|
||||
if(count($result) == 0) {
|
||||
if(function_exists('md5')) $result[] = 'md5';
|
||||
|
||||
if(function_exists('sha1')) $result[] = 'sha1';
|
||||
} else {
|
||||
foreach ($result as $i => $algorithm) {
|
||||
if (preg_match('/,/',$algorithm)) {
|
||||
unset($result[$i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user