@@ -3765,7 +3765,13 @@ def GetHeaderChecksum(inlist=None, checksumtype="md5", encodedata=True, formatsp
37653765 hdr_bytes = _to_bytes(hdr_bytes)
37663766 hdr_bytes = bytes(hdr_bytes)
37673767 saltkeyval = None
3768- if(saltkey is not None and os.path.exists(saltkey)):
3768+ if(hasattr(saltkey, "read")):
3769+ saltkeyval = skfp.read()
3770+ if(not isinstance(saltkeyval, bytes) and sys.version_info[0] >= 3):
3771+ saltkeyval = saltkeyval.encode("UTF-8")
3772+ elif(isinstance(saltkey, bytes) and sys.version_info[0] >= 3):
3773+ saltkeyval = saltkey
3774+ elif(saltkey is not None and os.path.exists(saltkey)):
37693775 with open(saltkey, "rb") as skfp:
37703776 saltkeyval = skfp.read()
37713777 else:
@@ -3790,7 +3796,13 @@ def GetFileChecksum(inbytes, checksumtype="md5", encodedata=True, formatspecs=__
37903796 """
37913797 algo_key = (checksumtype or "md5").lower()
37923798 saltkeyval = None
3793- if(saltkey is not None and os.path.exists(saltkey)):
3799+ if(hasattr(saltkey, "read")):
3800+ saltkeyval = skfp.read()
3801+ if(not isinstance(saltkeyval, bytes) and sys.version_info[0] >= 3):
3802+ saltkeyval = saltkeyval.encode("UTF-8")
3803+ elif(isinstance(saltkey, bytes) and sys.version_info[0] >= 3):
3804+ saltkeyval = saltkey
3805+ elif(saltkey is not None and os.path.exists(saltkey)):
37943806 with open(saltkey, "rb") as skfp:
37953807 saltkeyval = skfp.read()
37963808 else:
0 commit comments