Merge pull request #1 from secure-software-engineering/develop

Merge develop into master

Author: AnakinRaW

.idea/codeStyles/codeStyleConfig.xml

@@ -1,6 +1,8 @@
+import org.apache.tools.ant.taskdefs.condition.Os;
+
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.4.8'
+    id 'org.jetbrains.intellij' version '0.6.1'
     id 'maven'
 }
 
@@ -9,11 +11,12 @@ apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 
 group 'de.fraunhofer'
-version '0.2.5'
+version '0.2.5.3'
 
 sourceCompatibility = 1.8
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven {
         url "https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/"
@@ -25,32 +28,42 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile group: 'de.fraunhofer.iem', name: 'CryptoAnalysis-Android', version: '2.4'
-    compile group: 'de.fraunhofer.iem', name: 'CryptoAnalysis', version: '2.4'
-    compile group: 'ca.mcgill.sable', name: 'soot', version: '3.3.0'
-    compile group: 'de.tud.sse', name: 'soot-infoflow', version: '2.7.1'
-    compile group: 'de.tud.sse', name: 'soot-infoflow-android', version: '2.7.1'
-    compile group: 'de.tud.sse', name: 'soot-infoflow-cmd', version: '2.7.1'
+    compile group: 'ca.mcgill.sable', name: 'soot', version: '4.0.0'
+    compile group: 'de.fraunhofer.iem', name: 'CryptoAnalysis-Android', version: '2.7.2'
+    compile group: 'de.fraunhofer.iem', name: 'CryptoAnalysis', version: '2.7.2'
+    compile group: 'de.tud.sse', name: 'soot-infoflow', version: '2.8'
+    compile group: 'de.tud.sse', name: 'soot-infoflow-android', version: '2.8'
+    compile group: 'de.tud.sse', name: 'soot-infoflow-cmd', version: '2.8'
+    compile group: 'org.swinglabs.swingx', name: 'swingx-all', version: '1.6.4'
+}
+
+
+patchPluginXml {
+    sinceBuild '193'
+    untilBuild '203.*'
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/gradle
 intellij {
-    plugins 'android'
-    version '2018.3.6'
-    updateSinceUntilBuild false
-    
-    //TODO: Add your real path here
-    //alternativeIdePath 'C:\\test\\Android Studio'
-    alternativeIdePath 'C:\\Program Files\\Android\\Android Studio'
+    plugins 'android', 'java', 'maven', 'gradle'
+
+    // updateSinceUntilBuild true
+
+    if (Os.isFamily(Os.FAMILY_MAC)){
+        alternativeIdePath '/Applications/Android Studio 3.5 Beta.app/'
+    }
+    else if (Os.isFamily(Os.FAMILY_WINDOWS)){
+         alternativeIdePath 'C:\\Program Files\\Android\\Android Studio'
+    }
 }
 
+
+
 runIde {
     jvmArgs '-Xmx4G'
     jvmArgs '-Xss100m'
+    if (Os.isFamily(Os.FAMILY_MAC)){
+        // For some strange reason debugging without this causes Menu items not to work
+        jvmArgs '-Dapple.laf.useScreenMenuBar=false'
+    }
 }
-
-patchPluginXml {
-    changeNotes """
-      Add change notes here.<br>
-      <em>most HTML tags may be used</em>"""
-}

.idea/jarRepositories.xml

@@ -3,16 +3,17 @@
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.project.Project;
 import de.fraunhofer.iem.icognicrypt.IdeSupport.projects.Outputs.IOutputFinderCache;
+import de.fraunhofer.iem.icognicrypt.IdeSupport.projects.Outputs.IProjectOutputFinder;
 
 class CogniCryptComponent implements ProjectComponent, ICogniCryptComponent
 {
-    private IOutputFinderCache _outputFinderCache;
     private Project _project;
+    private IProjectOutputFinder _outputFinder;
 
-    public CogniCryptComponent(Project project, IOutputFinderCache outputFinderCache)
+    public CogniCryptComponent(Project project, IProjectOutputFinder outputFinder)
     {
         _project = project;
-        _outputFinderCache = outputFinderCache;
+        _outputFinder = outputFinder;
     }
 
     @Override
@@ -29,13 +30,7 @@ public void projectClosed()
     public void disposeComponent()
     {
         _project = null;
-        _outputFinderCache = null;
-    }
-
-    @Override
-    protected void finalize() throws Throwable
-    {
-        super.finalize();
+        _outputFinder = null;
     }
 }
 

.idea/misc.xml

@@ -1,12 +1,12 @@
 package de.fraunhofer.iem.icognicrypt;
 
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.progress.ProgressIndicator;
 import de.fraunhofer.iem.icognicrypt.core.BackgroundComponent;
 import de.fraunhofer.iem.icognicrypt.core.crySL.CrySLExtractor;
 import de.fraunhofer.iem.icognicrypt.settings.IPersistableCogniCryptSettings;
 
+import java.io.Console;
+
 public class CogniCryptPlugin extends BackgroundComponent
 {
     private final CrySLExtractor _extractor;

.idea/modules/icognicrypt.iml

@@ -1,13 +1,18 @@
 package de.fraunhofer.iem.icognicrypt;
 
+import crypto.cryslhandler.CrySLModelReader;
 
 public class Constants {
 
     public final static boolean AUTOMATIC_SCAN_ON_COMPILE = false;
 
-    public static final String DummyCrySLPath = "./CrySLRules/JavaCryptographicArchitecture";
+    public static final String DummyCrySLPath = "./CrySLRules/JCA";
 
-    public static final String CRYSL_BIN_EXTENSION = ".cryptslbin";
-    public static final String CRYSL_RULES_DOWNLOADLINK = "https://github.com/CROSSINGTUD/CryptoAnalysis/releases/download/2.3/CrySL-rulesets.zip";
+    // TODO: This constant is not final in CryptoAnalysis
+    public static final String CRYSL_EXTENSION = CrySLModelReader.cryslFileEnding;
+    public static final String CRYSL_RULES_DOWNLOADLINK = "https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-release/de/darmstadt/tu/crossing/JavaCryptographicArchitecture/1.5.1/JavaCryptographicArchitecture-1.5.1-ruleset.zip";
     public static final boolean WARNINGS_IN_SOURCECODECLASSES_ONLY = true;
+
+    public static final String ResourceZipPath = "/CrySLRules/JCA1.5.2.zip";
+    public static final String DefaultExtractLocation = "./CrySLRules/";
 }