From cf280f1bd4dcc62af2826ec4ca8f602eb72b48d0 Mon Sep 17 00:00:00 2001
From: John Gaunt <jgaunt@johnhgaunt.com>
Date: Sat, 31 Dec 2022 10:31:58 -0500
Subject: [PATCH] updated error handling for kmip functions

---
 bitwardenBackup.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bitwardenBackup.py b/bitwardenBackup.py
index e9520b2..fa5a70d 100644
--- a/bitwardenBackup.py
+++ b/bitwardenBackup.py
@@ -97,7 +97,7 @@ def create_encryption_key():
         logger.debug("Successfully created a new encryption key.")
         logger.debug("Encryption Key ID: {}".format(key_id))
     except Exception as e:
-        logger.error(e)
+        logger.error("Unable to create encryption key. Error: {}".format(e))
         sys.exit(-1)
 
     # Activate the encryption key so that it can be used.
@@ -106,7 +106,7 @@ def create_encryption_key():
         logger.debug("Successfully activated the encryption key.")
         return key_id
     except Exception as e:
-        logger.error(e)
+        logger.error("Unable to activate encryption key. Error: {}".format(e))
         sys.exit(-1)
         
 def create_hmac_key():
@@ -123,7 +123,7 @@ def create_hmac_key():
         logger.debug("Successfully created a new HMAC key.")
         logger.debug("HMAC Key ID: {}".format(key_id))
     except Exception as e:
-        logger.error(e)
+        logger.error("Unable to create hmac key. Error: {}".format(e))
         sys.exit(-1)
 
     # Activate the HMAC key so that it can be used.
@@ -132,7 +132,7 @@ def create_hmac_key():
         logger.debug("Successfully activated the HMAC key.")
         return key_id
     except Exception as e:
-        logger.error(e)
+        logger.error("Unable to activate hmac key. Error: {}".format(e))
         sys.exit(-1)
 
 def encrypt(data):
@@ -171,7 +171,8 @@ def encrypt(data):
         array_json_b64 = base64.b64encode(array_json.encode('utf-8')).decode()
         return array_json_b64
     except Exception as e:
-        logger.error(e)
+        logger.error("Unable to encrypt data. Error: {}".format(e))
+        sys.exit(-1)
 
 def decrypt(data):
     array_json = base64.b64decode(data)
@@ -217,7 +218,8 @@ def decrypt_v1(array):
         plain_text = plain_text.decode('utf-8')
         return plain_text
     except Exception as e:
-        logger.error(e)
+        logger.error("Unable to decrypt data. Error: {}".format(e))
+        sys.exit(-1)
 
 def new_account_details():
     print("Requesting account details to add to config.")