LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 20:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issues #266: Unsuccessfull try to improve deobfuscation

Browse Source
This commit is contained in:
Jindra Pet��k
2013-08-11 22:41:48 +02:00
parent 35e956b87f
commit 7eca256e3c
10 changed files with 121 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.abc.CopyOutputStream;
import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph;
import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2GraphSource;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.DeobfuscatePopIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition;
import com.jpexs.decompiler.flash.abc.avm2.instructions.alchemy.Lf32Ins;
@@ -796,7 +797,7 @@ public class AVM2Code implements Serializable {
if (ins.definition instanceof IfTypeIns) {
t = "";
for (int i = 0; i < -ins.definition.getStackDelta(ins, null/*IfTypeIns do not require ABCs*/); i++) {
t += new PopIns().instructionName + "\n";
t += new DeobfuscatePopIns().instructionName + "\n";
}
if (fixBranch == 0) { //jump
t += new JumpIns().instructionName + " ofs" + Helper.formatAddress(ofs + ins.getBytes().length + ins.operands[0]);
trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
+5
View File
@@ -336,4 +336,9 @@ public class AVM2Instruction implements Serializable, GraphSourceItem {
public int getFixBranch() {
return fixedBranch;
}
@Override
public boolean isDeobfuscatePop() {
return definition instanceof DeobfuscatePopIns;
}
}
trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/DeobfuscatePopIns.java
+30
View File
@@ -0,0 +1,30 @@
/*
* Copyright (C) 2013 JPEXS
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.jpexs.decompiler.flash.abc.avm2.instructions;
import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PopIns;
/**
*
* @author JPEXS
*/
public class DeobfuscatePopIns extends PopIns {
public DeobfuscatePopIns() {
instructionName = "ffdec_deobfuscatepop";
}
}
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class AddAVM2Item extends BinaryOpItem {
@Override
public Object getResult() {
if (EcmaScript.type(leftSide.getResult()) == EcmaType.STRING || EcmaScript.type(rightSide.getResult()) == EcmaType.STRING) {
return leftSide.getResult().toString() + rightSide.getResult().toString();
return "" + leftSide.getResult() + rightSide.getResult();
}
return EcmaScript.toNumber(leftSide.getResult()) + EcmaScript.toNumber(rightSide.getResult());
}
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ASM3Parser.java
+7
View File
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.abc.avm2.parser;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
import com.jpexs.decompiler.flash.abc.avm2.ConstantPool;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.DeobfuscatePopIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition;
import com.jpexs.decompiler.flash.abc.types.ABCException;
import com.jpexs.decompiler.flash.abc.types.MethodBody;
@@ -287,6 +288,12 @@ public class ASM3Parser {
break;
}
}
if (symb.value.toString().toLowerCase().equals("ffdec_deobfuscatepop")) {
lastIns = new AVM2Instruction(offset, new DeobfuscatePopIns(), new int[0], new byte[0]);
code.code.add(lastIns);
offset += lastIns.getBytes().length;
insFound = true;
}
if (!insFound) {
throw new ParseException("Invalid instruction name:" + (String) symb.value, lexer.yyline());
}
trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
+1 -1
View File
@@ -36,7 +36,7 @@ import java.util.logging.Logger;
public class MethodBody implements Cloneable, Serializable {
boolean debugMode = false;
boolean debugMode = true;
public int method_info;
public int max_stack;
public int max_regs;
trunk/src/com/jpexs/decompiler/flash/action/Action.java
+5
View File
@@ -1261,4 +1261,9 @@ public class Action implements GraphSourceItem {
}
return ret;
}
@Override
public boolean isDeobfuscatePop() {
return false;
}
}
trunk/src/com/jpexs/decompiler/flash/action/special/ActionDeobfuscatePop.java
+5
View File
@@ -42,4 +42,9 @@ public class ActionDeobfuscatePop extends ActionPop {
}
GraphTargetItem val = stack.pop();
}
@Override
public boolean isDeobfuscatePop() {
return true;
}
}
trunk/src/com/jpexs/decompiler/graph/Graph.java
+63 -21
View File
@@ -16,6 +16,7 @@
*/
package com.jpexs.decompiler.graph;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.helpers.Highlighting;
@@ -546,10 +547,33 @@ public class Graph {
return null;
}
public GraphPart getNextNoJump(GraphPart part) {
public GraphPart getNextNoJump(GraphPart part, List<Object> localData) {
while (code.get(part.start).isJump()) {
part = part.getSubParts().get(0).nextParts.get(0);
}
/*localData = prepareBranchLocalData(localData);
Stack<GraphTargetItem> st = new Stack<>();
List<GraphTargetItem> output=new ArrayList<>();
GraphPart startPart = part;
for (int i = part.start; i <= part.end; i++) {
GraphSourceItem src = code.get(i);
if (src.isJump()) {
part = part.nextParts.get(0);
if(st.isEmpty()){
startPart = part;
}
i = part.start - 1;
continue;
}
try{
src.translate(localData, st, output, SOP_USE_STATIC, "");
}catch(Exception ex){
return startPart;
}
if(!output.isEmpty()){
return startPart;
}
}*/
return part;
}
@@ -573,11 +597,11 @@ public class Graph {
}
System.out.println("</loops>");*/
getPrecontinues(localData, null, heads.get(0), loops, null);
/*System.err.println("<loopspre>");
for (Loop el : loops) {
System.err.println(el);
}
System.err.println("</loopspre>");//*/
System.err.println("<loopspre>");
for (Loop el : loops) {
System.err.println(el);
}
System.err.println("</loopspre>");//*/
List<GraphTargetItem> ret = printGraph(new ArrayList<GraphPart>(), localData, stack, allParts, null, heads.get(0), null, loops, staticOperation, path);
processIfs(ret);
@@ -1124,16 +1148,25 @@ public class Graph {
}
if (part.nextParts.size() == 2) {
GraphPart next = getNextCommonPart(localData, part, loops);//part.getNextPartPath(loopContinues);
List<GraphPart> nps = new ArrayList<>(part.nextParts);
/*for(int i=0;i<nps.size();i++){
nps.set(i,getNextNoJump(nps.get(i),localData));
}
if(nps.get(0) == nps.get(1)){
nps = part.nextParts;
}*/
nps = part.nextParts;
GraphPart next = getCommonPart(localData, nps, loops);//part.getNextPartPath(loopContinues);
List<GraphPart> stopPart2 = new ArrayList<>(stopPart);
if (next != null) {
stopPart2.add(next);
}
if (next != part.nextParts.get(0)) {
getLoops(localData, part.nextParts.get(0), loops, stopPart2, false, level + 1, visited);
if (next != nps.get(0)) {
getLoops(localData, nps.get(0), loops, stopPart2, false, level + 1, visited);
}
if (next != part.nextParts.get(1)) {
getLoops(localData, part.nextParts.get(1), loops, stopPart2, false, level + 1, visited);
if (next != nps.get(1)) {
getLoops(localData, nps.get(1), loops, stopPart2, false, level + 1, visited);
}
if (next != null) {
getLoops(localData, next, loops, stopPart, false, level, visited);
@@ -1508,8 +1541,8 @@ public class Graph {
*/
if (part.nextParts.size() == 2) {
if ((stack.size() >= 2) && (stack.get(stack.size() - 1) instanceof NotItem) && (((NotItem) (stack.get(stack.size() - 1))).getOriginal().getNotCoerced() == stack.get(stack.size() - 2).getNotCoerced())) {
GraphPart sp0 = getNextNoJump(part.nextParts.get(0));
GraphPart sp1 = getNextNoJump(part.nextParts.get(1));
GraphPart sp0 = getNextNoJump(part.nextParts.get(0), localData);
GraphPart sp1 = getNextNoJump(part.nextParts.get(1), localData);
boolean reversed = false;
loopContinues = getLoopsContinues(loops);
loopContinues.add(part);//???
@@ -1559,8 +1592,8 @@ public class Graph {
parseNext = false;
//return ret;
} else if ((stack.size() >= 2) && (stack.get(stack.size() - 1).getNotCoerced() == stack.get(stack.size() - 2).getNotCoerced())) {
GraphPart sp0 = getNextNoJump(part.nextParts.get(0));
GraphPart sp1 = getNextNoJump(part.nextParts.get(1));
GraphPart sp0 = getNextNoJump(part.nextParts.get(0), localData);
GraphPart sp1 = getNextNoJump(part.nextParts.get(1), localData);
boolean reversed = false;
loopContinues = getLoopsContinues(loops);
loopContinues.add(part);//???
@@ -1618,7 +1651,7 @@ public class Graph {
if (parseNext) {
if (part.nextParts.size() > 2) {//alchemy direct switch
if (false && part.nextParts.size() > 2) {//alchemy direct switch
GraphPart next = getMostCommonPart(localData, part.nextParts, loops);
List<GraphPart> vis = new ArrayList<>();
GraphTargetItem switchedItem = stack.pop();
@@ -1695,7 +1728,16 @@ public class Graph {
}
}
if (nextOnePart == null) {
GraphPart next = getNextCommonPart(localData, part, loops);
List<GraphPart> nps = new ArrayList<>(part.nextParts);
/*for(int i=0;i<nps.size();i++){
nps.set(i,getNextNoJump(nps.get(i),localData));
}
if(nps.get(0) == nps.get(1)){
nps = part.nextParts;
}*/
nps = part.nextParts;
GraphPart next = getCommonPart(localData, nps, loops);
@SuppressWarnings("unchecked")
Stack<GraphTargetItem> trueStack = (Stack<GraphTargetItem>) stack.clone();
@@ -1704,10 +1746,10 @@ public class Graph {
int trueStackSizeBefore = trueStack.size();
int falseStackSizeBefore = falseStack.size();
List<GraphTargetItem> onTrue = new ArrayList<>();
boolean isEmpty = part.nextParts.get(0) == part.nextParts.get(1);
boolean isEmpty = nps.get(0) == nps.get(1);
if (isEmpty) {
next = part.nextParts.get(0);
next = nps.get(0);
}
List<GraphPart> stopPart2 = new ArrayList<>(stopPart);
@@ -1715,12 +1757,12 @@ public class Graph {
stopPart2.add(next);
}
if (!isEmpty) {
onTrue = printGraph(visited, prepareBranchLocalData(localData), trueStack, allParts, part, part.nextParts.get(1), stopPart2, loops, staticOperation, path);
onTrue = printGraph(visited, prepareBranchLocalData(localData), trueStack, allParts, part, nps.get(1), stopPart2, loops, staticOperation, path);
}
List<GraphTargetItem> onFalse = new ArrayList<>();
if (!isEmpty) {
onFalse = printGraph(visited, prepareBranchLocalData(localData), falseStack, allParts, part, part.nextParts.get(0), stopPart2, loops, staticOperation, path);
onFalse = printGraph(visited, prepareBranchLocalData(localData), falseStack, allParts, part, nps.get(0), stopPart2, loops, staticOperation, path);
}
if (isEmpty(onTrue) && isEmpty(onFalse) && (trueStack.size() > trueStackSizeBefore) && (falseStack.size() > falseStackSizeBefore)) {
stack.push(new TernarOpItem(null, expr, trueStack.pop(), falseStack.pop()));
trunk/src/com/jpexs/decompiler/graph/GraphSourceItem.java
+2
View File
@@ -47,4 +47,6 @@ public interface GraphSourceItem extends Serializable {
public void setFixBranch(int pos);
public int getFixBranch();
public boolean isDeobfuscatePop();
}