From c3cde4a6c30ea7a5c36b49b7a6bb13f64831ad27 Mon Sep 17 00:00:00 2001 From: enriozuni Date: Tue, 9 Jul 2019 13:32:34 +0200 Subject: [PATCH] Used Ruleset enum for defining the 'defaultRulesDirectory' field --- .../java/crypto/providerdetection/ProviderDetection.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CryptoAnalysis/src/main/java/crypto/providerdetection/ProviderDetection.java b/CryptoAnalysis/src/main/java/crypto/providerdetection/ProviderDetection.java index 334099bfb..904927825 100644 --- 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";