From 7634fcf34270769773c6f9631b4022548d38f0bf Mon Sep 17 00:00:00 2001
From: bandrel <justin.bollinger@trustedsec.com>
Date: Fri, 26 Jan 2018 17:58:22 -0500
Subject: [PATCH 1/3] replaced file open method and minor formatting changes

---
 config.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 config.json

diff --git a/config.json b/config.json
new file mode 100644
index 0000000..a18947f
--- /dev/null
+++ b/config.json
@@ -0,0 +1,11 @@
+{
+  "hcatPath": "/Passwords/hashcat",
+  "hcatBin": "hashcat",
+  "hcatTuning": "--force",
+  "hcatWordlists": "/Passwords/wordlists",
+  "hcatOptimizedWordlists": "/Passwords/optimized_wordlists",
+  "_comment": "Change extension to .bin for Linux and .app for OSX",
+  "hcatExpanderBin": "expander.app",
+  "hcatCombinatorBin": "combinator.app",
+  "hcatPrinceBin": "pp64.app"
+}
\ No newline at end of file

From fc8c9729343a59662195942bbe0d2324b0ffc25c Mon Sep 17 00:00:00 2001
From: bandrel <justin.bollinger@trustedsec.com>
Date: Fri, 26 Jan 2018 18:03:11 -0500
Subject: [PATCH 2/3] replaced file open method and minor formatting changes

---
 hate_crack.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/hate_crack.py b/hate_crack.py
index d6f1c19..c559972 100755
--- a/hate_crack.py
+++ b/hate_crack.py
@@ -8,7 +8,7 @@ import sys
 import os
 import signal
 import time
-import ConfigParser
+import json
 import random
 import re
 
@@ -20,16 +20,18 @@ except NameError:
 
 
 hate_path = os.path.dirname(os.path.realpath(__file__))
-hcatConfig = ConfigParser.ConfigParser()
-hcatConfig.readfp(open(hate_path + '/config.ini'))
-hcatPath = hcatConfig.get('Default Paths', 'hcatPath')
-hcatBin = hcatConfig.get('Default Paths', 'hcatBin')
-hcatTuning = hcatConfig.get('Default Paths', 'hcatTuning')
-hcatWordlists = hcatConfig.get('Default Paths', 'hcatWordlists')
-hcatOptimizedWordlists = hcatConfig.get('Default Paths', 'hcatOptimizedWordlists')
-hcatExpanderBin = hcatConfig.get('Default Paths', 'hcatExpanderBin')
-hcatCombinatorBin = hcatConfig.get('Default Paths', 'hcatCombinatorBin')
-hcatPrinceBin = hcatConfig.get('Default Paths', 'hcatPrinceBin')
+
+with open(hate_path + '/config.json') as config:
+    config_parser = json.load(config)
+
+    hcatPath = config_parser['hcatPath']
+    hcatBin = config_parser['hcatBin']
+    hcatTuning = config_parser['hcatTuning']
+    hcatWordlists = config_parser['hcatWordlists']
+    hcatOptimizedWordlists = config_parser['hcatOptimizedWordlists']
+    hcatExpanderBin = config_parser['hcatExpanderBin']
+    hcatCombinatorBin = config_parser['hcatCombinatorBin']
+    hcatPrinceBin = config_parser['hcatPrinceBin']
 
 hcatHashCount = 0
 hcatHashCracked = 0
@@ -527,9 +529,11 @@ def main():
                    "98": show_readme,
                    "99": quit_hc
                    }
-        task = input("\nSelect a task: ")
-        options[task]()
-
+        try:
+            task = input("\nSelect a task: ")
+            options[task]()
+        except KeyError:
+            pass
 # Boilerplate
 if __name__ == '__main__':
     main()

From e26a49bb205c81c5ee60d3ff8717ca4087da82a7 Mon Sep 17 00:00:00 2001
From: bandrel <justin.bollinger@trustedsec.com>
Date: Fri, 26 Jan 2018 18:40:25 -0500
Subject: [PATCH 3/3] changed to use json instead of .ini

---
 config.ini  | 11 -----------
 config.json |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 config.ini

diff --git a/config.ini b/config.ini
deleted file mode 100644
index 9528bfd..0000000
--- a/config.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Default Paths]
-hcatPath=/Passwords/hashcat
-hcatBin=hashcat
-hcatTuning=--force
-hcatWordlists=/Passwords/wordlists
-hcatOptimizedWordlists=/Passwords/optimized_wordlists
-
-# Change extension to .bin for Linux and .app for OSX
-hcatExpanderBin=expander.app
-hcatCombinatorBin=combinator.app
-hcatPrinceBin=pp64.app
diff --git a/config.json b/config.json
index a18947f..f9273ba 100644
--- a/config.json
+++ b/config.json
@@ -1,9 +1,9 @@
 {
-  "hcatPath": "/Passwords/hashcat",
-  "hcatBin": "hashcat",
+  "hcatPath": "/opt/hashcat-3.40/",
+  "hcatBin": "hashcat64.bin",
   "hcatTuning": "--force",
-  "hcatWordlists": "/Passwords/wordlists",
-  "hcatOptimizedWordlists": "/Passwords/optimized_wordlists",
+  "hcatWordlists": "/mnt/extra/wordlists",
+  "hcatOptimizedWordlists": "/mnt/extra/rDownloads/new-wordlists",
   "_comment": "Change extension to .bin for Linux and .app for OSX",
   "hcatExpanderBin": "expander.app",
   "hcatCombinatorBin": "combinator.app",