mirror/rsmv
1
0
Fork 0
mirror of https://github.com/skillbert/rsmv.git synced 2025-12-23 21:47:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

cs2 deob testing

Browse Source
This commit is contained in:
Skillbert
2025-01-28 16:03:51 +01:00
parent bfdd8b7bf4
commit 9516db9521
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/clientscript/callibrator.ts
View File

@@ -300,7 +300,7 @@ export class ClientscriptObfuscation {
} else {
await r.loadCandidates();
r.parseCandidateContents();
callibrateSubtypes(r);//TODO is this needed?
callibrateSubtypes(r, r.candidates);//TODO is this needed?
}
return r;
}
@@ -417,13 +417,14 @@ export class ClientscriptObfuscation {
this.parammeta = await loadParams(this.source);
}
}
async loadCandidates() {
async loadCandidates(idstart = 0, idend = 0xffffff) {
let index = await this.source.getCacheIndex(cacheMajors.clientscript);
this.candidates.clear();
let source = this.source;
await trickleTasksTwoStep(10, function* () {
for (let entry of index) {
if (!entry) { continue; }
if (entry.minor < idstart || entry.minor > idend) { continue; }
yield source.getFile(entry.major, entry.minor, entry.crc).then<ScriptCandidate>(buf => ({
id: entry.minor,
scriptname: reverseHashes.get(index[entry.minor].name!) ?? "",
@@ -494,13 +495,17 @@ export class ClientscriptObfuscation {
copyOpcodesFrom(this, refscript);
findOpcodeImmidiates(this);
this.parseCandidateContents();
callibrateOperants(this);
callibrateOperants(this, this.candidates);
try {
callibrateSubtypes(this);
callibrateSubtypes(this, this.candidates);
} catch (e) {
console.log("subtype callibration failed, types info might not be accurate");
}
}
// don't want them to be methods, use this to expose them to console
findOpcodeImmidiates = findOpcodeImmidiates;
callibrateOperants = callibrateOperants;
callibrateSubtypes = callibrateSubtypes;
setNonObbedMappings() {
this.foundEncodings = true;
this.isNonObbedCache = true;
@@ -884,10 +889,10 @@ function findOpcodeImmidiates(calli: ClientscriptObfuscation) {
}
}
function callibrateOperants(calli: ClientscriptObfuscation) {
function callibrateOperants(calli: ClientscriptObfuscation, candidates: Map<number, ScriptCandidate>) {
//TODO merge with previous loop?
let allsections: CodeBlockNode[] = [];
for (let cand of calli.candidates.values()) {
for (let cand of candidates.values()) {
if (!cand.scriptcontents) { continue }
let { sections } = generateAst(calli, cand.script, cand.scriptcontents.opcodedata, cand.id);
allsections.push(...sections);

6
src/clientscript/subtypedetector.ts
View File

@@ -1,5 +1,5 @@
import { ClientScriptFunction, CodeBlockNode, RawOpcodeNode, SubcallNode, generateAst } from "./ast";
import { ClientscriptObfuscation } from "./callibrator";
import { ClientscriptObfuscation, ScriptCandidate } from "./callibrator";
import { ExactStack, PrimitiveType, StackConstants, StackDiff, branchInstructionsInt, branchInstructionsLong, debugKey, decomposeKey, dependencyGroup, dependencyIndex, dynamicOps, knownDependency, namedClientScriptOps, subtypes } from "./definitions";
//to test
@@ -238,9 +238,9 @@ class CombinedExactStack {
}
}
export function detectSubtypes(calli: ClientscriptObfuscation) {
export function detectSubtypes(calli: ClientscriptObfuscation, candidates: Map<number, ScriptCandidate>) {
let ctx = new ClientScriptSubtypeSolver();
for (let cand of calli.candidates.values()) {
for (let cand of candidates.values()) {
if (!cand.scriptcontents) { continue; }
let { sections } = generateAst(calli, cand.script, cand.scriptcontents.opcodedata, cand.id);
ctx.parseSections(sections);