skoobasteeve/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/noDRM/DeDRM_tools.git synced 2026-03-20 04:58:56 +00:00
Code Issues Projects Releases Wiki Activity

Try to fix B&N issues

Browse Source
This commit is contained in:
NoDRM
2022-01-02 16:23:36 +01:00
parent a275d5d819
commit d5473f1db0
3 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DeDRM_plugin/ineptepub.py
View File

@@ -521,6 +521,15 @@ def decryptBook(userkey, inpath, outpath):
# Normal Adobe ADEPT
rsa = RSA(userkey)
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):
bookkey = bookkey[-16:]
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]
@@ -533,14 +542,8 @@ def decryptBook(userkey, inpath, outpath):
bookkey = bookkey[:-pad]
# Padded as per RSAES-PKCS1-v1_5
if len(bookkey) > 16:
if verify_book_key(bookkey):
if len(bookkey) > 16:
bookkey = bookkey[-16:]
else:
print("Could not decrypt {0:s}. Wrong key".format(os.path.basename(inpath)))
return 2
encryption = inf.read('META-INF/encryption.xml')
decryptor = Decryptor(bookkey, encryption)