Skip to content

Commit acbce8f

Browse files
committed
feat(obf): mom new encryption system dropped
1 parent f81321a commit acbce8f

16 files changed

Lines changed: 12535 additions & 8 deletions

dev.skidfuscator.obfuscator/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ dependencies {
3333

3434
test {
3535
useJUnitPlatform()
36-
}
36+
}
37+
sourceCompatibility = JavaVersion.VERSION_1_9
38+
targetCompatibility = JavaVersion.VERSION_1_9

dev.skidfuscator.obfuscator/skidfuscator-error-ezc.txt

Lines changed: 430 additions & 0 deletions
Large diffs are not rendered by default.

dev.skidfuscator.obfuscator/skidfuscator-error-oku.txt

Lines changed: 664 additions & 0 deletions
Large diffs are not rendered by default.

dev.skidfuscator.obfuscator/skidfuscator.log.1

Lines changed: 10567 additions & 0 deletions
Large diffs are not rendered by default.

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import dev.skidfuscator.obfuscator.transform.impl.number.NumberTransformer;
4949
import dev.skidfuscator.obfuscator.transform.impl.string.StringEncryptionType;
5050
import dev.skidfuscator.obfuscator.transform.impl.string.StringTransformer;
51+
import dev.skidfuscator.obfuscator.transform.impl.string.StringTransformerV2;
5152
import dev.skidfuscator.obfuscator.util.MapleJarUtil;
5253
import dev.skidfuscator.obfuscator.util.MiscUtil;
5354
import dev.skidfuscator.obfuscator.util.ProgressUtil;
@@ -636,10 +637,10 @@ public List<Transformer> getTransformers() {
636637
if (true) {
637638
if (tsConfig.hasPath("stringEncryption.type")) {
638639
switch (tsConfig.getEnum(StringEncryptionType.class, "stringEncryption.type")) {
639-
case STANDARD: transformers.add(new StringTransformer(this)); break;
640+
case STANDARD: transformers.add(new StringTransformerV2(this)); break;
640641
}
641642
} else {
642-
transformers.add(new StringTransformer(this));
643+
transformers.add(new StringTransformerV2(this));
643644
}
644645

645646
transformers.addAll(Arrays.asList(

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/predicate/renderer/IntegerBlockPredicateRenderer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,10 @@ void handle(final PostMethodTransformEvent event) {
690690
final MethodOpaquePredicate predicate = methodNode.getPredicate();
691691
PredicateFlowGetter getter = predicate.getGetter();
692692

693-
assert getter != null : "Predicate flow getter is null! Has group not been initialized?";
693+
assert getter != null : String.format(
694+
"Getter for method %s is null!",
695+
methodNode.getName()
696+
);
694697

695698
PredicateFlowGetter localGetterT = methodNode.getFlowPredicate().getGetter();
696699
PredicateFlowSetter localSetterT = methodNode.getFlowPredicate().getSetter();

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/skidasm/SkidClassNode.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@
2121

2222
import java.util.ArrayList;
2323

24-
@Getter // TODO: Deprecate the getter and document the stuff
24+
// TODO: Deprecate the getter and document the stuff
2525
public class SkidClassNode extends ClassNode {
26+
@Getter
2627
private final Skidfuscator skidfuscator;
28+
@Getter
2729
private final ClassOpaquePredicate classPredicate;
30+
@Getter
2831
private final ClassOpaquePredicate staticPredicate;
2932
private transient SkidMethodNode clinitNode;
3033
private transient Boolean mixin;
34+
@Getter
3135
private final AttributeMap attributes;
3236

3337
private transient Integer randomInt;
@@ -120,7 +124,7 @@ public SkidMethodNode getClassInit() {
120124
.access(Opcodes.ACC_STATIC)
121125
.desc("()V")
122126
.name("<clinit>")
123-
.phantom(false)
127+
.phantom(true)
124128
.build();
125129

126130
clinit.getEntryBlock().add(new ReturnStmt());

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/skidasm/builder/SkidFieldNodeBuilder.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ public SkidFieldNodeBuilder desc(String desc) {
4040
return this;
4141
}
4242

43+
public SkidFieldNodeBuilder phantom(final boolean phantom) {
44+
this.phantom = phantom;
45+
return this;
46+
}
47+
4348
public SkidFieldNodeBuilder signature(String signature) {
4449
this.fieldNodeBuilder.signature(signature);
4550
return this;

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/misc/ObjectDefinalizer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ void handle(final RunMethodTransformEvent event) {
5555
if (cfg == null)
5656
return;
5757

58-
final MethodNode clinit = methodNode.getParent().getClinitNode();
5958

6059
final InsnList insnList = new InsnList();
6160
// TODO: Don't forget if you use ASM, compute the CFG again with

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ void handle(final RunMethodTransformEvent event) {
5151
if (cfg == null)
5252
return;
5353

54-
final MethodNode clinit = methodNode.getParent().getClinitNode();
5554

5655
final InsnList insnList = new InsnList();
5756
// TODO: Don't forget if you use ASM, compute the CFG again with

0 commit comments

Comments
 (0)