Update detector for allatori

Fixes #648, but may increase potential for false positives
java-deobfuscator · Dec 12, 2020 · f3ee4b9 · f3ee4b9
1 parent 028b4e4
commit f3ee4b9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/src/main/java/com/javadeobfuscator/deobfuscator/rules/allatori/RuleStringDecryptor.java b/src/main/java/com/javadeobfuscator/deobfuscator/rules/allatori/RuleStringDecryptor.java
@@ -68,7 +68,6 @@ public String test(Deobfuscator deobfuscator) {
 
                             isAllatori = isAllatori && TransformerHelper.containsInvokeVirtual(decrypterNode, "java/lang/String", "charAt", "(I)C");
                             isAllatori = isAllatori && TransformerHelper.containsInvokeVirtual(decrypterNode, "java/lang/String", "length", "()I");
-                            isAllatori = isAllatori && TransformerHelper.countOccurencesOf(decrypterNode, ISHL) > 0;
                             isAllatori = isAllatori && TransformerHelper.countOccurencesOf(decrypterNode, IXOR) > 2;
                             isAllatori = isAllatori && TransformerHelper.countOccurencesOf(decrypterNode, NEWARRAY) > 0;
 

diff --git a/.../com/javadeobfuscator/deobfuscator/transformers/allatori/StringEncryptionTransformer.java b/.../com/javadeobfuscator/deobfuscator/transformers/allatori/StringEncryptionTransformer.java
@@ -167,12 +167,10 @@ public boolean canCheckEquality(JavaValue first, JavaValue second, Context conte
     private boolean isAllatoriMethod(Map<Integer, AtomicInteger> insnCount, Map<String, AtomicInteger> invokeCount) {
         //XXX: Better detector
     	if(insnCount.get(Opcodes.IXOR) == null ||
-    		insnCount.get(Opcodes.ISHL) == null ||
     		insnCount.get(Opcodes.NEWARRAY) == null ||
     		invokeCount.get("charAt") == null || invokeCount.get("length") == null)
     			return false;
         return insnCount.get(Opcodes.IXOR).get() >= 3 &&
-               insnCount.get(Opcodes.ISHL).get() >= 1 &&
                insnCount.get(Opcodes.NEWARRAY).get() >= 1 &&
                invokeCount.get("charAt").get() >= 2 &&
                invokeCount.get("length").get() >= 1;