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

Merge pull request #1348 from fireattack/master

Browse source 
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
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
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