mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-12-14 11:49:02 +00:00
Fixes #2958
This commit is contained in:
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
|
||||
from lib.core.enums import OS
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.2.2.22"
|
||||
VERSION = "1.2.3.0"
|
||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
|
||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
|
||||
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
|
||||
|
||||
@@ -722,6 +722,8 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
|
||||
if not attack_info:
|
||||
break
|
||||
|
||||
count += 1
|
||||
|
||||
if not isinstance(word, basestring):
|
||||
continue
|
||||
|
||||
@@ -731,8 +733,6 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
|
||||
try:
|
||||
current = __functions__[hash_regex](password=word, uppercase=False)
|
||||
|
||||
count += 1
|
||||
|
||||
if current in hashes:
|
||||
for item in attack_info[:]:
|
||||
((user, hash_), _) = item
|
||||
@@ -797,7 +797,6 @@ def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found
|
||||
if found.value:
|
||||
break
|
||||
|
||||
current = __functions__[hash_regex](password=word, uppercase=False, **kwargs)
|
||||
count += 1
|
||||
|
||||
if not isinstance(word, basestring):
|
||||
@@ -807,6 +806,8 @@ def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found
|
||||
word = word + suffix
|
||||
|
||||
try:
|
||||
current = __functions__[hash_regex](password=word, uppercase=False, **kwargs)
|
||||
|
||||
if hash_ == current:
|
||||
if hash_regex == HASH.ORACLE_OLD: # only for cosmetic purposes
|
||||
word = word.upper()
|
||||
|
||||
Reference in New Issue
Block a user