2.2.0 Enhanced Controlflow

SpartanB312 · SpartanB312 · commit 6e5df4606666 · 2024-09-16T07:11:53.000+08:00
diff --git a/grunt-main/src/main/kotlin/net/spartanb312/grunt/Grunt.kt b/grunt-main/src/main/kotlin/net/spartanb312/grunt/Grunt.kt
@@ -14,8 +14,8 @@ import kotlin.system.measureTimeMillis
  * Gruntpocalypse
  * A java bytecode obfuscator
  */
-const val VERSION = "2.1.1"
-const val SUBTITLE = "build 240913"
+const val VERSION = "2.2.0"
+const val SUBTITLE = "build 240916"
 const val GITHUB = "https://github.com/SpartanB312/Grunt"
 
 fun main(args: Array<String>) {
diff --git a/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/Transformers.kt b/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/Transformers.kt
@@ -14,14 +14,14 @@ import net.spartanb312.grunt.process.transformers.rename.*
  * 000 Optimization
  * 010 Trash classes
  * 020 Controlflow 1
- * 030 Encryption
+ * 030 Encryption 1
  * 040 Controlflow 2
- * 050 Redirect
- * 060 Miscellaneous 1
- * 070 Renaming
- * 080 Minecraft
- * 090 InvokeDynamic
- * 100 Miscellaneous 2
+ * 050 Encryption 2
+ * 060 Redirect
+ * 070 Miscellaneous 1
+ * 080 Renaming
+ * 090 Minecraft
+ * 100 InvokeDynamic & Miscellaneous 2
  * MAX PostProcess
  */
 object Transformers : Collection<Transformer> by mutableListOf(
@@ -32,27 +32,27 @@ object Transformers : Collection<Transformer> by mutableListOf(
     DeadCodeRemoveTransformer order 4,
     ClonedClassTransformer order 10,
     TrashClassTransformer order 11,
-    ControlflowTransformer order 20,
+    //ControlflowTransformer order 20,
     StringEncryptTransformer order 30,
     NumberEncryptTransformer order 31,
     FloatingPointEncryptTransformer order 32,
     ArithmeticEncryptTransformer order 33,
-    ConstPoolEncryptTransformer order 34,
-    //ImplicitJumpTransformer order 40,
-    StringEqualsRedirectTransformer order 50,
-    FieldScrambleTransformer order 51,
-    MethodScrambleTransformer order 52,
-    NativeCandidateTransformer order 60,
-    SyntheticBridgeTransformer order 61,
-    LocalVariableRenameTransformer order 70,
-    MethodRenameTransformer order 71,
-    FieldRenameTransformer order 72,
-    ClassRenameTransformer order 73,
-    MixinFieldRenameTransformer order 80,
-    MixinClassRenameTransformer order 81,
-    InvokeDynamicTransformer order 90,
-    ShuffleMembersTransformer order 100,
-    CrasherTransformer order 101,
-    WatermarkTransformer order 102,
+    ControlflowTransformer order 40,
+    ConstPoolEncryptTransformer order 50,
+    StringEqualsRedirectTransformer order 60,
+    FieldScrambleTransformer order 61,
+    MethodScrambleTransformer order 62,
+    NativeCandidateTransformer order 70,
+    SyntheticBridgeTransformer order 71,
+    LocalVariableRenameTransformer order 80,
+    MethodRenameTransformer order 81,
+    FieldRenameTransformer order 82,
+    ClassRenameTransformer order 83,
+    MixinFieldRenameTransformer order 90,
+    MixinClassRenameTransformer order 91,
+    InvokeDynamicTransformer order 100,
+    ShuffleMembersTransformer order 101,
+    CrasherTransformer order 102,
+    WatermarkTransformer order 103,
     PostProcessTransformer order Int.MAX_VALUE
 )
diff --git a/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/transformers/flow/ControlflowTransformer.kt b/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/transformers/flow/ControlflowTransformer.kt
@@ -18,17 +18,19 @@ import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.MethodNode
+import kotlin.random.Random
 
 /**
- * Replace direct jump to implicit jump
- * Last update on 24/09/13
+ * Obfuscating the controlflow
+ * Last update on 24/09/16
  */
 object ControlflowTransformer : Transformer("Controlflow", Category.Controlflow), MethodProcessor {
 
     private var beforeEncrypt by setting("ExecuteBeforeEncrypt", false)
     private val replaceGoto by setting("ReplaceGoto", true)
     private val replaceIf by setting("ReplaceIf", true)
     private val intensity by setting("Intensity", 1)
+    private val reverse by setting("RandomReversedCondition", true)
     val useLocalVar by setting("UseLocalVar", true)
     val junkCode by setting("JunkCode", true)
     val expandedJunkCode by setting("ExpandedJunkCode", true)
@@ -69,7 +71,12 @@ object ControlflowTransformer : Transformer("Controlflow", Category.Controlflow)
                     val returnType = Type.getReturnType(methodNode.desc)
                     methodNode.instructions.forEach { insnNode ->
                         if (insnNode is JumpInsnNode && insnNode.opcode == Opcodes.GOTO) {
-                            +ReplaceGoto.generate(insnNode.label, methodNode, returnType)
+                            +ReplaceGoto.generate(
+                                insnNode.label,
+                                methodNode,
+                                returnType,
+                                reverse && Random.nextBoolean()
+                            )
                             count++
                         } else +insnNode
                     }
@@ -87,7 +94,13 @@ object ControlflowTransformer : Transformer("Controlflow", Category.Controlflow)
                                     || insnNode.opcode == Opcodes.IF_ICMPLE
                                     || insnNode.opcode == Opcodes.IF_ICMPNE)
                         ) {
-                            +ReplaceIf.generate(insnNode, insnNode.label, methodNode, returnType)
+                            +ReplaceIf.generate(
+                                insnNode,
+                                insnNode.label,
+                                methodNode,
+                                returnType,
+                                reverse && Random.nextBoolean()
+                            )
                             count++
                         } else +insnNode
                     }
