File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -681,12 +681,12 @@ def stdapi_fs_ls(request, response):
681
681
682
682
@meterpreter .register_function
683
683
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 :
688
685
import hashlib
689
686
m = hashlib .md5 ()
687
+ except ImportError :
688
+ import md5
689
+ m = md5 .new ()
690
690
path = packet_get_tlv (request , TLV_TYPE_FILE_PATH )['value' ]
691
691
m .update (open (path , 'rb' ).read ())
692
692
response += tlv_pack (TLV_TYPE_FILE_NAME , m .digest ())
@@ -728,12 +728,12 @@ def stdapi_fs_separator(request, response):
728
728
729
729
@meterpreter .register_function
730
730
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 :
735
732
import hashlib
736
733
m = hashlib .sha1 ()
734
+ except ImportError :
735
+ import sha
736
+ m = sha .new ()
737
737
path = packet_get_tlv (request , TLV_TYPE_FILE_PATH )['value' ]
738
738
m .update (open (path , 'rb' ).read ())
739
739
response += tlv_pack (TLV_TYPE_FILE_NAME , m .digest ())
You can’t perform that action at this time.
0 commit comments