From 3d3dc2d54d73ffc32c77fcd3e11b5f35d6f10bab Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Tue, 11 Jan 2022 00:26:09 +0000
Subject: [PATCH] Encryption updates

---
 client_assets.php    |  4 ++--
 settings-general.php | 14 --------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/client_assets.php b/client_assets.php
index cb7c389a..ef0fef63 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -39,7 +39,7 @@ if(isset($_GET['o'])){
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS *, AES_DECRYPT(login_password, '$config_aes_key') AS login_password FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN logins ON login_asset_id = asset_id
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN logins ON login_asset_id = asset_id
   WHERE asset_client_id = $client_id 
   AND (asset_name LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_ip LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
@@ -178,7 +178,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
             $login_id = $row['login_id'];
             $login_username = $row['login_username'];
-            $login_password = $row['login_password'];
+            $login_password = decryptLoginEntry($row['login_password']);
       
           ?>
           <tr>
diff --git a/settings-general.php b/settings-general.php
index 5acadf15..89f1ba8e 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -22,20 +22,6 @@
         </div>
       </div>
 
-      <div class="form-group">
-        <label>AES Decryption Key</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-          </div>
-          <input type="password" class="form-control" data-toggle="password" name="config_aes_key" placeholder="Key used to decrypt passwords" value="<?php echo $config_aes_key; ?>">
-          <div class="input-group-append">
-            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-          </div>
-        </div>
-        <small class="form-text text-muted">This will also update the key on all client logins</small>
-      </div>
-
       <div class="form-group">
         <label>Base URL</label>
         <div class="input-group">