Skip to content

Commit 3b0b5e4

Browse files
committed
Replace crypto-parameter with credentials-key
1 parent a2bcc97 commit 3b0b5e4

21 files changed

+71
-72
lines changed

java/ql/lib/ext/com.amazonaws.auth.model.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "(String,String)", "", "Argument[0]", "crypto-parameter", "manual"]
7-
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "(String,String)", "", "Argument[1]", "crypto-parameter", "manual"]
6+
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "(String,String)", "", "Argument[0]", "credentials-key", "manual"]
7+
- ["com.amazonaws.auth", "BasicAWSCredentials", False, "BasicAWSCredentials", "(String,String)", "", "Argument[1]", "credentials-key", "manual"]

java/ql/lib/ext/com.auth0.jwt.algorithms.model.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
7-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
8-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
9-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
10-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
11-
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
6+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(String)", "", "Argument[0]", "credentials-key", "manual"]
7+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC256", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
8+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(String)", "", "Argument[0]", "credentials-key", "manual"]
9+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC384", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
10+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(String)", "", "Argument[0]", "credentials-key", "manual"]
11+
- ["com.auth0.jwt.algorithms", "Algorithm", False, "HMAC512", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]

java/ql/lib/ext/com.azure.identity.model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.azure.identity", "ClientSecretCredentialBuilder", False, "clientSecret", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
6+
- ["com.azure.identity", "ClientSecretCredentialBuilder", False, "clientSecret", "(String)", "", "Argument[0]", "credentials-key", "manual"]
77
- ["com.azure.identity", "UsernamePasswordCredentialBuilder", False, "password", "(String)", "", "Argument[0]", "credentials-password", "manual"]
88
- ["com.azure.identity", "UsernamePasswordCredentialBuilder", False, "username", "(String)", "", "Argument[0]", "credentials-username", "manual"]

java/ql/lib/ext/com.jcraft.jsch.model.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ extensions:
44
extensible: sinkModel
55
data:
66
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(Identity,byte[])", "", "Argument[1]", "credentials-password", "manual"]
7-
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String)", "", "Argument[0]", "crypto-parameter", "manual"]
8-
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
7+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String)", "", "Argument[0]", "credentials-key", "manual"]
8+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[])", "", "Argument[0]", "credentials-key", "manual"]
99
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[])", "", "Argument[1]", "credentials-password", "manual"]
1010
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[0]", "credentials-username", "manual"]
11-
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[1]", "crypto-parameter", "manual"]
12-
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
11+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[1]", "credentials-key", "manual"]
12+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[2]", "credentials-key", "manual"]
1313
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,byte[],byte[],byte[])", "", "Argument[3]", "credentials-password", "manual"]
14-
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String)", "", "Argument[0]", "crypto-parameter", "manual"]
14+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String)", "", "Argument[0]", "credentials-key", "manual"]
1515
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String)", "", "Argument[1]", "credentials-password", "manual"]
16-
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
17-
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[1]", "crypto-parameter", "manual"]
16+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[0]", "credentials-key", "manual"]
17+
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[1]", "credentials-key", "manual"]
1818
- ["com.jcraft.jsch", "JSch", True, "addIdentity", "(String,String,byte[])", "", "Argument[2]", "credentials-password", "manual"]
1919
- ["com.jcraft.jsch", "JSch", True, "getSession", "(String,String,int)", "", "Argument[1]", "request-forgery", "ai-manual"]
2020
- ["com.jcraft.jsch", "JSch", True, "getSession", "(String,String)", "", "Argument[0]", "credentials-username", "manual"]

