Miroirs/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/apprenticeharper/DeDRM_tools synced 2024-11-16 07:47:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert all to bytes first before concat

Browse source
This commit is contained in:
fireattack 2020-11-02 02:09:52 -06:00
parent f1ef1b8ecd
commit 4a319a3522
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DeDRM_plugin/kindlekey.py
View file

@ -1084,7 +1084,7 @@ if iswindows:
added_entropy = build + guid
elif version == 6: # .kinf2018
salt = str(0x6d8 * int(build)).encode('utf-8') + guid
sp = GetUserName() + '+@#$%+' + GetIDString()
sp = GetUserName() + b'+@#$%+' + GetIDString().encode('utf-8')
passwd = encode(SHA256(sp), charMap5)
key = KeyIVGen().pbkdf2(passwd, salt, 10000, 0x400)[:32] # this is very slow