update getAlgoSpec

Jami Cogswell · Jami Cogswell · commit d569f93e7846 · 2022-10-24T16:05:57.000-04:00
diff --git a/java/ql/lib/semmle/code/java/security/InsufficientKeySize.qll b/java/ql/lib/semmle/code/java/security/InsufficientKeySize.qll
@@ -157,12 +157,18 @@ private class AsymmetricKeyGenerator extends AlgoGeneratorObject {
     this instanceof JavaSecurityAlgoParamGenerator
   }
 
-  override Expr getAlgoSpec() { result = this.getAlgoSpec() }
+  override Expr getAlgoSpec() {
+    result =
+      [
+        this.(JavaSecurityKeyPairGenerator).getAlgoSpec(),
+        this.(JavaSecurityAlgoParamGenerator).getAlgoSpec()
+      ]
+  }
 }
 
 /** An instance of a `javax.crypto.KeyGenerator`. */
 private class SymmetricKeyGenerator extends AlgoGeneratorObject instanceof JavaxCryptoKeyGenerator {
-  override Expr getAlgoSpec() { result = this.getAlgoSpec() }
+  override Expr getAlgoSpec() { result = JavaxCryptoKeyGenerator.super.getAlgoSpec() }
 }
 
 /** An instance of an algorithm specification. */

Original file line number	Diff line number	Diff line change
`@@ -157,12 +157,18 @@ private class AsymmetricKeyGenerator extends AlgoGeneratorObject {`
`157`	`157`	`this instanceof JavaSecurityAlgoParamGenerator`
`158`	`158`	`}`
`159`	`159`
`160`		`- override Expr getAlgoSpec() { result = this.getAlgoSpec() }`
	`160`	`+ override Expr getAlgoSpec() {`
	`161`	`+ result =`
	`162`	`+ [`
	`163`	`+ this.(JavaSecurityKeyPairGenerator).getAlgoSpec(),`
	`164`	`+ this.(JavaSecurityAlgoParamGenerator).getAlgoSpec()`
	`165`	`+ ]`
	`166`	`+ }`
`161`	`167`	`}`
`162`	`168`
`163`	`169`	/** An instance of a `javax.crypto.KeyGenerator`. */
`164`	`170`	`private class SymmetricKeyGenerator extends AlgoGeneratorObject instanceof JavaxCryptoKeyGenerator {`
`165`		`- override Expr getAlgoSpec() { result = this.getAlgoSpec() }`
	`171`	`+ override Expr getAlgoSpec() { result = JavaxCryptoKeyGenerator.super.getAlgoSpec() }`
`166`	`172`	`}`
`167`	`173`
`168`	`174`	`/** An instance of an algorithm specification. */`