Remove not needed imports

CROSSINGTUD · Nov 9, 2023 · dccfb41 · dccfb41
1 parent bd3b274
commit dccfb41
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 45 deletions.
diff --git a/CryptoAnalysis-Android/pom.xml b/CryptoAnalysis-Android/pom.xml
@@ -70,20 +70,20 @@
 			<artifactId>CryptoAnalysis</artifactId>
 		</dependency>
 		<dependency>
-            <groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
-            <artifactId>soot-infoflow</artifactId>
-            <version>${flowDroidVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
-            <artifactId>soot-infoflow-summaries</artifactId>
-            <version>${flowDroidVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
-            <artifactId>soot-infoflow-android</artifactId>
-            <version>${flowDroidVersion}</version>
-        </dependency>
+			<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
+			<artifactId>soot-infoflow</artifactId>
+			<version>${flowDroidVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
+			<artifactId>soot-infoflow-summaries</artifactId>
+			<version>${flowDroidVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
+			<artifactId>soot-infoflow-android</artifactId>
+			<version>${flowDroidVersion}</version>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>

diff --git a/CryptoAnalysis/pom.xml b/CryptoAnalysis/pom.xml
@@ -276,10 +276,15 @@
 			<artifactId>bctls-jdk15on</artifactId>
 			<version>1.68</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>2.0.9</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.30</version>
+			<version>2.0.9</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.crypto.tink</groupId>

diff --git a/CryptoAnalysis/src/main/java/crypto/HeadlessCryptoScanner.java b/CryptoAnalysis/src/main/java/crypto/HeadlessCryptoScanner.java
@@ -164,10 +164,10 @@ private void analyse() {
 		Transform transform = new Transform("wjtp.ifds", createAnalysisTransformer());
 		PackManager.v().getPack("wjtp").add(transform);
 		callGraphWatch = Stopwatch.createStarted();
-		// Soot doesn't allow to run the "jap" pack alone, hence all packs are executed
-		// PackManager.v().getPack("cg").apply();
-		// PackManager.v().getPack("wjtp").apply();
-		PackManager.v().runPacks();
+
+		PackManager.v().getPack("cg").apply();
+		PackManager.v().getPack("wjtp").apply();
+		// PackManager.v().runPacks();
 	}
 
 	public String toString() {

diff --git a/CryptoAnalysis/src/main/java/crypto/reporting/ReporterHelper.java b/CryptoAnalysis/src/main/java/crypto/reporting/ReporterHelper.java
@@ -89,7 +89,7 @@ public static String generateReport(List<CrySLRule> rules, Collection<IAnalysisS
 		report += String.format("\tNumber of Objects Analyzed: %s\n", objects.size());
 
 		if (errorMarkers.rowKeySet().isEmpty()) {
-			report += "\tNo violation of any of the rules found.\n";
+			report += "\n\tNo violation of any of the rules found.\n";
 		} else {
 			report += "\n\tCryptoAnalysis found the following violations. For details see description above.\n";
 

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/BufferedBlockCipherTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/BufferedBlockCipherTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class BufferedBlockCipherTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/CipherTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/CipherTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class CipherTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/ECElGamalDecryptorTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/ECElGamalDecryptorTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class ECElGamalDecryptorTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/HMacTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/HMacTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class HMacTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/KeyFactoryTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/KeyFactoryTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class KeyFactoryTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/KeyStoreTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/KeyStoreTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class KeyStoreTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/MessageDigestTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/MessageDigestTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class MessageDigestTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/SSLEngineTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/SSLEngineTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class SSLEngineTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/SecretKey.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/SecretKey.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class SecretKey extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/SecureRandom.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/SecureRandom.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class SecureRandom extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/test/finitestatemachine/SignatureTest.java b/CryptoAnalysis/src/test/java/test/finitestatemachine/SignatureTest.java
@@ -1,7 +1,5 @@
 package test.finitestatemachine;
 
-import org.junit.Test;
-
 import crypto.analysis.CrySLRulesetSelector.Ruleset;
 
 public class SignatureTest extends FiniteStateMachineTestingFramework{

diff --git a/CryptoAnalysis/src/test/java/tests/headless/AbstractHeadlessTest.java b/CryptoAnalysis/src/test/java/tests/headless/AbstractHeadlessTest.java
@@ -93,7 +93,7 @@ protected HeadlessCryptoScanner createScanner(MavenProject mp) {
 	}
 
 	protected HeadlessCryptoScanner createScanner(MavenProject mp, Ruleset ruleset) {
-		G.v().reset();
+		G.reset();
 		HeadlessCryptoScanner scanner = new HeadlessCryptoScanner() {
 			@Override
 			protected String sootClassPath() {

diff --git a/CryptoAnalysis/src/test/java/tests/headless/BouncyCastleHeadlessTest.java b/CryptoAnalysis/src/test/java/tests/headless/BouncyCastleHeadlessTest.java
@@ -43,7 +43,7 @@ public void testBCSymmetricCipherExamples() {
 
 		setErrorsCount(RequiredPredicateError.class, new TruePositives(2), new FalseNegatives(1, "https://github.com/CROSSINGTUD/CryptoAnalysis/issues/216"), "<gcm_aes_example.GCMAESBouncyCastle: byte[] processing(byte[],boolean)>");
 		setErrorsCount("<cbc_aes_example.CBCAESBouncyCastle: void setKey(byte[])>", RequiredPredicateError.class, 1);
-		setErrorsCount("<cbc_aes_example.CBCAESBouncyCastle: byte[] processing(byte[],boolean)>", RequiredPredicateError.class, 1);
+		setErrorsCount("<cbc_aes_example.CBCAESBouncyCastle: byte[] processing(byte[],boolean)>", RequiredPredicateError.class, 3);
 
 		scanner.exec();
 	  	assertErrors();

diff --git a/CryptoAnalysis/src/test/java/tests/providerdetection/ProviderDetectionTestingFramework.java b/CryptoAnalysis/src/test/java/tests/providerdetection/ProviderDetectionTestingFramework.java
@@ -43,7 +43,7 @@ public String getSootClassPath(){
 	 * This method is used to setup Soot
 	 */
 	public void setupSoot(String sootClassPath, String mainClass) {
-		G.v().reset();
+		G.reset();
 		Options.v().set_whole_program(true);
 		Options.v().setPhaseOption("cg.cha", "on");
 //		Options.v().setPhaseOption("cg", "all-reachable:true");