Crunchy-DL
/
KeyDive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new library name hook

This commit is contained in:
hyugogirubato 2024-06-22 18:08:16 +02:00
parent ee417f570e
commit f311500760
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extractor/cdm.py
View File

@ -14,6 +14,8 @@ from pywidevine.device import Device, DeviceTypes
from pywidevine.license_protocol_pb2 import SignedMessage, LicenseRequest, ClientIdentification, DrmCertificate, SignedDrmCertificate from pywidevine.license_protocol_pb2 import SignedMessage, LicenseRequest, ClientIdentification, DrmCertificate, SignedDrmCertificate
from unidecode import unidecode from unidecode import unidecode
from extractor.constants import Native
from extractor.uils import sanitize
from extractor.vendor import Vendor from extractor.vendor import Vendor
PARENT = Path(__file__).parent PARENT = Path(__file__).parent
@ -96,6 +98,7 @@ class Cdm:
replacements = { replacements = {
'${SDK_API}': str(self.sdk_api), '${SDK_API}': str(self.sdk_api),
'${OEM_CRYPTO_API}': json.dumps(list(self.OEM_CRYPTO_API)), '${OEM_CRYPTO_API}': json.dumps(list(self.OEM_CRYPTO_API)),
'${NATIVE_C_API}': json.dumps([v for i in list(Native) for v in i.value]),
'${SYMBOLS}': json.dumps(list(selected.values())), '${SYMBOLS}': json.dumps(list(selected.values())),
} }
@ -168,8 +171,9 @@ class Cdm:
details: [int] = [] details: [int] = []
processes = self.enumerate_processes() processes = self.enumerate_processes()
for k, v in Vendor.SDK_VERSIONS.items(): for k, v in Vendor.SDK_VERSIONS.items():
pid = processes.get(v[2]) # https://github.com/hyugogirubato/KeyDive/issues/14#issuecomment-2146788792
if pid: for name, pid in processes.items():
if v[2] in name:
self.logger.debug('Analysing... (%s)', v[2]) self.logger.debug('Analysing... (%s)', v[2])
session: Session = self.device.attach(pid) session: Session = self.device.attach(pid)
script: Script = session.create_script(self.script) script: Script = session.create_script(self.script)
@ -177,6 +181,7 @@ class Cdm:
if script.exports_sync.getlibrary(v[3]): if script.exports_sync.getlibrary(v[3]):
details.append(k) details.append(k)
session.detach() session.detach()
break
# If no compatible versions found # If no compatible versions found
if details: if details:
@ -249,7 +254,9 @@ class Cdm:
private_key = self.keys.get(key_id) private_key = self.keys.get(key_id)
if private_key: if private_key:
path = Path() / 'device' / str(self.device.name.strip().lower().replace(' ', '_')) / 'private_keys' / str(drm_certificate.system_id) / str(key_id)[:10] path = Path() / 'device' / sanitize(str(self.device.name)) / 'private_keys' / str(drm_certificate.system_id) / str(key_id)[:10]
# https://github.com/hyugogirubato/KeyDive/issues/14#issuecomment-2146958022
path = sanitize(path)
path.mkdir(parents=True, exist_ok=True) path.mkdir(parents=True, exist_ok=True)
path_client_id = path / 'client_id.bin' path_client_id = path / 'client_id.bin'
path_private_key = path / 'private_key.pem' path_private_key = path / 'private_key.pem'