diff --git a/lib/core/common.py b/lib/core/common.py index 2a8a4c369..a9d6c6bcb 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -3532,9 +3532,6 @@ def unhandledExceptionMessage(): def getLatestRevision(): """ Retrieves latest revision from the offical repository - - >>> (getLatestRevision() or " ")[0].isdigit() - True """ retVal = None diff --git a/lib/core/settings.py b/lib/core/settings.py index a399de419..9bdd2d232 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty import six # sqlmap version (...) -VERSION = "1.3.5.31" +VERSION = "1.3.5.32" 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) diff --git a/lib/utils/hash.py b/lib/utils/hash.py index 6ac03ad3d..5c448c384 100644 --- a/lib/utils/hash.py +++ b/lib/utils/hash.py @@ -917,15 +917,15 @@ def dictionaryAttack(attack_dict): hash_ = hash_.lower() if hash_regex in (HASH.MD5_BASE64, HASH.SHA1_BASE64, HASH.SHA256_BASE64, HASH.SHA512_BASE64): - item = [(user, decodeBase64(hash_, binary=False).encode("hex")), {}] + item = [(user, encodeHex(decodeBase64(hash_, binary=True))), {}] elif hash_regex in (HASH.MYSQL, HASH.MYSQL_OLD, HASH.MD5_GENERIC, HASH.SHA1_GENERIC, HASH.SHA224_GENERIC, HASH.SHA256_GENERIC, HASH.SHA384_GENERIC, HASH.SHA512_GENERIC, HASH.APACHE_SHA1): item = [(user, hash_), {}] elif hash_regex in (HASH.SSHA,): - item = [(user, hash_), {"salt": decodeBase64(hash_, binary=False)[20:]}] + item = [(user, hash_), {"salt": decodeBase64(hash_, binary=True)[20:]}] elif hash_regex in (HASH.SSHA256,): - item = [(user, hash_), {"salt": decodeBase64(hash_, binary=False)[32:]}] + item = [(user, hash_), {"salt": decodeBase64(hash_, binary=True)[32:]}] elif hash_regex in (HASH.SSHA512,): - item = [(user, hash_), {"salt": decodeBase64(hash_, binary=False)[64:]}] + item = [(user, hash_), {"salt": decodeBase64(hash_, binary=True)[64:]}] elif hash_regex in (HASH.ORACLE_OLD, HASH.POSTGRES): item = [(user, hash_), {'username': user}] elif hash_regex in (HASH.ORACLE,):