diff --git a/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/transformers/flow/process/ReplaceGoto.kt b/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/transformers/flow/process/ReplaceGoto.kt
@@ -2,6 +2,7 @@ package net.spartanb312.grunt.process.transformers.flow.process
 
 import net.spartanb312.grunt.process.transformers.flow.ControlflowTransformer
 import net.spartanb312.grunt.utils.builder.*
+import org.objectweb.asm.Label
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.InsnList
 import org.objectweb.asm.tree.LabelNode
@@ -13,7 +14,8 @@ object ReplaceGoto {
     fun generate(
         targetLabel: LabelNode,
         methodNode: MethodNode,
-        returnType: Type
+        returnType: Type,
+        reverse: Boolean
     ): InsnList {
         return when (Random.nextInt(6)) {
             0 -> insnList {
@@ -25,8 +27,16 @@ object ReplaceGoto {
                     if (ControlflowTransformer.useLocalVar) LocalVarUsages.entries.random()
                     else LocalVarUsages.Default
                 +usage.localVarUsage(val1, val2, val3, methodNode.maxLocals, action.insnList)
-                IF_ICMPEQ(targetLabel)
-                +JunkCode.generate(methodNode, returnType)
+                if (reverse) {
+                    val junkLabel = Label()
+                    IF_ICMPNE(junkLabel)
+                    GOTO(targetLabel)
+                    LABEL(junkLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                } else {
+                    IF_ICMPEQ(targetLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                }
             }
 
             1 -> insnList {
@@ -43,8 +53,16 @@ object ReplaceGoto {
                     if (ControlflowTransformer.useLocalVar) LocalVarUsages.entries.random()
                     else LocalVarUsages.Default
                 +usage.localVarUsage(val1, val2, val3, methodNode.maxLocals, action.insnList)
-                IF_ICMPLT(targetLabel)
-                +JunkCode.generate(methodNode, returnType)
+                if (reverse) {
+                    val junkLabel = Label()
+                    IF_ICMPGE(junkLabel)
+                    GOTO(targetLabel)
+                    LABEL(junkLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                } else {
+                    IF_ICMPLT(targetLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                }
             }
 
             2 -> insnList {
@@ -61,8 +79,16 @@ object ReplaceGoto {
                     if (ControlflowTransformer.useLocalVar) LocalVarUsages.entries.random()
                     else LocalVarUsages.Default
                 +usage.localVarUsage(val1, val2, val3, methodNode.maxLocals, action.insnList)
-                IF_ICMPGE(targetLabel)
-                +JunkCode.generate(methodNode, returnType)
+                if (reverse) {
+                    val junkLabel = Label()
+                    IF_ICMPLT(junkLabel)
+                    GOTO(targetLabel)
+                    LABEL(junkLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                } else {
+                    IF_ICMPGE(targetLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                }
             }
 
             3 -> insnList {
@@ -79,8 +105,16 @@ object ReplaceGoto {
                     if (ControlflowTransformer.useLocalVar) LocalVarUsages.entries.random()
                     else LocalVarUsages.Default
                 +usage.localVarUsage(val1, val2, val3, methodNode.maxLocals, action.insnList)
-                IF_ICMPGT(targetLabel)
-                +JunkCode.generate(methodNode, returnType)
+                if (reverse) {
+                    val junkLabel = Label()
+                    IF_ICMPLE(junkLabel)
+                    GOTO(targetLabel)
+                    LABEL(junkLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                } else {
+                    IF_ICMPGT(targetLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                }
             }
 
             4 -> insnList {
@@ -97,8 +131,16 @@ object ReplaceGoto {
                     if (ControlflowTransformer.useLocalVar) LocalVarUsages.entries.random()
                     else LocalVarUsages.Default
                 +usage.localVarUsage(val1, val2, val3, methodNode.maxLocals, action.insnList)
-                IF_ICMPLE(targetLabel)
-                +JunkCode.generate(methodNode, returnType)
+                if (reverse) {
+                    val junkLabel = Label()
+                    IF_ICMPGT(junkLabel)
+                    GOTO(targetLabel)
+                    LABEL(junkLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                } else {
+                    IF_ICMPLE(targetLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                }
             }
 
             else -> insnList {
@@ -114,8 +156,16 @@ object ReplaceGoto {
                 val usage = if (ControlflowTransformer.useLocalVar) LocalVarUsages.entries.random()
                 else LocalVarUsages.Default
                 +usage.localVarUsage(val1, val2, val3, methodNode.maxLocals, action.insnList)
-                IF_ICMPNE(targetLabel)
-                +JunkCode.generate(methodNode, returnType)
+                if (reverse) {
+                    val junkLabel = Label()
+                    IF_ICMPEQ(junkLabel)
+                    GOTO(targetLabel)
+                    LABEL(junkLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                } else {
+                    IF_ICMPNE(targetLabel)
+                    +JunkCode.generate(methodNode, returnType)
+                }
             }
         }
     }
diff --git a/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/transformers/flow/process/ReplaceIf.kt b/grunt-main/src/main/kotlin/net/spartanb312/grunt/process/transformers/flow/process/ReplaceIf.kt
@@ -17,15 +17,16 @@ object ReplaceIf {
         insnNode: JumpInsnNode,
         targetLabel: LabelNode,
         methodNode: MethodNode,
-        returnType: Type
+        returnType: Type,
+        reverse: Boolean
     ): InsnList {
         return insnList {
             val delegateLabel = Label()
             val elseLabel = Label()
             +JumpInsnNode(insnNode.opcode, getLabelNode(delegateLabel))
             GOTO(elseLabel)
             LABEL(delegateLabel)
-            +ReplaceGoto.generate(targetLabel, methodNode, returnType)
+            +ReplaceGoto.generate(targetLabel, methodNode, returnType, reverse)
             LABEL(elseLabel)
         }
     }
