francois/DeDRM_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More Python 3 fixes for Customize plugin dialog

Browse Source
This commit is contained in:
Aldo Bleeker
2020-11-06 23:49:18 +01:00
parent e2e19fb50f
commit 7f4e6698ef
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DeDRM_plugin/erdr2pml.py Normal file → Executable file
View File

@@ -542,10 +542,10 @@ def usage():
print(" It's enough to enter the last 8 digits of the credit card number")
return
def getuser_key(name,cc):
def getuser_key(name, cc):
newname = "".join(c for c in name.lower() if c >= 'a' and c <= 'z' or c >= '0' and c <= '9')
cc = cc.replace(" ","")
return struct.pack('>LL', binascii.crc32(newname) & 0xffffffff,binascii.crc32(cc[-8:])& 0xffffffff)
return struct.pack('>LL', binascii.crc32(bytes(newname.encode('utf-8'))) & 0xffffffff, binascii.crc32(bytes(cc[-8:].encode('utf-8'))) & 0xffffffff)
def cli_main():
print("eRdr2Pml v{0}. Copyright © 2009–2020 The Dark Reverser et al.".format(__version__))
@@ -580,9 +580,9 @@ def cli_main():
elif len(args)==4:
infile, outpath, name, cc = args
print(getuser_key(name,cc).encode('hex'))
print(bin2ascii.b2a_hex(getuser_key(name, cc)))
return decryptBook(infile, outpath, make_pmlz, getuser_key(name,cc))
return decryptBook(infile, outpath, make_pmlz, bin2ascii.b2a_hex(getuser_key(name, cc)))
if __name__ == "__main__":