jacob/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/noDRM/DeDRM_tools.git synced 2025-10-23 23:07:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

DeDRM ion: Correctly throw last exception if decrypt fails

Browse source
This commit is contained in:
Martin Rys 2024-10-27 22:57:43 +01:00 • committed by noDRM
parent 195ea69537
commit 34c4c067e8
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DeDRM_plugin/ion.py
View file

@ -13,6 +13,7 @@ Revision history:
Copyright © 2013-2020 Apprentice Harper et al.
"""
from __future__ import annotations
import collections
import hashlib
@ -1345,7 +1346,7 @@ class DrmIonVoucher(object):
process_V4648(shared), process_V5683(shared)]
decrypted=False
ex=None
lastexception: Exception | None = None
for sharedsecret in sharedsecrets:
key = hmac.new(sharedsecret, b"PIDv3", digestmod=hashlib.sha256).digest()
aes = AES.new(key[:32], AES.MODE_CBC, self.cipheriv[:16])
@ -1362,9 +1363,10 @@ class DrmIonVoucher(object):
print("Decryption succeeded")
break
except Exception as ex:
lastexception = ex
print("Decryption failed, trying next fallback ")
if not decrypted:
raise ex
raise lastexception
self.drmkey.stepin()
while self.drmkey.hasnext():