diff --git a/lib/apktool-1.5.2.jar b/lib/apktool-1.5.2.jar index 3d5fc2a..1f0f8b4 100644 Binary files a/lib/apktool-1.5.2.jar and b/lib/apktool-1.5.2.jar differ diff --git a/releases/SAAF-v1.jar b/releases/SAAF-v1.jar new file mode 100644 index 0000000..4c67448 Binary files /dev/null and b/releases/SAAF-v1.jar differ diff --git a/src/de/rub/syssec/saaf/analysis/steps/slicing/TodoList.java b/src/de/rub/syssec/saaf/analysis/steps/slicing/TodoList.java index 486c0d0..004bfa6 100644 --- a/src/de/rub/syssec/saaf/analysis/steps/slicing/TodoList.java +++ b/src/de/rub/syssec/saaf/analysis/steps/slicing/TodoList.java @@ -24,6 +24,8 @@ import de.rub.syssec.saaf.application.methods.BasicBlock; import de.rub.syssec.saaf.misc.ByteUtils; +import de.rub.syssec.saaf.misc.config.Config; +import de.rub.syssec.saaf.misc.config.ConfigKeys; import de.rub.syssec.saaf.model.application.BasicBlockInterface; import de.rub.syssec.saaf.model.application.CodeLineInterface; import de.rub.syssec.saaf.model.application.DetectionLogicError; @@ -45,8 +47,7 @@ public class TodoList { private static final Logger LOGGER = Logger.getLogger(TodoList.class); - // TODO: Make it configurable - protected static final int MAX_FUZZY_LEVEL = 10; + protected static final int MAX_FUZZY_LEVEL = Config.getInstance().getIntConfigValue(ConfigKeys.ANALYSIS_MAX_FUZZY_LEVEL, 10); protected static final int MAX_RS_COUNT = 100000; diff --git a/src/de/rub/syssec/saaf/misc/config/ConfigKeys.java b/src/de/rub/syssec/saaf/misc/config/ConfigKeys.java index 59637d1..f478891 100644 --- a/src/de/rub/syssec/saaf/misc/config/ConfigKeys.java +++ b/src/de/rub/syssec/saaf/misc/config/ConfigKeys.java @@ -193,9 +193,17 @@ public enum ConfigKeys { */ ANALYSIS_INCLUDE_AD_FRAMEWORKS("analysis.include.adpackages",true), + /** + * Retrieve the max fuzzy level value for the backtracking. Default is 10 + */ + + ANALYSIS_MAX_FUZZY_LEVEL("analysis.maxfuzzylevel",10), + + /** * Retrieve the name of the report template to use. The default is "xml.stg" */ + REPORT_TEMPLATE("reporting.templates.template.default", "report"), /** * Retrieve the template group for reporting (only needed with @@ -361,8 +369,9 @@ public enum ConfigKeys { private String name; public String defaultString; + public int defaultInt; public boolean defaultBoolean; - + private ConfigKeys(String name) { this.name = name; } @@ -372,6 +381,10 @@ private ConfigKeys(String name, String defaultValue) { this.defaultString = defaultValue; } + private ConfigKeys(String name, int defaultValue) { + this.name = name; + this.defaultInt = defaultValue; + } private ConfigKeys(String name, boolean defaultValue) { this.name = name; this.defaultBoolean = defaultValue;