Fix for an Issue #379

This commit is contained in:
Miroslav Stampar 2013-02-05 16:13:33 +01:00
parent e03010f48b
commit 934808f53b

View File

@ -512,7 +512,7 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
pass pass
finally: finally:
if hasattr(proc_count, 'value'): if hasattr(proc_count, "value"):
proc_count.value -= 1 proc_count.value -= 1
def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found, proc_id, proc_count, wordlists, custom_wordlist): def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found, proc_id, proc_count, wordlists, custom_wordlist):
@ -579,7 +579,7 @@ def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found
pass pass
finally: finally:
if hasattr(proc_count, 'value'): if hasattr(proc_count, "value"):
proc_count.value -= 1 proc_count.value -= 1
def dictionaryAttack(attack_dict): def dictionaryAttack(attack_dict):
@ -732,10 +732,11 @@ def dictionaryAttack(attack_dict):
processes.append(p) processes.append(p)
for p in processes: for p in processes:
p.daemon = True
p.start() p.start()
for p in processes: while count.value > 0:
p.join() time.sleep(0.5)
else: else:
warnMsg = "multiprocessing hash cracking is currently " warnMsg = "multiprocessing hash cracking is currently "
@ -810,10 +811,11 @@ def dictionaryAttack(attack_dict):
processes.append(p) processes.append(p)
for p in processes: for p in processes:
p.daemon = True
p.start() p.start()
for p in processes: while count.value > 0:
p.join() time.sleep(0.5)
found = found_.value != 0 found = found_.value != 0