webinterface.git

@@ -25,16 +25,6 @@ function gen_pw_hash($password)

     return $pwhash;

 }

-function check_pw_hash($password, $pwhash)

-{

-    $checkhash = crypt($password, $pwhash);

-    if (strlen($checkhash) < 13) {

-        /* returns a string shorter than 13 chars on failure */

-        system_failure("Invalid password hash!");

-    }

-    return hash_equals($checkhash, $pwhash);

-}

-

 function strong_password($password, $user = [])

 {

     $pwcheck = config('pwcheck');

@@ -53,7 +53,7 @@ function find_role($login, $password, $i_am_admin = false)

             return null;

         }

         $db_password = $entry->password;

-        if (($entry->status == 0 && check_pw_hash($password, $db_password)) || $i_am_admin) {

+        if (($entry->status == 0 && password_verify($password, $db_password)) || $i_am_admin) {

             $role = ROLE_SYSTEMUSER;

             if ($entry->primary) {

                 $role = $role | ROLE_CUSTOMER;

@@ -117,7 +117,7 @@ function find_role($login, $password, $i_am_admin = false)

     if (@$result->rowCount() > 0) {

         $entry = $result->fetch(PDO::FETCH_OBJ);

         $db_password = $entry->cryptpass;

-        if (check_pw_hash($password, $db_password) || $i_am_admin) {

+        if (password_verify($password, $db_password) || $i_am_admin) {

             logger(LOG_INFO, "session/checkuser", "login", "logged in e-mail-account »{$account}«.");

             return ROLE_MAILACCOUNT;

         }

@@ -130,7 +130,7 @@ function find_role($login, $password, $i_am_admin = false)

     if (@$result->rowCount() > 0) {

         $entry = $result->fetch(PDO::FETCH_OBJ);

         $db_password = $entry->cryptpass;

-        if (check_pw_hash($password, $db_password) || $i_am_admin) {

+        if (password_verify($password, $db_password) || $i_am_admin) {

             logger(LOG_INFO, "session/checkuser", "login", "logged in virtual e-mail-account »{$account}«.");

             return ROLE_VMAIL_ACCOUNT;

         }