7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Minor fixes

Browse Source
This commit is contained in:
andryyy
2021-02-11 14:41:00 +01:00
parent 386d6109c8 e3546fe90c
commit 04bd21663c
3 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/web/inc/functions.inc.php
View File

@@ -453,7 +453,7 @@ function generate_tlsa_digest($hostname, $port, $starttls = null) {
return 'Error: Cannot read peer certificate';
}
}
function alertbox_log_parser($_data){
function alertbox_log_parser($_data) {
global $lang;
if (isset($_data['return'])) {
foreach ($_data['return'] as $return) {
@@ -483,11 +483,10 @@ function alertbox_log_parser($_data){
}
return false;
}
function verify_salted_hash($hash, $password, $algo, $salt_length)
{
function verify_salted_hash($hash, $password, $algo, $salt_length) {
// Decode hash
$dhash = base64_decode($hash);
// Get first 20 bytes of binary which equals a SSHA hash
// Get first n bytes of binary which equals a SSHA hash
$ohash = substr($dhash, 0, $salt_length);
// Remove SSHA hash from decoded hash to get original salt string
$osalt = str_replace($ohash, '', $dhash);
@@ -497,9 +496,7 @@ function verify_salted_hash($hash, $password, $algo, $salt_length)
}
return false;
}
function verify_hash($hash, $password)
{
function verify_hash($hash, $password) {
if (preg_match('/^{(.+)}(.+)/i', $hash, $hash_array)) {
$scheme = strtoupper($hash_array[1]);
$hash = $hash_array[2];