From 4bea0e343ad7ce47c23e5da9bfeeb95ee2244d86 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 23 Feb 2010 08:54:33 +0000 Subject: [PATCH] Avoiding md5/sha1 deprecated warning in Python >=2.6 --- lib/core/convert.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/core/convert.py b/lib/core/convert.py index 9830faf32..1aae22c1e 100644 --- a/lib/core/convert.py +++ b/lib/core/convert.py @@ -22,8 +22,13 @@ with sqlmap; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA """ -import md5 -import sha +try: + import hashlib +except: + import md5 + import sha + +import sys import struct import urllib @@ -45,7 +50,10 @@ def hexencode(string): return string.encode("hex") def md5hash(string): - return md5.new(string).hexdigest() + if sys.modules.has_key('hashlib'): + return hashlib.md5(string).hexdigest() + else: + return md5.new(string).hexdigest() def orddecode(string): packedString = struct.pack("!"+"I" * len(string), *string) @@ -55,7 +63,10 @@ def ordencode(string): return tuple([ord(char) for char in string]) def sha1hash(string): - return sha.new(string).hexdigest() + if sys.modules.has_key('hashlib'): + return hashlib.sha1(string).hexdigest() + else: + return sha.new(string).hexdigest() def urldecode(string): result = None