chore(obfuscator): converted string encryption to instance methodology

Author: terminalsin

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/string/StringTransformer.java

@@ -9,6 +9,7 @@
 import dev.skidfuscator.obfuscator.skidasm.expr.SkidConstantExpr;
 import dev.skidfuscator.obfuscator.transform.AbstractTransformer;
 import dev.skidfuscator.obfuscator.transform.Transformer;
+import dev.skidfuscator.obfuscator.transform.impl.string.generator.BasicEncryptionGenerator;
 import dev.skidfuscator.obfuscator.util.RandomUtil;
 import org.mapleir.asm.ClassNode;
 import org.mapleir.ir.cfg.ControlFlowGraph;
@@ -21,7 +22,7 @@
 import java.util.stream.Collectors;
 
 public class StringTransformer extends AbstractTransformer {
-    private final Map<ClassNode, Integer[]> keyMap = new HashMap<>();
+    private final Map<ClassNode, BasicEncryptionGenerator> keyMap = new HashMap<>();
     private final Set<String> INJECTED = new HashSet<>();
 
     public StringTransformer(Skidfuscator skidfuscator) {
@@ -49,25 +50,25 @@ void handle(final RunMethodTransformEvent event) {
 
         final ClassNode parentNode = methodNode.getParent();
 
-        Integer[] keysT = keyMap.get(parentNode);
+        BasicEncryptionGenerator generator = keyMap.get(parentNode);
 
-        if (keysT == null) {
+        if (generator == null) {
             final int size = RandomUtil.nextInt(127) + 1;
-            keysT = new Integer[size];
+            final Integer[] keys = new Integer[size];
+
             for (int i = 0; i < size; i++) {
-                keysT[i] = RandomUtil.nextInt(127) + 1;
+                keys[i] = RandomUtil.nextInt(127) + 1;
             }
 
-            keyMap.put(parentNode, keysT);
+            keyMap.put(parentNode, (generator = new BasicEncryptionGenerator(keys)));
         }
 
-        final Integer[] keys = keysT;
-
         if (!INJECTED.contains(parentNode.getName())) {
-            BasicEncryptionGenerator.visit((SkidClassNode) methodNode.owner, BasicEncryptionGenerator.METHOD_NAME, keys);
+            generator.visit((SkidClassNode) methodNode.owner, BasicEncryptionGenerator.METHOD_NAME);
             INJECTED.add(parentNode.getName());
         }
 
+        BasicEncryptionGenerator finalGenerator = generator;
         cfg.allExprStream()
                 /*
                  *
@@ -87,7 +88,7 @@ void handle(final RunMethodTransformEvent event) {
 
                     final String constant = (String) unit.getConstant();
                     final int value = methodNode.getBlockPredicate((SkidBlock) unit.getBlock());
-                    final String encrypted = BasicEncryptionGenerator.encrypt(constant, value, keys);
+                    final String encrypted = finalGenerator.encrypt(constant, value);
 
                     final ConstantExpr encryptedExpr = new ConstantExpr(encrypted);
                     final Expr loadExpr = methodNode.getFlowPredicate().getGetter().get(unit.getBlock());

…mpl/string/BasicEncryptionGenerator.java …/generator/BasicEncryptionGenerator.javadev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/string/BasicEncryptionGenerator.java renamed to dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/string/generator/BasicEncryptionGenerator.java dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/string/BasicEncryptionGenerator.java renamed to dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/string/generator/BasicEncryptionGenerator.java

@@ -1,4 +1,4 @@
-package dev.skidfuscator.obfuscator.transform.impl.string;
+package dev.skidfuscator.obfuscator.transform.impl.string.generator;
 
 import dev.skidfuscator.obfuscator.event.EventBus;
 import dev.skidfuscator.obfuscator.event.impl.transform.method.InitMethodTransformEvent;
@@ -12,10 +12,16 @@
 
 import static org.objectweb.asm.Opcodes.*;
 
-public class BasicEncryptionGenerator {
+public class BasicEncryptionGenerator implements EncryptionGenerator {
     public static final String METHOD_NAME = "thisIsAInsaneEncryptionMethod";
+    private final Integer[] keys;
 
-    public static String encrypt(String input, int key, Integer[] keys) {
+    public BasicEncryptionGenerator(Integer[] keys) {
+        this.keys = keys;
+    }
+
+    @Override
+    public String encrypt(String input, int key) {
         final byte[] encrypted = input.getBytes();
 
         // Super simple converting our integer to string, and getting bytes.
@@ -31,7 +37,8 @@ public static String encrypt(String input, int key, Integer[] keys) {
         return Base64.getEncoder().encodeToString(encrypted);
     }
 
-    public static String decrypt(String input, int key, Integer[] keys) {
+    @Override
+    public String decrypt(String input, int key) {
         final byte[] decrypted = Base64.getDecoder().decode(input.getBytes());
 
         // Super simple converting our integer to string, and getting bytes.
@@ -47,7 +54,8 @@ public static String decrypt(String input, int key, Integer[] keys) {
         return new String(decrypted);
     }
 
-    public static void visit(final SkidClassNode node, String name, Integer[] integerKeys) {
+    @Override
+    public void visit(final SkidClassNode node, String name) {
         // TODO: Fix the retardness and make it so that all
         //       generated methods can be properly genned
         final SkidMethodNode skidMethodNode = node.createMethod()
@@ -77,13 +85,13 @@ public static void visit(final SkidClassNode node, String name, Integer[] intege
         Label label2 = new Label();
         methodVisitor.visitLabel(label2);
         methodVisitor.visitLineNumber(37, label2);
-        methodVisitor.visitIntInsn(BIPUSH, integerKeys.length);
+        methodVisitor.visitIntInsn(BIPUSH, keys.length);
         methodVisitor.visitIntInsn(NEWARRAY, T_BYTE);
 
-        for (int i = 0; i < integerKeys.length; i++) {
+        for (int i = 0; i < keys.length; i++) {
             methodVisitor.visitInsn(DUP);
             methodVisitor.visitIntInsn(BIPUSH, i);
-            methodVisitor.visitIntInsn(BIPUSH, integerKeys[i]);
+            methodVisitor.visitIntInsn(BIPUSH, keys[i]);
             methodVisitor.visitInsn(BASTORE);
         }
 

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/string/generator/EncryptionGenerator.java

@@ -0,0 +1,11 @@
+package dev.skidfuscator.obfuscator.transform.impl.string.generator;
+
+import dev.skidfuscator.obfuscator.skidasm.SkidClassNode;
+
+public interface EncryptionGenerator {
+    String encrypt(String input, int key);
+
+    String decrypt(String input, int key);
+
+    void visit(final SkidClassNode node, String name);
+}

dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/EncryptionTest.java

@@ -1,9 +1,8 @@
 package dev.skidfuscator.test;
 
-import dev.skidfuscator.obfuscator.transform.impl.string.BasicEncryptionGenerator;
+import dev.skidfuscator.obfuscator.transform.impl.string.generator.BasicEncryptionGenerator;
 import dev.skidfuscator.obfuscator.util.RandomUtil;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 public class EncryptionTest {