java/ql/lib/ext/com.sun.crypto.provider.model.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ extensions:
55
data:
66
- ["com.sun.crypto.provider", "JceKeyStore", False, "getPreKeyedHash", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
77
- ["com.sun.crypto.provider", "KeyProtector", False, "KeyProtector", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
8-
- ["com.sun.crypto.provider", "CipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
9-
- ["com.sun.crypto.provider", "DESCrypt", False, "expandKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
10-
- ["com.sun.crypto.provider", "DESKey", False, "DESKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
11-
- ["com.sun.crypto.provider", "DESKey", False, "DESKey", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]
12-
- ["com.sun.crypto.provider", "DESKeyGenerator", False, "setParityBit", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]
13-
- ["com.sun.crypto.provider", "DESedeKey", False, "DESedeKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
14-
- ["com.sun.crypto.provider", "DESedeKey", False, "DESedeKey", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]
15-
- ["com.sun.crypto.provider", "DHPrivateKey", False, "DHPrivateKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
16-
- ["com.sun.crypto.provider", "DHPublicKey", False, "DHPublicKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
17-
- ["com.sun.crypto.provider", "GaloisCounterMode", False, "init", "(boolean,String,byte[],byte[],int)", "", "Argument[2]", "crypto-parameter", "manual"]
18-
- ["com.sun.crypto.provider", "PBECipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
19-
- ["com.sun.crypto.provider", "PBES1Core", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
20-
- ["com.sun.crypto.provider", "PKCS12PBECipherCore", False, "implUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
21-
- ["com.sun.crypto.provider", "TlsMasterSecretGenerator$TlsMasterSecretKey", False, "TlsMasterSecretKey", "(byte[],int,int)", "", "Argument[0]", "crypto-parameter", "manual"]
8+
- ["com.sun.crypto.provider", "CipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]
9+
- ["com.sun.crypto.provider", "DESCrypt", False, "expandKey", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
10+
- ["com.sun.crypto.provider", "DESKey", False, "DESKey", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
11+
- ["com.sun.crypto.provider", "DESKey", False, "DESKey", "(byte[],int)", "", "Argument[0]", "credentials-key", "manual"]
12+
- ["com.sun.crypto.provider", "DESKeyGenerator", False, "setParityBit", "(byte[],int)", "", "Argument[0]", "credentials-key", "manual"]
13+
- ["com.sun.crypto.provider", "DESedeKey", False, "DESedeKey", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
14+
- ["com.sun.crypto.provider", "DESedeKey", False, "DESedeKey", "(byte[],int)", "", "Argument[0]", "credentials-key", "manual"]
15+
- ["com.sun.crypto.provider", "DHPrivateKey", False, "DHPrivateKey", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
16+
- ["com.sun.crypto.provider", "DHPublicKey", False, "DHPublicKey", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
2217
- ["com.sun.crypto.provider", "FeedbackCipher", True, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "credentials-key", "manual"]
18+
- ["com.sun.crypto.provider", "GaloisCounterMode", False, "init", "(boolean,String,byte[],byte[],int)", "", "Argument[2]", "credentials-key", "manual"]
19+
- ["com.sun.crypto.provider", "PBECipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]
20+
- ["com.sun.crypto.provider", "PBES1Core", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]
21+
- ["com.sun.crypto.provider", "PKCS12PBECipherCore", False, "implUnwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]
2322
- ["com.sun.crypto.provider", "SymmetricCipher", True, "init", "(boolean,String,byte[])", "", "Argument[2]", "credentials-key", "manual"]
23+
- ["com.sun.crypto.provider", "TlsMasterSecretGenerator$TlsMasterSecretKey", False, "TlsMasterSecretKey", "(byte[],int,int)", "", "Argument[0]", "credentials-key", "manual"]

java/ql/lib/ext/com.trilead.ssh2.model.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ extensions:
55
data:
66
- ["com.trilead.ssh2", "Connection", False, "authenticateWithAgent", "", "", "Argument[0]", "credentials-username", "manual"]
77
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[0]", "credentials-username", "manual"]
8-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[1]", "crypto-parameter", "manual"]
8+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[1]", "credentials-key", "manual"]
99
- ["com.trilead.ssh2", "Connection", False, "authenticateWithDSA", "(String,String,String)", "", "Argument[2]", "credentials-password", "manual"]
1010
- ["com.trilead.ssh2", "Connection", False, "authenticateWithKeyboardInteractive", "", "", "Argument[0]", "credentials-username", "manual"]
1111
- ["com.trilead.ssh2", "Connection", False, "authenticateWithNone", "(String)", "", "Argument[0]", "credentials-username", "manual"]
1212
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPassword", "(String,String)", "", "Argument[0]", "credentials-username", "manual"]
1313
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPassword", "(String,String)", "", "Argument[1]", "credentials-password", "manual"]
1414
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "", "", "Argument[0]", "credentials-username", "manual"]
1515
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,String)", "", "Argument[1]", "credentials-password", "manual"]
16-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[1]", "crypto-parameter", "manual"]
17-
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,File,String)", "", "Argument[1]", "crypto-parameter", "manual"]
16+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[1]", "credentials-key", "manual"]
17+
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,File,String)", "", "Argument[1]", "credentials-key", "manual"]
1818
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,char[],String)", "", "Argument[2]", "credentials-password", "manual"]
1919
- ["com.trilead.ssh2", "Connection", False, "authenticateWithPublicKey", "(String,File,String)", "", "Argument[2]", "credentials-password", "manual"]
2020
- ["com.trilead.ssh2", "Connection", False, "getRemainingAuthMethods", "(String)", "", "Argument[0]", "credentials-username", "manual"]

java/ql/lib/ext/java.security.cert.model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["java.security.cert", "X509CertSelector", False, "setSubjectPublicKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
6+
- ["java.security.cert", "X509CertSelector", False, "setSubjectPublicKey", "", "", "Argument[0]", "credentials-key", "manual"]

java/ql/lib/ext/java.security.model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ extensions:
66
- ["java.security", "KeyStore", False, "getKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
77
- ["java.security", "KeyStore", False, "load", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
88
- ["java.security", "KeyStore", False, "setKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
9+
- ["java.security", "KeyStore", False, "setKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "credentials-key", "manual"]
910
- ["java.security", "KeyStore", False, "store", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
1011
- ["java.security", "KeyStore$PasswordProtection", False, "PasswordProtection", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
1112
- ["java.security", "KeyStore$PasswordProtection", False, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[0]", "credentials-password", "manual"]
12-
- ["java.security", "KeyStore", False, "setKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "crypto-parameter", "manual"]
1313
- ["java.security", "KeyStoreSpi", True, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
1414
- ["java.security", "KeyStoreSpi", True, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
1515
- ["java.security", "KeyStoreSpi", True, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]

java/ql/lib/ext/java.security.spec.model.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["java.security.spec", "EncodedKeySpec", False, "EncodedKeySpec", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
7-
- ["java.security.spec", "PKCS8EncodedKeySpec", False, "PKCS8EncodedKeySpec", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
8-
- ["java.security.spec", "X509EncodedKeySpec", False, "X509EncodedKeySpec", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
6+
- ["java.security.spec", "EncodedKeySpec", False, "EncodedKeySpec", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
7+
- ["java.security.spec", "PKCS8EncodedKeySpec", False, "PKCS8EncodedKeySpec", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]
8+
- ["java.security.spec", "X509EncodedKeySpec", False, "X509EncodedKeySpec", "(byte[])", "", "Argument[0]", "credentials-key", "manual"]

java/ql/lib/ext/javax.crypto.model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ extensions:
55
data:
66
- ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec)", "", "Argument[2]", "encryption-iv", "manual"]
77
- ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "encryption-iv", "manual"]
8-
- ["javax.crypto", "Cipher", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
8+
- ["javax.crypto", "Cipher", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]
99
- ["javax.crypto", "CipherSpi", True, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]

0 commit comments

Comments
 (0)