Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More handling of difference between python2 and python3 

Place where python3 use bytes/int and python2 str/str
This commit is contained in:
Rémi Vanicat 2020-05-08 17:57:28 +02:00
parent 2fbf2c1c5f
commit f7b4efc3e1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DeDRM_plugin/ineptepub.py
View File

@ -210,7 +210,7 @@ def _load_crypto_libcrypto():
def decrypt(self, data): def decrypt(self, data):
out = create_string_buffer(len(data)) out = create_string_buffer(len(data))
iv = ("\x00" * self._blocksize) iv = (b"\x00" * self._blocksize)
rv = AES_cbc_encrypt(data, out, len(data), self._key, iv, 0) rv = AES_cbc_encrypt(data, out, len(data), self._key, iv, 0)
if rv == 0: if rv == 0:
raise ADEPTError('AES decryption failed') raise ADEPTError('AES decryption failed')
@ -371,7 +371,7 @@ class Decryptor(object):
def decompress(self, bytes): def decompress(self, bytes):
dc = zlib.decompressobj(-15) dc = zlib.decompressobj(-15)
bytes = dc.decompress(bytes) bytes = dc.decompress(bytes)
ex = dc.decompress('Z') + dc.flush() ex = dc.decompress(b'Z') + dc.flush()
if ex: if ex:
bytes = bytes + ex bytes = bytes + ex
return bytes return bytes
@ -379,7 +379,11 @@ class Decryptor(object):
def decrypt(self, path, data): def decrypt(self, path, data):
if path.encode('utf-8') in self._encrypted: if path.encode('utf-8') in self._encrypted:
data = self._aes.decrypt(data)[16:] data = self._aes.decrypt(data)[16:]
data = data[:-ord(data[-1])] if type(data[-1]) != int:
place = ord(data[-1])
else:
place = data[-1]
data = data[:-place]
data = self.decompress(data) data = self.decompress(data)
return data return data