fixed packaging bug and finished jshrink deobfuscator

yocontra · Apr 13, 2011 · 887e0e2 · 887e0e2
1 parent a0c6e8a
commit 887e0e2
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 33 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/artifacts/JMOT_jar/JMOT.jar b/out/artifacts/JMOT_jar/JMOT.jar
diff --git a/out/production/JMOT/net/contra/obfuscator/Application$1.class b/out/production/JMOT/net/contra/obfuscator/Application$1.class
diff --git a/out/production/JMOT/net/contra/obfuscator/Application.class b/out/production/JMOT/net/contra/obfuscator/Application.class
diff --git a/out/production/JMOT/net/contra/obfuscator/trans/deob/AllatoriDeobfuscator.class b/out/production/JMOT/net/contra/obfuscator/trans/deob/AllatoriDeobfuscator.class
diff --git a/out/production/JMOT/net/contra/obfuscator/trans/deob/JShrinkDeobfuscator.class b/out/production/JMOT/net/contra/obfuscator/trans/deob/JShrinkDeobfuscator.class
diff --git a/out/production/JMOT/net/contra/obfuscator/trans/deob/StoreHandler.class b/out/production/JMOT/net/contra/obfuscator/trans/deob/StoreHandler.class
diff --git a/out/production/JMOT/net/contra/obfuscator/util/bcel/JarLoader.class b/out/production/JMOT/net/contra/obfuscator/util/bcel/JarLoader.class
diff --git a/src/net/contra/obfuscator/trans/deob/AllatoriDeobfuscator.java b/src/net/contra/obfuscator/trans/deob/AllatoriDeobfuscator.java
@@ -137,6 +137,5 @@ public void transform() {
     public void save() {
         String loc = Location.replace(".jar", Settings.FILE_TAG + ".jar");
         LoadedJar.saveJar(loc);
-
     }
 }
diff --git a/src/net/contra/obfuscator/trans/deob/JShrinkDeobfuscator.java b/src/net/contra/obfuscator/trans/deob/JShrinkDeobfuscator.java
@@ -4,6 +4,7 @@
 import com.sun.org.apache.bcel.internal.generic.*;
 import net.contra.obfuscator.Application;
 import net.contra.obfuscator.ITransformer;
+import net.contra.obfuscator.Settings;
 import net.contra.obfuscator.util.bcel.BCELMethods;
 import net.contra.obfuscator.util.bcel.JarLoader;
 import net.contra.obfuscator.util.misc.LogHandler;
@@ -58,7 +59,8 @@ public void transform() {
                     if (BCELMethods.isInteger(handle.getInstruction())
                             && handle.getNext().getInstruction() instanceof INVOKESTATIC) {
                         assert shrinkClass != null;
-                        if(!BCELMethods.getInvokeClassName(handle.getNext().getInstruction(), cg.getConstantPool()).equals(shrinkClass.getClassName())) continue;
+                        if (!BCELMethods.getInvokeClassName(handle.getNext().getInstruction(), cg.getConstantPool()).equals(shrinkClass.getClassName()))
+                            continue;
                         int storeidx = BCELMethods.getIntegerValue(handle.getInstruction());
                         StoreHandler store = new StoreHandler(LoadedJar);
                         String orig = store.getString(storeidx);
@@ -78,6 +80,8 @@ public void transform() {
     }
 
     public void save() {
+        String loc = Location.replace(".jar", Settings.FILE_TAG + ".jar");
+        LoadedJar.saveJar(loc);
     }
 }
 

diff --git a/src/net/contra/obfuscator/util/bcel/JarLoader.java b/src/net/contra/obfuscator/util/bcel/JarLoader.java
@@ -25,7 +25,7 @@ public JarLoader(String fileLocation) {
             File file = new File(fileLocation);
             JarFile jarFile = new JarFile(file);
             Enumeration<JarEntry> entries = jarFile.entries();
-            if(jarFile.getManifest() != null){
+            if (jarFile.getManifest() != null) {
                 wipeManifest(jarFile.getManifest().getMainAttributes().getValue("Main-Class"));
             }
             while (entries.hasMoreElements()) {
@@ -63,7 +63,7 @@ public void saveJar(String fileName) {
             FileOutputStream os = new FileOutputStream(fileName);
             JarOutputStream jos = new JarOutputStream(os);
             for (ClassGen classIt : ClassEntries.values()) {
-                jos.putNextEntry(new JarEntry(classIt.getClassName().replace('.', File.separatorChar) + ".class"));
+                jos.putNextEntry(new JarEntry(classIt.getClassName().replace('.', '/') + ".class"));
                 jos.write(classIt.getJavaClass().getBytes());
                 jos.closeEntry();
                 jos.flush();