2
0
mirror of https://github.com/apprenticeharper/DeDRM_tools synced 2024-10-30 21:20:10 +00:00

Fix username code for ADE key retrieval

This commit is contained in:
Florian Bach 2021-11-28 12:51:22 +01:00
parent 73af5d355d
commit 3aac5c0d41

View File

@ -228,6 +228,20 @@ if iswindows:
return GetUserName return GetUserName
GetUserName = GetUserName() GetUserName = GetUserName()
def GetUserName2():
try:
import winreg
except ImportError:
import _winreg as winreg
try:
DEVICE_KEY_PATH = r'Software\Adobe\Adept\Device'
regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, DEVICE_KEY_PATH)
userREG = winreg.QueryValueEx(regkey, 'username')[0].encode('utf-16-le')[::2]
return userREG
except:
return None
PAGE_EXECUTE_READWRITE = 0x40 PAGE_EXECUTE_READWRITE = 0x40
MEM_COMMIT = 0x1000 MEM_COMMIT = 0x1000
MEM_RESERVE = 0x2000 MEM_RESERVE = 0x2000
@ -351,6 +365,8 @@ if iswindows:
serial = GetVolumeSerialNumber(root) serial = GetVolumeSerialNumber(root)
vendor = cpuid0() vendor = cpuid0()
signature = struct.pack('>I', cpuid1())[1:] signature = struct.pack('>I', cpuid1())[1:]
user = GetUserName2()
if user is None:
user = GetUserName() user = GetUserName()
entropy = struct.pack('>I12s3s13s', serial, vendor, signature, user) entropy = struct.pack('>I12s3s13s', serial, vendor, signature, user)
cuser = winreg.HKEY_CURRENT_USER cuser = winreg.HKEY_CURRENT_USER