Update JCA.qll to fix overly specific barrier

nicolaswill · nicolaswill · commit 4c23111cebc8 · 2026-02-22T17:53:28.000+01:00
Fix generic creation/init/use flow barrier logic: the barrier was previously cipher-specific inside a generic module, and other instances would therefore get no re-init barrier.
diff --git a/java/ql/lib/experimental/quantum/JCA.qll b/java/ql/lib/experimental/quantum/JCA.qll
@@ -631,7 +631,7 @@ module JCAModel {
       }
 
       predicate isBarrier(DataFlow::Node node, FlowState state) {
-        exists(CipherInitCall call | node.asExpr() = call.getQualifier() |
+        exists(Init call | node.asExpr() = call.(MethodCall).getQualifier() |
           state instanceof UninitializedFlowState
           or
           state.(InitializedFlowState).getInitCall() != call

Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ module JCAModel {`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`predicate isBarrier(DataFlow::Node node, FlowState state) {`
`634`		`- exists(CipherInitCall call \| node.asExpr() = call.getQualifier() \|`
	`634`	`+ exists(Init call \| node.asExpr() = call.(MethodCall).getQualifier() \|`
`635`	`635`	`state instanceof UninitializedFlowState`
`636`	`636`	`or`
`637`	`637`	`state.(InitializedFlowState).getInitCall() != call`