From: NoDRM Date: Fri, 6 Jan 2023 13:29:56 +0000 (+0100) Subject: Fix issue with remaining data in encryption.xml X-Git-Url: http://git.xmof.duckdns.org/?a=commitdiff_plain;h=3c12806f38eecfd5b37a5ace890f7c00cbe52169;p=DeDRM.git Fix issue with remaining data in encryption.xml --- diff --git a/DeDRM_plugin/ineptepub.py b/DeDRM_plugin/ineptepub.py index 8d112e4..d403dac 100644 --- a/DeDRM_plugin/ineptepub.py +++ b/DeDRM_plugin/ineptepub.py @@ -89,7 +89,7 @@ class Decryptor(object): def __init__(self, bookkey, encryption): enc = lambda tag: '{%s}%s' % (NSMAP['enc'], tag) self._aes = AES.new(bookkey, AES.MODE_CBC, b'\x00'*16) - encryption = etree.fromstring(encryption) + self._encryption = etree.fromstring(encryption) self._encrypted = encrypted = set() self._otherData = otherData = set() @@ -97,7 +97,7 @@ class Decryptor(object): self._has_remaining_xml = False expr = './%s/%s/%s' % (enc('EncryptedData'), enc('CipherData'), enc('CipherReference')) - for elem in encryption.findall(expr): + for elem in self._encryption.findall(expr): path = elem.get('URI', None) encryption_type_url = (elem.getparent().getparent().find("./%s" % (enc('EncryptionMethod'))).get('Algorithm', None)) if path is not None: