Merge branch 'master' into updated_discoking_pr

This commit is contained in:
Justin Bollinger
2018-05-08 11:07:18 -04:00
committed by GitHub

View File

@@ -458,7 +458,6 @@ def hcatYoloCombination(hcatHashType, hcatHashFile):
print('Killing PID {0}...'.format(str(hcatProcess.pid)))
hcatProcess.kill()
# Middle fast Combinator Attack
def hcatMiddleCombinator(hcatHashType, hcatHashFile):
global hcatProcess
@@ -568,8 +567,6 @@ def hcatThoroughCombinator(hcatHashType, hcatHashFile):
print('Killing PID {0}...'.format(str(hcatProcess.pid)))
hcatProcess.kill()
# Pathwell Mask Brute Force Attack
def hcatPathwellBruteForce(hcatHashType, hcatHashFile):
global hcatProcess