Merge branch 'master' into sessions

config.json

@@ -3,9 +3,5 @@
   "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"
+  "hcatOptimizedWordlists": "/Passwords/optimized_wordlists"
 }

hate_crack.py

@@ -30,9 +30,16 @@ with open(hate_path + '/config.json') as config:
     hcatTuning = config_parser['hcatTuning']
     hcatWordlists = config_parser['hcatWordlists']
     hcatOptimizedWordlists = config_parser['hcatOptimizedWordlists']
-    hcatExpanderBin = config_parser['hcatExpanderBin']
-    hcatCombinatorBin = config_parser['hcatCombinatorBin']
-    hcatPrinceBin = config_parser['hcatPrinceBin']
+
+if sys.platform == 'darwin':
+    hcatExpanderBin = "expander.app"
+    hcatCombinatorBin = "combinator.app"
+    hcatPrinceBin = "pp64.app"
+else:
+    hcatExpanderBin = "expander.bin"
+    hcatCombinatorBin = "combinator.bin"
+    hcatPrinceBin = "pp64.bin"
+
 
 # hashcat biniary checks for systems that install hashcat binary in different location than the rest of the hashcat files
 if os.path.isfile(hcatBin):

wordlist_optimizer.py

@@ -5,9 +5,6 @@ import os
 import subprocess
 import shutil
 
-splitlen_bin = "hashcat-utils/bin/splitlen.app"
-rli_bin = "hashcat-utils/bin/rli.app"
-
 # Help
 def usage():
   print("usage: python %s <input file list> <output directory>" % sys.argv[0])
@@ -32,8 +29,15 @@ def main():
   except IndexError:
     usage()
     sys.exit()
-    
-  # Get list of wordlists from <input file list> argument  
+
+  if sys.platform == 'darwin':
+    splitlen_bin = "hashcat-utils/bin/splitlen.app"
+    rli_bin = "hashcat-utils/bin/rli.app"
+  else:
+    splitlen_bin = "hashcat-utils/bin/splitlen.bin"
+    rli_bin = "hashcat-utils/bin/rli.bin"
+
+  # Get list of wordlists from <input file list> argument
   for wordlist in input_list:
     print(wordlist.strip())