From 93ba31ab015783e8c456e8b596287c15f2da7530 Mon Sep 17 00:00:00 2001
From: Larry Spohn <Spoonman@ts4.brewery>
Date: Fri, 26 Jan 2018 18:34:47 -0500
Subject: [PATCH] Removed ConfigParser requirement. Fully Python2/3 compatible.

---
 config.ini       | 11 -----------
 config.json      | 11 +++++++++++
 hate_crack.py    | 24 +++++++++++++-----------
 requirements.txt |  1 -
 4 files changed, 24 insertions(+), 23 deletions(-)
 delete mode 100644 config.ini
 create mode 100644 config.json
 delete mode 100644 requirements.txt

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
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
diff --git a/hate_crack.py b/hate_crack.py
index d6f1c19..7ce5dc9 100755
--- a/hate_crack.py
+++ b/hate_crack.py
@@ -2,15 +2,16 @@
 
 # Methodology provided by Martin Bos (pure_hate)
 # Original script provided by Larry Spohn (spoonman)
+# Python refactoring and general fixing, Justin Bollinger (bandrel)
 
 import subprocess
 import sys
 import os
 import signal
 import time
-import ConfigParser
 import random
 import re
+import json
 
 # python2/3 compatability
 try:
@@ -20,16 +21,17 @@ 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
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index e1aa09c..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-configparser
\ No newline at end of file