diff options
| author | NoDRM <[email protected]> | 2023-06-23 19:44:24 +0200 |
|---|---|---|
| committer | NoDRM <[email protected]> | 2023-06-23 19:44:24 +0200 |
| commit | a553a71f459b299f2bb3c9cfd7f83799fb9fbe55 (patch) | |
| tree | 2a177ee3da6df574be75ee596d290f2695f0fc23 | |
| parent | 740b46546f69a0790a48ad1b32e03609e8084644 (diff) | |
Fix font decryption with multiple IDs (#347)
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | DeDRM_plugin/epubfontdecrypt.py | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 98524fb..cdb0d6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. - 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. +- Fix font decryption not working with some books (fixes #347), thanks for the patch @bydioeds. diff --git a/DeDRM_plugin/epubfontdecrypt.py b/DeDRM_plugin/epubfontdecrypt.py index 4baa375..c9a982f 100644 --- a/DeDRM_plugin/epubfontdecrypt.py +++ b/DeDRM_plugin/epubfontdecrypt.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # epubfontdecrypt.py -# Copyright © 2021 by noDRM +# Copyright © 2021-2023 by noDRM # Released under the terms of the GNU General Public Licence, version 3 # <http://www.gnu.org/licenses/> @@ -10,6 +10,7 @@ # Revision history: # 1 - Initial release +# 2 - Bugfix for multiple book IDs, reported at #347 """ Decrypts / deobfuscates font files in EPUB files @@ -18,7 +19,7 @@ Decrypts / deobfuscates font files in EPUB files from __future__ import print_function __license__ = 'GPL v3' -__version__ = "1" +__version__ = "2" import os import traceback @@ -193,9 +194,10 @@ def decryptFontsBook(inpath, outpath): pass try: - identify_element = container.find(packageNS("metadata")).find(metadataDCNS("identifier")) - if (secret_key_name is None or secret_key_name == identify_element.get("id")): - font_master_key = identify_element.text + identify_elements = container.find(packageNS("metadata")).findall(metadataDCNS("identifier")) + for element in identify_elements: + if (secret_key_name is None or secret_key_name == element.get("id")): + font_master_key = element.text except: pass |