Android-Tools/KeyDive
1
0
Fork 0
mirror of https://github.com/hyugogirubato/KeyDive.git synced 2024-12-22 02:48:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update device id func

Browse Source
This commit is contained in:
hyugogirubato 2024-07-12 09:37:16 +02:00
parent 3ef21d003a
commit 4f96defd31
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keydive/keydive.js
View File

@ -181,7 +181,7 @@ const PrepareKeyRequest = (address) => {
}
const LoadDeviceRSAKey = (address, name) => {
// wvcdm::OEMCrypto::LoadDeviceRSAKey
// wvdash::OEMCrypto::LoadDeviceRSAKey
Interceptor.attach(address, {
onEnter: function (args) {
if (!args[6].isNull()) {
@ -233,22 +233,22 @@ const getKeyLength = (key) => {
return pos + lengthValue;
}
const GetDeviceId = (address, name) => {
// wvcdm::Properties::GetCdmClientPropertySet
const GetDeviceID = (address, name) => {
// wvdash::OEMCrypto::GetDeviceID
Interceptor.attach(address, {
onEnter: function (args) {
print(Level.DEBUG, '[+] onEnter: getOemcryptoDeviceId');
print(Level.DEBUG, '[+] onEnter: GetDeviceID');
this.data = args[0];
this.size = args[1];
},
onLeave: function (retval) {
print(Level.DEBUG, '[-] onLeave: getOemcryptoDeviceId');
print(Level.DEBUG, '[-] onLeave: GetDeviceID');
try {
const size = Memory.readPointer(this.size).toInt32();
const data = Memory.readByteArray(this.data, size);
data && send('client_id', data);
} catch (e) {
print(Level.ERROR, `Failed to dump device Id.`);
print(Level.ERROR, `Failed to dump device ID.`);
}
}
});
@ -289,7 +289,7 @@ const hookLibrary = (name) => {
} else if (funcName.includes('PrepareKeyRequest')) {
PrepareKeyRequest(funcAddr);
} else if (funcName.includes('getOemcryptoDeviceId')) {
GetDeviceId(funcAddr);
GetDeviceID(funcAddr);
} else if (targets.includes(funcName) || (!targets.length && funcName.match(/^[a-z]+$/))) {
LoadDeviceRSAKey(funcAddr, funcName);
} else {