francois/DeDRM_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using byte string in kfxdedrm.py

Browse Source
This commit is contained in:
xxyzz
2020-11-27 22:01:18 +08:00
parent e0c7d7d382
commit 66bab7bd7d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DeDRM_plugin/kfxdedrm.py
View File

@@ -35,7 +35,7 @@ class KFXZipBook:
for filename in zf.namelist(): for filename in zf.namelist():
with zf.open(filename) as fh: with zf.open(filename) as fh:
data = fh.read(8) data = fh.read(8)
if data != '\xeaDRMION\xee': if data != b'\xeaDRMION\xee':
continue continue
data += fh.read() data += fh.read()
if self.voucher is None: if self.voucher is None:
@@ -53,11 +53,11 @@ class KFXZipBook:
for info in zf.infolist(): for info in zf.infolist():
with zf.open(info.filename) as fh: with zf.open(info.filename) as fh:
data = fh.read(4) data = fh.read(4)
if data != '\xe0\x01\x00\xea': if data != b'\xe0\x01\x00\xea':
continue continue
data += fh.read() data += fh.read()
if 'ProtectedData' in data: if b'ProtectedData' in data:
break # found DRM voucher break # found DRM voucher
else: else:
raise Exception("The .kfx-zip archive contains an encrypted DRMION file without a DRM voucher") raise Exception("The .kfx-zip archive contains an encrypted DRMION file without a DRM voucher")