Skip to content

Commit 3dedda4

Browse files
committed
Merge branch 'santander-java-crypto-check' of https://github.com/bdrodes/codeql into santander-java-crypto-check
2 parents c6cc4ff + fdba3ac commit 3dedda4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

java/ql/lib/experimental/quantum/Language.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private class ConstantDataSourceLiteral extends Crypto::GenericConstantSourceIns
115115

116116
private class ConstantDataSourceArrayInitializer extends Crypto::GenericConstantSourceInstance instanceof ArrayInit
117117
{
118-
ConstantDataSourceArrayInitializer() { exists(Literal l | this.getAnInit() = l) }
118+
ConstantDataSourceArrayInitializer() { this.getAnInit() instanceof Literal }
119119

120120
override DataFlow::Node getOutputNode() { result.asExpr() = this }
121121

java/ql/src/experimental/quantum/Analysis/NonAESGCMCipher.ql

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class NonAESGCMAlgorithmNode extends Crypto::KeyOperationAlgorithmNode {
1919
}
2020

2121
from Crypto::KeyOperationNode op, Crypto::KeyOperationOutputNode codeNode
22-
where op.getAKnownAlgorithm() instanceof NonAESGCMAlgorithmNode and
23-
codeNode = op.getAnOutputArtifact()
24-
select op, "Non-AES-GCM instance."
22+
where
23+
op.getAKnownAlgorithm() instanceof NonAESGCMAlgorithmNode and
24+
codeNode = op.getAnOutputArtifact()
25+
select op, "Non-AES-GCM instance."

java/ql/src/experimental/quantum/Analysis/WeakKDFIterationCount.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ where
1717
op.getIterationCount().asElement() = l and
1818
l.getValue().toInt() < 100000
1919
select op, "Key derivation operation configures iteration count below 100k: $@", l,
20-
l.getValue().toString()
20+
l.getValue().toString()

0 commit comments

Comments
 (0)