From: fireattack <human.peng@gmail.com>
Date: Mon, 2 Nov 2020 08:09:52 +0000 (-0600)
Subject: Convert all to bytes first before concat
X-Git-Url: http://git.xmof.duckdns.org/?a=commitdiff_plain;h=4a319a35226dc12e6d2f9ea6e396bdc874d9e813;p=DeDRM.git

Convert all to bytes first before concat
---

diff --git a/DeDRM_plugin/kindlekey.py b/DeDRM_plugin/kindlekey.py
index 808b1b7..aabb275 100644
--- a/DeDRM_plugin/kindlekey.py
+++ b/DeDRM_plugin/kindlekey.py
@@ -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