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

Fix for key decryption failure

This commit is contained in:
Aldo Bleeker 2022-02-20 18:00:12 +01:00
parent f6b14efc5a
commit 1c8b6531e6
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DeDRM_plugin/ineptepub.py
View File

@ -329,7 +329,7 @@ def _load_crypto_pycrypto():
return total
def decrypt(self, data):
return _PKCS1_v1_5.new(self._rsa).decrypt(data, 172)
return _PKCS1_v1_5.new(self._rsa).decrypt(data, b'')
return (AES, RSA)
@ -466,6 +466,12 @@ def adeptGetUserUUID(inpath):
return None
def verify_book_key(bookkey):
if len(bookkey) < 16:
return False
if len(bookkey) == 16:
return True
if bookkey[-17] != '\x00' and bookkey[-17] != 0:
# Byte not null, invalid result
return False
@ -523,13 +529,13 @@ def decryptBook(userkey, inpath, outpath):
bookkey = rsa.decrypt(base64.b64decode(bookkey.encode('ascii')))
# Verify key:
if len(bookkey) > 16:
# Padded as per RSAES-PKCS1-v1_5
if verify_book_key(bookkey):
if verify_book_key(bookkey):
if len(bookkey) > 16:
# Padded as per RSAES-PKCS1-v1_5
bookkey = bookkey[-16:]
else:
print("Could not decrypt {0:s}. Wrong key".format(os.path.basename(inpath)))
return 2
else:
print("Could not decrypt {0:s}. Wrong key".format(os.path.basename(inpath)))
return 2
else:
# Adobe PassHash / B&N
key = base64.b64decode(userkey)[:16]