Fixes #2809

stamparm · stamparm · commit e7268ffb4d47 · 2017-12-01T10:32:44.000+01:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.11.40"
+VERSION = "1.1.12.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)
diff --git a/lib/utils/hash.py b/lib/utils/hash.py
@@ -366,6 +366,12 @@ def _encode64(value, count):
     if isinstance(password, unicode):
         password = password.encode(UNICODE_ENCODING)
 
+    if isinstance(magic, unicode):
+        magic = magic.encode(UNICODE_ENCODING)
+
+    if isinstance(salt, unicode):
+        salt = salt.encode(UNICODE_ENCODING)
+
     salt = salt[:8]
     ctx = password + magic + salt
     final = md5(password + salt + password).digest()
diff --git a/txt/checksum.md5 b/txt/checksum.md5
@@ -46,7 +46,7 @@ e1c000db9be27f973569b1a430629037  lib/core/option.py
 760d9df2a27ded29109b390ab202e72d  lib/core/replication.py
 a2466b62e67f8b31736bac4dac590e51  lib/core/revision.py
 02d4762140a72fd44668d3dab5eabda9  lib/core/session.py
-cbc55bdbfa857e49d1f1f158a44e4de5  lib/core/settings.py
+3f8a858155092e17d146cd6021057338  lib/core/settings.py
 35bffbad762eb9e03db9e93b1c991103  lib/core/shell.py
 a59ec28371ae067a6fdd8f810edbee3d  lib/core/subprocessng.py
 d5a04d672a18f78deb2839c3745ff83c  lib/core/target.py
@@ -105,7 +105,7 @@ a2d2087353fb64a8441c3247ae0ad719  lib/utils/deps.py
 b806de9710a02436e576ac9065816021  lib/utils/getch.py
 fe3a38f820ae05a95f92ab53e22b46d0  lib/utils/har.py
 1bdd3e6483d3d7c4fd6ec59e9526b542  lib/utils/hashdb.py
-f6772e95ab1ca991adbecc4434535a92  lib/utils/hash.py
+193c294d960c310808495a63167eab00  lib/utils/hash.py
 f20ae1aa6a8d1d5373ace1f7ed3476a7  lib/utils/htmlentities.py
 5fb9aaf874daa47ea2b672a22740e56b  lib/utils/__init__.py
 06cd61b634ca6142281da699a504cc85  lib/utils/pivotdumptable.py
