sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-06-29 17:33:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor update

Browse Source
This commit is contained in:
Miroslav Stampar 2011-10-26 11:10:15 +00:00
parent d467b40ff6
commit 3d883a2218
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/utils/hash.py
View File

@ -569,6 +569,7 @@ def dictionaryAttack(attack_dict):
kb.wordlist.rewind() kb.wordlist.rewind()
retVal = None retVal = None
processes = []
try: try:
if _multiprocessing and not IS_WIN: if _multiprocessing and not IS_WIN:
@ -576,7 +577,6 @@ def dictionaryAttack(attack_dict):
infoMsg = "starting %d processes " % _multiprocessing.cpu_count() infoMsg = "starting %d processes " % _multiprocessing.cpu_count()
singleTimeLogMessage(infoMsg) singleTimeLogMessage(infoMsg)
processes = []
retVal = _multiprocessing.Queue() retVal = _multiprocessing.Queue()
for i in xrange(_multiprocessing.cpu_count()): for i in xrange(_multiprocessing.cpu_count()):
p = _multiprocessing.Process(target=__bruteProcessVariantA, args=(attack_info, hash_regex, kb.wordlist, suffix, retVal, i, _multiprocessing.cpu_count())) p = _multiprocessing.Process(target=__bruteProcessVariantA, args=(attack_info, hash_regex, kb.wordlist, suffix, retVal, i, _multiprocessing.cpu_count()))
@ -602,8 +602,12 @@ def dictionaryAttack(attack_dict):
warnMsg = "user aborted during dictionary-based attack phase (Ctrl+C was pressed)" warnMsg = "user aborted during dictionary-based attack phase (Ctrl+C was pressed)"
logger.warn(warnMsg) logger.warn(warnMsg)
for process in processes:
process.terminate()
process.join()
while not retVal.empty(): while not retVal.empty():
results.append(retVal.get()) results.append(retVal.get(block=False))
clearConsoleLine() clearConsoleLine()
@ -627,6 +631,7 @@ def dictionaryAttack(attack_dict):
kb.wordlist.rewind() kb.wordlist.rewind()
retVal = None retVal = None
processes = []
try: try:
if _multiprocessing and not IS_WIN: if _multiprocessing and not IS_WIN:
@ -634,7 +639,6 @@ def dictionaryAttack(attack_dict):
infoMsg = "starting %d processes " % _multiprocessing.cpu_count() infoMsg = "starting %d processes " % _multiprocessing.cpu_count()
singleTimeLogMessage(infoMsg) singleTimeLogMessage(infoMsg)
processes = []
retVal = _multiprocessing.Queue() retVal = _multiprocessing.Queue()
found_ = _multiprocessing.Value('i', False) found_ = _multiprocessing.Value('i', False)
@ -672,8 +676,12 @@ def dictionaryAttack(attack_dict):
warnMsg = "user aborted during dictionary-based attack phase (Ctrl+C was pressed)" warnMsg = "user aborted during dictionary-based attack phase (Ctrl+C was pressed)"
logger.warn(warnMsg) logger.warn(warnMsg)
for process in processes:
process.terminate()
process.join()
while not retVal.empty(): while not retVal.empty():
results.append(retVal.get()) results.append(retVal.get(block=False))
clearConsoleLine() clearConsoleLine()