@@ -3757,7 +3757,13 @@ def GetHeaderChecksum(inlist=None, checksumtype="md5", encodedata=True, formatsp
37573757 hdr_bytes = _to_bytes(hdr_bytes)
37583758 hdr_bytes = bytes(hdr_bytes)
37593759 saltkeyval = None
3760- if(saltkey is not None and os.path.exists(saltkey)):
3760+ if(hasattr(saltkey, "read")):
3761+ saltkeyval = skfp.read()
3762+ if(not isinstance(saltkeyval, bytes) and sys.version_info[0] >= 3):
3763+ saltkeyval = saltkeyval.encode("UTF-8")
3764+ elif(isinstance(saltkey, bytes) and sys.version_info[0] >= 3):
3765+ saltkeyval = saltkey
3766+ elif(saltkey is not None and os.path.exists(saltkey)):
37613767 with open(saltkey, "rb") as skfp:
37623768 saltkeyval = skfp.read()
37633769 else:
@@ -3782,7 +3788,13 @@ def GetFileChecksum(inbytes, checksumtype="md5", encodedata=True, formatspecs=__
37823788 """
37833789 algo_key = (checksumtype or "md5").lower()
37843790 saltkeyval = None
3785- if(saltkey is not None and os.path.exists(saltkey)):
3791+ if(hasattr(saltkey, "read")):
3792+ saltkeyval = skfp.read()
3793+ if(not isinstance(saltkeyval, bytes) and sys.version_info[0] >= 3):
3794+ saltkeyval = saltkeyval.encode("UTF-8")
3795+ elif(isinstance(saltkey, bytes) and sys.version_info[0] >= 3):
3796+ saltkeyval = saltkey
3797+ elif(saltkey is not None and os.path.exists(saltkey)):
37863798 with open(saltkey, "rb") as skfp:
37873799 saltkeyval = skfp.read()
37883800 else:
0 commit comments