hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-14 19:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Autoformat QL files

Browse Source
This commit is contained in:
Nicolas Will
2026-02-23 00:32:57 +01:00
parent 24e5c4c6c0
commit 61ec2aaa08
7 changed files with 29 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
java/ql/lib/experimental/quantum/JCA.qll
View File

@@ -27,10 +27,9 @@ module JCAModel {
predicate cipher_names(string algo) {
algo.toUpperCase()
.matches([
"AES", "AESWrap", "AESWrapPad", "ARCFOUR", "ARIA", "Blowfish", "Camellia",
"ChaCha20", "ChaCha20-Poly1305", "DES", "DESede", "DESedeWrap", "ECIES",
"PBEWith%", "RC2", "RC4", "RC5", "RSA", "Salsa20", "SEED", "Skipjack", "Idea",
"Twofish"
"AES", "AESWrap", "AESWrapPad", "ARCFOUR", "ARIA", "Blowfish", "Camellia", "ChaCha20",
"ChaCha20-Poly1305", "DES", "DESede", "DESedeWrap", "ECIES", "PBEWith%", "RC2", "RC4",
"RC5", "RSA", "Salsa20", "SEED", "Skipjack", "Idea", "Twofish"
].toUpperCase())
}
@@ -204,7 +203,8 @@ module JCAModel {
upper.matches("DESEDE%") and
type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::TRIPLE_DES())
or
not upper.matches("DESEDE%") and upper.matches("DES%") and
not upper.matches("DESEDE%") and
upper.matches("DES%") and
type = KeyOpAlg::TSymmetricCipher(KeyOpAlg::DES())
or
upper = "TRIPLEDES" and
@@ -1879,9 +1879,7 @@ module JCAModel {
override Crypto::ModeOfOperationAlgorithmInstance getModeOfOperationAlgorithm() { none() }
override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() {
result = this
}
override Crypto::PaddingAlgorithmInstance getPaddingAlgorithm() { result = this }
override predicate shouldHaveModeOfOperation() { none() }
@@ -1984,24 +1982,16 @@ module JCAModel {
}
/** Gets the digest algorithm name argument (arg 0). */
Expr getDigestAlgorithmArg() {
result = this.getArgument(0)
}
Expr getDigestAlgorithmArg() { result = this.getArgument(0) }
/** Gets the MGF algorithm name argument (arg 1). */
Expr getMgfAlgorithmArg() {
result = this.getArgument(1)
}
Expr getMgfAlgorithmArg() { result = this.getArgument(1) }
/** Gets the salt length argument (arg 3). */
Expr getSaltLengthArg() {
result = this.getArgument(3)
}
Expr getSaltLengthArg() { result = this.getArgument(3) }
/** Gets the MGF parameter spec argument (arg 2), e.g., MGF1ParameterSpec.SHA256. */
Expr getMgfSpecArg() {
result = this.getArgument(2)
}
Expr getMgfSpecArg() { result = this.getArgument(2) }
}
/**
@@ -2011,9 +2001,7 @@ module JCAModel {
*/
class MGF1ParameterSpecFieldAccess extends FieldAccess {
MGF1ParameterSpecFieldAccess() {
this.getField()
.getDeclaringType()
.hasQualifiedName("java.security.spec", "MGF1ParameterSpec") and
this.getField().getDeclaringType().hasQualifiedName("java.security.spec", "MGF1ParameterSpec") and
this.getField().isStatic()
}
@@ -2042,8 +2030,7 @@ module JCAModel {
*
* Type resolution delegates to hash_name_to_type_known from Standardization.
*/
class PSSParameterSpecDigestHashAlgorithmInstance extends Crypto::HashAlgorithmInstance
instanceof JavaConstant
class PSSParameterSpecDigestHashAlgorithmInstance extends Crypto::HashAlgorithmInstance instanceof JavaConstant
{
PSSParameterSpecInstantiation spec;
@@ -2075,8 +2062,7 @@ module JCAModel {
* The field name is normalized to a standard hash algorithm name (e.g.,
* SHA256 -> SHA-256), then type resolution delegates to hash_name_to_type_known.
*/
class PSSParameterSpecMgf1HashAlgorithmInstance extends Crypto::HashAlgorithmInstance
instanceof MGF1ParameterSpecFieldAccess
class PSSParameterSpecMgf1HashAlgorithmInstance extends Crypto::HashAlgorithmInstance instanceof MGF1ParameterSpecFieldAccess
{
PSSParameterSpecInstantiation spec;
string normalizedName;
@@ -2093,13 +2079,9 @@ module JCAModel {
override string getRawHashAlgorithmName() { result = super.getField().getName() }
override Crypto::THashType getHashType() {
result = hash_name_to_type_known(normalizedName, _)
}
override Crypto::THashType getHashType() { result = hash_name_to_type_known(normalizedName, _) }
override int getFixedDigestLength() {
exists(hash_name_to_type_known(normalizedName, result))
}
override int getFixedDigestLength() { exists(hash_name_to_type_known(normalizedName, result)) }
}
class SignatureInitCall extends MethodCall {
@@ -2119,9 +2101,11 @@ module JCAModel {
*/
class SignatureSetParameterCall extends MethodCall {
SignatureSetParameterCall() {
this.getMethod().hasQualifiedName("java.security", "Signature", "setParameter") and
this.getMethod()
.hasQualifiedName("java.security", "Signature", "setParameter") and
this.getMethod().getParameterType(0).(RefType).hasQualifiedName("java.security.spec", "AlgorithmParameterSpec")
.getParameterType(0)
.(RefType)
.hasQualifiedName("java.security.spec", "AlgorithmParameterSpec")
}
/** Gets the AlgorithmParameterSpec argument. */
@@ -2236,9 +2220,7 @@ module JCAModel {
* Flow from `PSSParameterSpec` instantiation to `Signature.setParameter()` argument.
*/
module PSSSpecToSetParameterConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) {
src.asExpr() instanceof PSSParameterSpecInstantiation
}
predicate isSource(DataFlow::Node src) { src.asExpr() instanceof PSSParameterSpecInstantiation }
predicate isSink(DataFlow::Node sink) {
exists(SignatureSetParameterCall c | sink.asExpr() = c.getParameterSpecArg())
@@ -2260,8 +2242,7 @@ module JCAModel {
PSSParameterSpecInstantiation spec, SignaturePssPaddingAlgorithmInstance literal
) {
exists(
SignatureSetParameterCall setParam,
SignatureGetInstanceCall getInstance,
SignatureSetParameterCall setParam, SignatureGetInstanceCall getInstance,
SignatureGetInstanceAlgorithmValueConsumer consumer
|
consumer = literal.getConsumer() and

3
java/ql/src/experimental/quantum/Examples/Demo/InventoryKeySizes.ql
View File

@@ -14,6 +14,5 @@ from Crypto::KeyCreationOperationNode keygen, Crypto::AlgorithmNode alg, int key
where
alg = keygen.getAKnownAlgorithm() and
keygen.getAKeySizeSource().asElement().(Literal).getValue().toInt() = keySize
select keygen,
"Key creation with algorithm $@ using " + keySize.toString() + "-bit key.", alg,
select keygen, "Key creation with algorithm $@ using " + keySize.toString() + "-bit key.", alg,
alg.getAlgorithmName()

3
java/ql/src/experimental/quantum/Examples/Demo/ProtocolRSA_OAEP.ql
View File

@@ -11,8 +11,7 @@
import experimental.quantum.Language
import Crypto::KeyOpAlg as KeyOpAlg
from
Crypto::KeyOperationAlgorithmNode alg, Crypto::OAEPPaddingAlgorithmNode pad
from Crypto::KeyOperationAlgorithmNode alg, Crypto::OAEPPaddingAlgorithmNode pad
where
alg.getAlgorithmType() = KeyOpAlg::TAsymmetricCipher(KeyOpAlg::RSA()) and
pad = alg.getPaddingAlgorithm()

3
java/ql/src/experimental/quantum/Examples/Demo/ProtocolRSA_PSS.ql
View File

@@ -11,8 +11,7 @@
import experimental.quantum.Language
import Crypto::KeyOpAlg as KeyOpAlg
from
Crypto::KeyOperationAlgorithmNode alg, Crypto::PSSPaddingAlgorithmNode pss
from Crypto::KeyOperationAlgorithmNode alg, Crypto::PSSPaddingAlgorithmNode pss
where
alg.getAlgorithmType() = KeyOpAlg::TAsymmetricCipher(KeyOpAlg::RSA()) and
pss = alg.getPaddingAlgorithm()

6
java/ql/src/experimental/quantum/Examples/Demo/QuantumVulnerableAlgorithm.ql
View File

@@ -15,14 +15,12 @@ where
exists(Crypto::KeyOperationAlgorithmNode keyAlg |
keyAlg = alg and
isQuantumVulnerableAlgorithmType(keyAlg.getAlgorithmType()) and
msg =
"Quantum-vulnerable key operation algorithm: " + keyAlg.getAlgorithmName() + "."
msg = "Quantum-vulnerable key operation algorithm: " + keyAlg.getAlgorithmName() + "."
)
or
exists(Crypto::KeyAgreementAlgorithmNode kaAlg |
kaAlg = alg and
isQuantumVulnerableKeyAgreementType(kaAlg.getKeyAgreementType()) and
msg =
"Quantum-vulnerable key agreement algorithm: " + kaAlg.getAlgorithmName() + "."
msg = "Quantum-vulnerable key agreement algorithm: " + kaAlg.getAlgorithmName() + "."
)
select alg, msg

5
java/ql/src/experimental/quantum/Examples/Demo/QuantumVulnerableKeySize.ql
View File

@@ -23,6 +23,5 @@ where
kaAlg = alg and isQuantumVulnerableKeyAgreementType(kaAlg.getKeyAgreementType())
)
)
select keygen,
"Quantum-vulnerable key size (" + keySize.toString() + " bits) for algorithm $@.", alg,
alg.getAlgorithmName()
select keygen, "Quantum-vulnerable key size (" + keySize.toString() + " bits) for algorithm $@.",
alg, alg.getAlgorithmName()

4
shared/quantum/codeql/quantum/experimental/Model.qll
View File

@@ -2190,9 +2190,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
PSSPaddingAlgorithmNode() { this = TPaddingAlgorithm(instance) }
HashAlgorithmNode getPSSHashAlgorithm() {
result.asElement() = instance.getHashAlgorithm()
}
HashAlgorithmNode getPSSHashAlgorithm() { result.asElement() = instance.getHashAlgorithm() }
HashAlgorithmNode getMGF1HashAlgorithm() {
result.asElement() = instance.getMgf1HashAlgorithm()