thegame_1980/KeyDive
1
0
Fork 0
mirror of https://github.com/hyugogirubato/KeyDive.git synced 2026-07-15 18:40:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

format catch handler

Browse Source
This commit is contained in:
hyugogirubato
2026-04-28 21:10:05 +02:00
parent 9149c8c67c
commit 1f8952d3df
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keydive/keydive.js
+4 -18
View File
@@ -105,14 +105,13 @@ Memory.readStdStringAny = function (address) {
Memory.readStdStringRange, // 24B vector-style (old MediaTek/ARMv7 Widevine) Memory.readStdStringRange, // 24B vector-style (old MediaTek/ARMv7 Widevine)
Memory.readStdString, // libc++ (modern Android) Memory.readStdString, // libc++ (modern Android)
Memory.readStdStringGnuCxx11, // libstdc++ C++11 (old NDK GCC, _GLIBCXX_USE_CXX11_ABI=1) Memory.readStdStringGnuCxx11, // libstdc++ C++11 (old NDK GCC, _GLIBCXX_USE_CXX11_ABI=1)
Memory.readStdStringGnuCow, // libstdc++ pre-C++11 (very old NDK GCC) Memory.readStdStringGnuCow // libstdc++ pre-C++11 (very old NDK GCC)
]; ];
for (const reader of readers) { for (const reader of readers) {
try { try {
const data = reader(address); const data = reader(address);
if (data && data.byteLength > 0) return data; if (data && data.byteLength > 0) return data;
} catch (e) { /* try next */ } catch (e) { /* try next */ }
}
} }
return null; return null;
} }
@@ -167,14 +166,13 @@ Memory.readStdVectorAny = function (address) {
const readers = [ const readers = [
Memory.readAndroidVector, // android::Vector<uint8_t> Memory.readAndroidVector, // android::Vector<uint8_t>
Memory.readStdVectorRange, // std::vector<uint8_t> Memory.readStdVectorRange, // std::vector<uint8_t>
Memory.readStdVector, // legacy U16-at-offset-8 layout Memory.readStdVector // legacy U16-at-offset-8 layout
]; ];
for (const reader of readers) { for (const reader of readers) {
try { try {
const data = reader(address); const data = reader(address);
if (data && data.byteLength > 0) return data; if (data && data.byteLength > 0) return data;
} catch (e) { /* try next */ } catch (e) { /* try next */ }
}
} }
return null; return null;
} }
@@ -403,15 +401,11 @@ function CdmLicense_PrepareKeyRequest(address) {
// Extract and dump the relevant arguments // Extract and dump the relevant arguments
for (let i = 0; i < this.params.length; i++) { for (let i = 0; i < this.params.length; i++) {
// Extract the signed_request data (CdmKeyMessage*) // Extract the signed_request data (CdmKeyMessage*)
try {
const signedRequestData = Memory.readStdStringAny(this.params[i]); const signedRequestData = Memory.readStdStringAny(this.params[i]);
if (signedRequestData) { if (signedRequestData) {
dumped = true; dumped = true;
send('challenge', signedRequestData); send('challenge', signedRequestData);
} }
} catch (e) {
// print(Level.WARNING, `Failed to extract signed_request data from args[${i}]`);
}
} }
!dumped && print(Level.ERROR, 'Failed to dump challenge data'); !dumped && print(Level.ERROR, 'Failed to dump challenge data');
} }
@@ -449,15 +443,11 @@ function CdmEngine_GenerateKeyRequest(address) {
// Extract and dump the relevant arguments // Extract and dump the relevant arguments
for (let i = 0; i < this.params.length; i++) { for (let i = 0; i < this.params.length; i++) {
// Extract the signed_request data (CdmKeyMessage*) // Extract the signed_request data (CdmKeyMessage*)
try {
const signedRequestData = Memory.readStdStringAny(this.params[i]); const signedRequestData = Memory.readStdStringAny(this.params[i]);
if (signedRequestData) { if (signedRequestData) {
dumped = true; dumped = true;
send('challenge', signedRequestData); send('challenge', signedRequestData);
} }
} catch (e) {
// print(Level.WARNING, `Failed to extract signed_request data from args[${i}]`);
}
} }
!dumped && print(Level.ERROR, 'Failed to dump challenge data'); !dumped && print(Level.ERROR, 'Failed to dump challenge data');
} }
@@ -792,15 +782,11 @@ function WVDrmPlugin_provideProvisionResponse(address) {
// Extract and dump the relevant arguments // Extract and dump the relevant arguments
for (let i = 0; i < 4; i++) { for (let i = 0; i < 4; i++) {
try {
const responseData = Memory.readStdVectorAny(args[i]); const responseData = Memory.readStdVectorAny(args[i]);
if (responseData) { if (responseData) {
dumped = true; dumped = true;
send('provisioning_response', responseData); send('provisioning_response', responseData);
} }
} catch (e) {
// print(Level.WARNING, `Failed to extract provisioning response data from args[${i}]`);
}
} }
!dumped && print(Level.ERROR, 'Failed to dump provisioning response data'); !dumped && print(Level.ERROR, 'Failed to dump provisioning response data');
} }