Update src/Util.php

Author: lodev09

src/Util.php

@@ -106,6 +106,8 @@ public static function get($field, $source = null, $default = null, $possible_va
             $value = isset($source[$field]) ? $source[$field] : $default;
         } else if (is_object($source)) {
             $value = isset($source->{$field}) ? $source->{$field} : $default;
+        } else {
+            $value = $default;
         }
 
         if ($possible_values) {
@@ -231,10 +233,6 @@ public static function in_string($needle, $string) {
         } else return stripos($string, $needle) !== false;
     }
 
-    public static function hash($str) {
-        return hash('sha256', $str);
-    }
-
     public static function save_session_result($data) {
         $uuid = self::uuid();
         $_SESSION[$uuid] = json_encode($data);
@@ -582,7 +580,7 @@ public static function encrypt($data, $key, $iv) {
         $output = false;
         $encrypt_method = "AES-256-CBC";
         // hash
-        $key = self::hash($key);
+        $key = hash_hmac('sha256', $data, $iv);
 
         // iv - encrypt method AES-256-CBC expects 16 bytes - else you will get a warning
         $iv = substr($iv, 0, 16);
@@ -599,7 +597,7 @@ public static function decrypt($data, $key, $iv) {
         $output = false;
         $encrypt_method = "AES-256-CBC";
         // hash
-        $key = self::hash($key);
+        $key = hash_hmac('sha256', $data, $iv);
 
         // iv - encrypt method AES-256-CBC expects 16 bytes - else you will get a warning
         $iv = substr($iv, 0, 16);