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

Merge pull request #1348 from fireattack/master 

Convert all to bytes first before concat (fix for Windows routine)
This commit is contained in:
Apprentice Harper 2020-11-05 10:51:56 +00:00 committed by GitHub
parent f1ef1b8ecd 4a319a3522
commit e2e19fb50f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 added_entropy = build + guid
elif version == 6: # .kinf2018 elif version == 6: # .kinf2018
salt = str(0x6d8 * int(build)).encode('utf-8') + guid salt = str(0x6d8 * int(build)).encode('utf-8') + guid
sp = GetUserName() + '+@#$%+' + GetIDString() sp = GetUserName() + b'+@#$%+' + GetIDString().encode('utf-8')
passwd = encode(SHA256(sp), charMap5) passwd = encode(SHA256(sp), charMap5)
key = KeyIVGen().pbkdf2(passwd, salt, 10000, 0x400)[:32] # this is very slow key = KeyIVGen().pbkdf2(passwd, salt, 10000, 0x400)[:32] # this is very slow