mirrors/DeDRM_tools
mirrors/DeDRM_tools
1
0
Fork 0
mirror of https://github.com/noDRM/DeDRM_tools.git synced 2024-12-27 03:27:38 +06:00
Code Issues Projects Releases Wiki Activity

Fix key import sometimes generating corrupted keys.

Browse Source 
Should fix #145, #134, #119, #116, #115, #109 and maybe others.
This commit is contained in:
NoDRM 2022-09-10 11:42:59 +02:00
parent 21281baf21
commit 2d4c5d2c4b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DeDRM_plugin/config.py
View File

@ -1152,7 +1152,8 @@ class AddAdeptDialog():
zip_function = zip zip_function = zip
for key, name in zip_function(defaultkeys, defaultnames): for key, name in zip_function(defaultkeys, defaultnames):
if codecs.encode(key,'hex').decode("latin-1") in self.parent.plugin_keys.values(): key = codecs.encode(key,'hex').decode("latin-1")
if key in self.parent.plugin_keys.values():
print("Found key '{0}' in ADE - already present, skipping.".format(name)) print("Found key '{0}' in ADE - already present, skipping.".format(name))
else: else:
self.new_keys.append(key) self.new_keys.append(key)
@ -1167,8 +1168,8 @@ class AddAdeptDialog():
key, name = checkForDeACSMkeys() key, name = checkForDeACSMkeys()
if key is not None: if key is not None:
key = codecs.encode(key,'hex').decode("latin-1")
if codecs.encode(key,'hex').decode("latin-1") in self.parent.plugin_keys.values(): if key in self.parent.plugin_keys.values():
print("Found key '{0}' in DeACSM - already present, skipping.".format(name)) print("Found key '{0}' in DeACSM - already present, skipping.".format(name))
else: else:
# Found new key, add that. # Found new key, add that.
@ -1202,7 +1203,7 @@ class AddAdeptDialog():
@property @property
def key_value(self): def key_value(self):
return codecs.encode(self.new_keys[0],'hex').decode("utf-8") return codecs.encode(self.new_keys[0],'hex').decode("latin-1")
@property @property