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

Add conversion from bytearray to bytes so that pids are hashable

This commit is contained in:
penenkel 2020-11-30 23:25:01 +01:00 committed by GitHub
parent d3c7388327
commit ad5cb056f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DeDRM_plugin/k4mobidedrm.py
View File

@ -228,7 +228,10 @@ def GetDecryptedBook(infile, kDatabases, androidFiles, serials, pids, starttime
serials.extend(androidkindlekey.get_serials(aFile)) serials.extend(androidkindlekey.get_serials(aFile))
# extend PID list with book-specific PIDs from seriala and kDatabases # extend PID list with book-specific PIDs from seriala and kDatabases
md1, md2 = mb.getPIDMetaInfo() md1, md2 = mb.getPIDMetaInfo()
totalpids.extend(kgenpids.getPidList(md1, md2, serials, kDatabases)) bookspecific = kgenpids.getPidList(md1, md2, serials, kDatabases)
# kgenpids.getPidList returns each pid as a (mutable) bytearray
# conversion to (immutable) bytes is nessesary as otherwise the set() function below will fail
totalpids.extend((bytes(pid) for pid in bookspecific))
# remove any duplicates # remove any duplicates
totalpids = list(set(totalpids)) totalpids = list(set(totalpids))
print("Found {1:d} keys to try after {0:.1f} seconds".format(time.time()-starttime, len(totalpids))) print("Found {1:d} keys to try after {0:.1f} seconds".format(time.time()-starttime, len(totalpids)))