diff --git a/CryptoAnalysis/pom.xml b/CryptoAnalysis/pom.xml index d4fbc5eda..6ff762a31 100644 --- a/CryptoAnalysis/pom.xml +++ b/CryptoAnalysis/pom.xml @@ -264,6 +264,11 @@ guava 32.1.3-jre + + org.ow2.asm + asm + 9.3 + de.fraunhofer.iem idealPDS @@ -372,10 +377,5 @@ 2.15.0 - - org.ow2.asm - asm - 9.3 - diff --git a/CryptoAnalysis/src/main/java/crypto/constraints/EvaluableConstraint.java b/CryptoAnalysis/src/main/java/crypto/constraints/EvaluableConstraint.java index 978e81eae..38fb988a9 100644 --- a/CryptoAnalysis/src/main/java/crypto/constraints/EvaluableConstraint.java +++ b/CryptoAnalysis/src/main/java/crypto/constraints/EvaluableConstraint.java @@ -121,7 +121,6 @@ protected Map extractValueAsString(String va * * @param callSite call site at which sootValue is involved * @param allocSite allocation site at which sootValue is involved - * @param arrayLocal soot array local variable for which values are to be found * @return extracted array values */ protected Map extractSootArray(CallSiteWithParamIndex callSite, diff --git a/CryptoAnalysis/src/main/java/crypto/constraints/ExceptionConstraint.java b/CryptoAnalysis/src/main/java/crypto/constraints/ExceptionConstraint.java index c5593dc14..d40f37f18 100644 --- a/CryptoAnalysis/src/main/java/crypto/constraints/ExceptionConstraint.java +++ b/CryptoAnalysis/src/main/java/crypto/constraints/ExceptionConstraint.java @@ -45,6 +45,8 @@ public void evaluate() { /** * Checks if a) the method that is called is the same as the method of * this constraint and b) if the specified exception is caught. + * + * @param call the called statement */ public void evaluate(Statement call) { try { @@ -58,12 +60,12 @@ public void evaluate(Statement call) { } /** - * Returns whether the `trapped` unit ins trapped in the method body. + * Returns whether the `trapped` unit is trapped in the method body. * - * @param body - * @param trap - * @param trapped - * @return Returns whether the `trapped` unit ins trapped in the method body. + * @param body the method's body + * @param trap the trap + * @param trapped the trapped unit + * @return Returns whether the `trapped` unit is trapped in the method body. */ public static boolean trapsUnit(final Body body, final Trap trap, final Unit trapped) { boolean begun = false; @@ -81,8 +83,8 @@ public static boolean trapsUnit(final Body body, final Trap trap, final Unit tra /** * Returns the handler, that catches the exception thrown by callee in the method. * - * @param method in which callee is called. - * @param callee The called Method, throwing the exception. + * @param body The called Method, throwing the exception. + * @param unit Unit where callee is called. * @param exception The called Method, throwing the exception. * @return Returns the handler, that catches the exception thrown by callee in the method. */ @@ -96,6 +98,10 @@ public static Optional getTrap(final Body body, final Unit unit, final Soo /** * Returns all units in the method body, excluding exception handlers. + * + * @param body the method's body + * + * @return units all collected units */ public static Collection getUnits(Body body) { Collection units = new ArrayList<>(); diff --git a/CryptoAnalysis/src/main/java/crypto/rules/CrySLException.java b/CryptoAnalysis/src/main/java/crypto/rules/CrySLException.java index 75ac38881..0a55c7bf5 100644 --- a/CryptoAnalysis/src/main/java/crypto/rules/CrySLException.java +++ b/CryptoAnalysis/src/main/java/crypto/rules/CrySLException.java @@ -11,6 +11,8 @@ public class CrySLException { /** * Construct a {@link CrySLException} from the fully qualified classname * of the {@link Exception} to store. + * + * @param exception the exception's name */ public CrySLException(String exception) { this.exception = exception; diff --git a/CryptoAnalysis/src/main/java/crypto/typestate/LabeledMatcherTransition.java b/CryptoAnalysis/src/main/java/crypto/typestate/LabeledMatcherTransition.java index fc966a58d..84f48c4dc 100644 --- a/CryptoAnalysis/src/main/java/crypto/typestate/LabeledMatcherTransition.java +++ b/CryptoAnalysis/src/main/java/crypto/typestate/LabeledMatcherTransition.java @@ -34,6 +34,11 @@ public static MatcherTransition getErrorTransition(State from, Collection getMatching(SootMethod method) { diff --git a/dependencies.txt b/dependencies.txt deleted file mode 100644 index 207bc4ce3..000000000 --- a/dependencies.txt +++ /dev/null @@ -1,38 +0,0 @@ -[INFO] de.fraunhofer.iem:CryptoAnalysis:jar:1.0.0 -[INFO] +- de.fraunhofer.iem:boomerangPDS:jar:1.0.0:compile -[INFO] | +- de.fraunhofer.iem:WPDS:jar:1.0.0:compile -[INFO] | +- com.google.guava:guava:jar:23.5-jre:compile -[INFO] | | +- com.google.code.findbugs:jsr305:jar:1.3.9:compile -[INFO] | | +- org.checkerframework:checker-qual:jar:2.0.0:compile -[INFO] | | +- com.google.errorprone:error_prone_annotations:jar:2.0.18:compil - -[INFO] | | +- com.google.j2objc:j2objc-annotations:jar:1.1:compile -[INFO] | | \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile -[INFO] | +- de.fraunhofer.iem:PathExpression:jar:1.0.0:compile -[INFO] | +- de.fraunhofer.iem:synchronizedPDS:jar:1.0.0:compile -[INFO] | +- com.googlecode.json-simple:json-simple:jar:1.1.1:compile -[INFO] | +- org.apache.commons:commons-lang3:jar:3.5:compile -[INFO] | \- org.apache.logging.log4j:log4j-core:jar:2.11.0:compile -[INFO] | \- org.apache.logging.log4j:log4j-api:jar:2.11.0:compile -[INFO] +- ca.mcgill.sable:soot:jar:3.0.0-SNAPSHOT:compile -[INFO] | +- commons-io:commons-io:jar:2.6:compile -[INFO] | +- org.smali:dexlib2:jar:2.2.2:compile -[INFO] | | \- org.smali:util:jar:2.2.2:compile -[INFO] | | \- com.beust:jcommander:jar:1.64:compile -[INFO] | +- org.ow2.asm:asm-debug-all:jar:5.2:compile -[INFO] | +- xmlpull:xmlpull:jar:1.1.3.4d_b4_min:compile -[INFO] | +- org.jboss:jboss-common-core:jar:2.5.0.Final:compile -[INFO] | | \- org.jboss.logging:jboss-logging-spi:jar:2.1.2.GA:compile -[INFO] | +- pxb.android:axml:jar:2.0.0-SNAPSHOT:compile -[INFO] | +- ca.mcgill.sable:polyglot:jar:2006:compile -[INFO] | +- heros:heros:jar:1.0.0-SNAPSHOT:compile -[INFO] | | \- org.functionaljava:functionaljava:jar:4.2:compile -[INFO] | +- ca.mcgill.sable:jasmin:jar:3.0.0-SNAPSHOT:compile -[INFO] | | \- ca.mcgill.sable:java_cup:jar:0.9.2:compile -[INFO] | +- org.slf4j:slf4j-api:jar:1.7.5:compile -[INFO] | \- org.slf4j:slf4j-simple:jar:1.7.5:compile -[INFO] +- de.fraunhofer.iem:idealPDS:jar:1.0.0:compile -[INFO] +- de.fraunhofer.iem:testCore:jar:1.0.0:compile -[INFO] +- commons-cli:commons-cli:jar:1.4:compile -[INFO] \- junit:junit:jar:4.12:test -[INFO] \- org.hamcrest:hamcrest-core:jar:1.3:test \ No newline at end of file