Update security.php

This commit is contained in:
Namhyeon Go 2018-09-24 03:20:18 +09:00 committed by GitHub
parent b3f03c4c63
commit c03e2b06c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -175,7 +175,7 @@ if(!function_exists("check_empty_requests")) {
if(!function_exists("get_hashed_text")) { if(!function_exists("get_hashed_text")) {
function get_hashed_text($text, $algo="sha1", $options=array()) { function get_hashed_text($text, $algo="sha1", $options=array()) {
$hashed_text = ""; $hashed_text = false;
switch($algo) { switch($algo) {
case "sha1": case "sha1":
@ -202,13 +202,26 @@ if(!function_exists("get_hashed_text")) {
} }
break; break;
default: default:
$hashed_text = ""; if(hash_algo_exists($algo)) {
$hashed_text = hash($algo, $text, false);
}
break;
} }
return $hashed_text; return $hashed_text;
} }
} }
if(!function_exists("hash_algo_exists")) {
function hash_algo_exists($algo) {
$flag = false;
if(function_exists("hash_algos")) {
$flag = in_array($algo, hash_algos());
}
return $flag;
}
}
if(!function_exists("get_salt")) { if(!function_exists("get_salt")) {
function get_salt() { function get_salt() {
$config = get_config(); $config = get_config();
@ -260,17 +273,13 @@ if(!function_exists("check_match_password")) {
$n_hashed_text = ""; $n_hashed_text = "";
switch($algo) { switch($algo) {
case "sha1":
case "md5":
case "crc32":
$n_hashed_text = get_hashed_text($n_plain_text, $algo);
$flag = ($n_hashed_text == $p);
break;
case "crypt": case "crypt":
$flag = (crypt($n_plain_text, $p) == $p); $flag = (crypt($n_plain_text, $p) == $p);
break; break;
default: default:
$flag = false; $n_hashed_text = get_hashed_text($n_plain_text, $algo);
$flag = ($n_hashed_text == $p);
break;
} }
return $flag; return $flag;