Skip to content

Commit b87c2dc

Browse files
committed
Use older hash modules when hashlib isn't there
1 parent 75c94cc commit b87c2dc

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

data/meterpreter/ext_server_stdapi.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -681,12 +681,12 @@ def stdapi_fs_ls(request, response):
681681

682682
@meterpreter.register_function
683683
def stdapi_fs_md5(request, response):
684-
if sys.version_info[0] == 2 and sys.version_info[1] < 5:
685-
import md5
686-
m = md5.new()
687-
else:
684+
try:
688685
import hashlib
689686
m = hashlib.md5()
687+
except ImportError:
688+
import md5
689+
m = md5.new()
690690
path = packet_get_tlv(request, TLV_TYPE_FILE_PATH)['value']
691691
m.update(open(path, 'rb').read())
692692
response += tlv_pack(TLV_TYPE_FILE_NAME, m.digest())
@@ -728,12 +728,12 @@ def stdapi_fs_separator(request, response):
728728

729729
@meterpreter.register_function
730730
def stdapi_fs_sha1(request, response):
731-
if sys.version_info[0] == 2 and sys.version_info[1] < 5:
732-
import sha1
733-
m = sha1.new()
734-
else:
731+
try:
735732
import hashlib
736733
m = hashlib.sha1()
734+
except ImportError:
735+
import sha
736+
m = sha.new()
737737
path = packet_get_tlv(request, TLV_TYPE_FILE_PATH)['value']
738738
m.update(open(path, 'rb').read())
739739
response += tlv_pack(TLV_TYPE_FILE_NAME, m.digest())

0 commit comments

Comments
 (0)