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

Fix font decryption with multiple IDs (#347)

This commit is contained in:
NoDRM 2023-06-23 19:44:24 +02:00
parent 740b46546f
commit a553a71f45
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -90,3 +90,4 @@ List of changes since the fork of Apprentice Harper's repository:
- Bugfix: EPUBs with remaining content in the encryption.xml after decryption weren't written correctly. - Bugfix: EPUBs with remaining content in the encryption.xml after decryption weren't written correctly.
- Support for Adobe's 'aes128-cbc-uncompressed' encryption method (fixes #242). - Support for Adobe's 'aes128-cbc-uncompressed' encryption method (fixes #242).
- Two bugfixes for Amazon DeDRM from Satuoni ( https://github.com/noDRM/DeDRM_tools/issues/315#issuecomment-1508305428 ) and andrewc12 ( https://github.com/andrewc12/DeDRM_tools/commit/d9233d61f00d4484235863969919059f4d0b2057 ) that might make the plugin work with newer versions. - Two bugfixes for Amazon DeDRM from Satuoni ( https://github.com/noDRM/DeDRM_tools/issues/315#issuecomment-1508305428 ) and andrewc12 ( https://github.com/andrewc12/DeDRM_tools/commit/d9233d61f00d4484235863969919059f4d0b2057 ) that might make the plugin work with newer versions.
- Fix font decryption not working with some books (fixes #347), thanks for the patch @bydioeds.

12
DeDRM_plugin/epubfontdecrypt.py
View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# epubfontdecrypt.py # epubfontdecrypt.py
# Copyright © 2021 by noDRM # Copyright © 2021-2023 by noDRM
# Released under the terms of the GNU General Public Licence, version 3 # Released under the terms of the GNU General Public Licence, version 3
# <http://www.gnu.org/licenses/> # <http://www.gnu.org/licenses/>
@ -10,6 +10,7 @@
# Revision history: # Revision history:
# 1 - Initial release # 1 - Initial release
# 2 - Bugfix for multiple book IDs, reported at #347
""" """
Decrypts / deobfuscates font files in EPUB files Decrypts / deobfuscates font files in EPUB files
@ -18,7 +19,7 @@ Decrypts / deobfuscates font files in EPUB files
from __future__ import print_function from __future__ import print_function
__license__ = 'GPL v3' __license__ = 'GPL v3'
__version__ = "1" __version__ = "2"
import os import os
import traceback import traceback
@ -193,9 +194,10 @@ def decryptFontsBook(inpath, outpath):
pass pass
try: try:
identify_element = container.find(packageNS("metadata")).find(metadataDCNS("identifier")) identify_elements = container.find(packageNS("metadata")).findall(metadataDCNS("identifier"))
if (secret_key_name is None or secret_key_name == identify_element.get("id")): for element in identify_elements:
font_master_key = identify_element.text if (secret_key_name is None or secret_key_name == element.get("id")):
font_master_key = element.text
except: except:
pass pass