Used Ruleset enum for defining the 'defaultRulesDirectory' field

CROSSINGTUD · Jul 9, 2019 · c3cde4a · c3cde4a
1 parent e7c9eb8
commit c3cde4a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/CryptoAnalysis/src/main/java/crypto/providerdetection/ProviderDetection.java b/CryptoAnalysis/src/main/java/crypto/providerdetection/ProviderDetection.java
@@ -34,9 +34,9 @@
 import boomerang.results.AbstractBoomerangResults;
 import boomerang.results.BackwardBoomerangResults;
 import boomerang.seedfactory.SeedFactory;
-import crypto.HeadlessCryptoScanner;
 import crypto.rules.CryptSLRule;
 import crypto.rules.CryptSLRuleReader;
+import crypto.analysis.CrySLRulesetSelector.Ruleset;
 import soot.Body;
 import soot.G;
 import soot.PackManager;
@@ -64,7 +64,8 @@ public class ProviderDetection {
 	private String provider = null;
 	private String rulesDirectory = null;
 
-	private static final String defaultRulesDirectory = System.getProperty("user.dir")+File.separator+"src"+File.separator+"main"+File.separator+"resources"+File.separator+"JavaCryptographicArchitecture";
+	public static final Ruleset defaultRuleset = Ruleset.JavaCryptographicArchitecture;
+	private static final String defaultRulesDirectory = System.getProperty("user.dir")+File.separator+"src"+File.separator+"main"+File.separator+"resources"+File.separator+defaultRuleset;
 	private static final String sootClassPath = System.getProperty("user.dir") + File.separator+"target"+File.separator+"test-classes";
 
 	private static final String CRYPTSLBIN = ".cryptslbin";