Merge pull request #105 from franceme/dev

Upped to V04.01.00
franceme · Apr 15, 2020 · cc3e5a4 · cc3e5a4
2 parents 86c88d5 + 05986f5
commit cc3e5a4
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 107 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,6 @@
 /rsc/
 
 Notebook/.ipynb_checkpoints/
+
+rsc/
+/rsc/
diff --git a/Notebook/GeneralTestingNotebook.ipynb b/Notebook/GeneralTestingNotebook.ipynb
diff --git a/README.rst b/README.rst
@@ -1,5 +1,5 @@
 #################################
-CryptoGuard V04.00.03
+CryptoGuard V04.01.00
 #################################
 
 .. image:: https://mybinder.org/badge_logo.svg

diff --git a/build.gradle b/build.gradle
@@ -157,7 +157,7 @@ task release {
         mkdir './release'
     }
     //Waiting until all tests are cleared
-    def tasks = [clean, test, build, jibBuildTar]
+    def tasks = [jibBuildTar]
     for (int itr = 0; itr < tasks.size() - 1; itr++) {
         tasks[itr + 1].mustRunAfter(tasks[itr])
     }
@@ -212,7 +212,8 @@ task release {
 dependencies {
     compile 'com.google.guava:guava:20.0'
     //compile name: 'soot_j9_20190409'
-    compile name: 'soot-V3.3.0-SNAPSHOT'
+    //compile name: 'soot-V3.3.0-SNAPSHOT'
+    compile name: 'soot-V4.1.0-SNAPSHOT'
     //compile name: 'soot_raw1'
     compile name: 'axml-2.0'
     compile name: 'AXMLPrinter2'

diff --git a/cryptosouple.py b/cryptosouple.py
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 projectName=cryptoguard
 groupName=vt.edu
-versionNumber=V04.00.03
+versionNumber=V04.01.00
 buildFrameWork=Java
 buildVersion=1.8.232
 org.gradle.daemon=false

diff --git a/libs/soot-V3.3.0-SNAPSHOT.jar b/libs/soot-V3.3.0-SNAPSHOT.jar
diff --git a/libs/soot_j9_20190409.jar → libs/soot-V4.1.0-SNAPSHOT.jar b/libs/soot_j9_20190409.jar → libs/soot-V4.1.0-SNAPSHOT.jar
diff --git a/libs/soot_raw1.jar b/libs/soot_raw1.jar
diff --git a/release/cryptoguard.jar b/release/cryptoguard.jar
diff --git a/release/cryptoguard.jar.sig b/release/cryptoguard.jar.sig
diff --git a/release/cryptoguard.tar b/release/cryptoguard.tar
diff --git a/release/cryptoguard.tar.sig b/release/cryptoguard.tar.sig
diff --git a/release/sha512.sums b/release/sha512.sums
@@ -1,2 +1,2 @@
-f182318eabf7d13f02511860872e57285f559de9f1359b30941840f9a92d52f849b1d3f7a731738d259887ec46e49c46cd8283c794d03f733c599c7246ffae11  cryptoguard.tar
-1ad76b6649b88e342518de680221484103deec1a7780cad706c7503845bc47bfd2efe13172982bc9c6c8a101a6586fc5bfad1175018bf2836d6d922f9b065857  cryptoguard.jar
+4566df52efd12f371fa47a7e8b01ada4ad34483b493414c2cc5dce5042d1719f3fdb1e7a9f072d8c0072408ba28dadcaa1564b58ff59f54992592f69c6d49722  cryptoguard.tar
+4fc5732dd3d3abfb47686138a9b9efb59487f7d6867c3a492f30a01c65e85cd9638c6c100ba55d908319bcf2841937233e50ac6b1ec11051f0bf1a8b037d8038  cryptoguard.jar
diff --git a/src/main/java/util/Utils.java b/src/main/java/util/Utils.java
@@ -12,7 +12,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jf.dexlib2.DexFileFactory;
 import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
 import org.jf.dexlib2.iface.ClassDef;
 import org.jf.dexlib2.iface.DexFile;
 import rule.engine.EngineType;
@@ -65,9 +64,9 @@ public class Utils {
      */
     public final static String lineSep = System.getProperty("line.separator");
     /**
-     * Constant <code>projectVersion="V04.00.03"</code>
+     * Constant <code>projectVersion="V04.01.00"</code>
      */
-    public final static String projectVersion = "V04.00.03";
+    public final static String projectVersion = "V04.01.00";
     /**
      * Constant <code>projectName="CryptoGuard"</code>
      */