Skip to content

Commit 96d6ecb

Browse files
committed
Fix crypto parameters
1 parent 35e19ea commit 96d6ecb

17 files changed

Lines changed: 212 additions & 212 deletions

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

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

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[])", "crypto-parameter", "Argument[0]", "manual"]
6+
- ["java.security.cert", "X509CertSelector", False, "setSubjectPublicKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["java.security", "KeyStore", False, "setKeyEntry", "(String, byte[], Certificate[])", "crypto-parameter", "Argument[1]", "manual"]
7-
- ["java.security", "KeyStoreSpi", False, "engineSetKeyEntry", "(String, byte[], Certificate[])", "crypto-parameter", "Argument[1]", "manual"]
86
- ["java.security", "KeyStore", False, "getKey", "(String, char[])", "", "Argument[1]", "credential-password", "manual"]
97
- ["java.security", "KeyStore", False, "load", "(InputStream, char[])", "", "Argument[1]", "credential-password", "manual"]
108
- ["java.security", "KeyStore", False, "setKeyEntry", "(String, Key, char[], Certificate[])", "", "Argument[2]", "credential-password", "manual"]
@@ -15,3 +13,5 @@ extensions:
1513
- ["java.security", "KeyStoreSpi", False, "engineLoad", "(InputStream, char[])", "", "Argument[1]", "credential-password", "manual"]
1614
- ["java.security", "KeyStoreSpi", False, "engineSetKeyEntry", "(String, Key, char[], Certificate[])", "", "Argument[2]", "credential-password", "manual"]
1715
- ["java.security", "KeyStoreSpi", False, "engineStore", "(OutputStream, char[])", "", "Argument[1]", "credential-password", "manual"]
16+
- ["java.security", "KeyStore", False, "setKeyEntry", "(String, byte[], Certificate[])", "", "Argument[1]", "crypto-parameter", "manual"]
17+
- ["java.security", "KeyStoreSpi", False, "engineSetKeyEntry", "(String, byte[], Certificate[])", "", "Argument[1]", "crypto-parameter", "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[])", "crypto-parameter", "Argument[0]", "manual"]
7-
- ["java.security.spec", "PKCS8EncodedKeySpec", False, "PKCS8EncodedKeySpec", "(byte[])", "crypto-parameter", "Argument[0]", "manual"]
8-
- ["java.security.spec", "X509EncodedKeySpec", False, "X509EncodedKeySpec", "(byte[])", "crypto-parameter", "Argument[0]", "manual"]
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"]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ 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)", "crypto-parameter", "Argument[0]", "manual"]
9-
- ["javax.crypto", "CipherSpi", False, "engineUnwrap", "(byte[], String, int)", "crypto-parameter", "Argument[0]", "manual"]
10-
- ["javax.crypto", "EncryptedPrivateKeyInfo", False, "checkPKCS8Encoding", "(byte[])", "crypto-parameter", "Argument[0]", "manual"]
8+
- ["javax.crypto", "Cipher", False, "unwrap", "(byte[], String, int)", "", "Argument[0]", "crypto-parameter", "manual"]
9+
- ["javax.crypto", "CipherSpi", False, "engineUnwrap", "(byte[], String, int)", "", "Argument[0]", "crypto-parameter", "manual"]
10+
- ["javax.crypto", "EncryptedPrivateKeyInfo", False, "checkPKCS8Encoding", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ extensions:
1111
pack: codeql/java-all
1212
extensible: sinkModel
1313
data:
14-
- ["javax.crypto.spec", "DESKeySpec", False, "DESKeySpec", "(byte[])", "crypto-parameter", "Argument[0]", "manual"]
15-
- ["javax.crypto.spec", "DESKeySpec", False, "DESKeySpec", "(byte[], int)", "crypto-parameter", "Argument[0]", "manual"]
16-
- ["javax.crypto.spec", "DESKeySpec", False, "isParityAdjusted", "(byte[], int)", "crypto-parameter", "Argument[0]", "manual"]
17-
- ["javax.crypto.spec", "DESKeySpec", False, "isWeak", "(byte[], int)", "crypto-parameter", "Argument[0]", "manual"]
18-
- ["javax.crypto.spec", "DESedeKeySpec", False, "DESedeKeySpec", "(byte[])", "crypto-parameter", "Argument[0]", "manual"]
19-
- ["javax.crypto.spec", "DESedeKeySpec", False, "DESedeKeySpec", "(byte[], int)", "crypto-parameter", "Argument[0]", "manual"]
20-
- ["javax.crypto.spec", "DESedeKeySpec", False, "isParityAdjusted", "(byte[], int)", "crypto-parameter", "Argument[0]", "manual"]
21-
- ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[], String)", "crypto-parameter", "Argument[0]", "manual"]
22-
- ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[], int, int, String)", "crypto-parameter", "Argument[0]", "manual"]
2314
- ["javax.crypto.spec", "IvParameterSpec", False, "IvParameterSpec", "(byte[])", "credential-other", "Argument[0]", "manual"]
2415
- ["javax.crypto.spec", "IvParameterSpec", False, "IvParameterSpec", "(byte[], int, int)", "credential-other", "Argument[0]", "manual"]
2516
- ["javax.crypto.spec", "PBEKeySpec", False, "PBEKeySpec", "(char[])", "", "Argument[0]", "credential-password", "manual"]
2617
- ["javax.crypto.spec", "PBEKeySpec", False, "PBEKeySpec", "(char[], byte[], int)", "", "Argument[0]", "credential-password", "manual"]
2718
- ["javax.crypto.spec", "PBEKeySpec", False, "PBEKeySpec", "(char[], byte[], int, int)", "", "Argument[0]", "credential-password", "manual"]
19+
- ["javax.crypto.spec", "DESKeySpec", False, "DESKeySpec", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
20+
- ["javax.crypto.spec", "DESKeySpec", False, "DESKeySpec", "(byte[], int)", "", "Argument[0]", "crypto-parameter", "manual"]
21+
- ["javax.crypto.spec", "DESKeySpec", False, "isParityAdjusted", "(byte[], int)", "", "Argument[0]", "crypto-parameter", "manual"]
22+
- ["javax.crypto.spec", "DESKeySpec", False, "isWeak", "(byte[], int)", "", "Argument[0]", "crypto-parameter", "manual"]
23+
- ["javax.crypto.spec", "DESedeKeySpec", False, "DESedeKeySpec", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
24+
- ["javax.crypto.spec", "DESedeKeySpec", False, "DESedeKeySpec", "(byte[], int)", "", "Argument[0]", "crypto-parameter", "manual"]
25+
- ["javax.crypto.spec", "DESedeKeySpec", False, "isParityAdjusted", "(byte[], int)", "", "Argument[0]", "crypto-parameter", "manual"]
26+
- ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[], String)", "", "Argument[0]", "crypto-parameter", "manual"]
27+
- ["javax.crypto.spec", "SecretKeySpec", False, "SecretKeySpec", "(byte[], int, int, String)", "", "Argument[0]", "crypto-parameter", "manual"]

java/ql/lib/ext/javax.security.auth.kerberos.model.yml

Lines changed: 4 additions & 4 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-
- ["javax.security.auth.kerberos", "KerberosKey", False, "KerberosKey", "(KerberosPrincipal, byte[], int, int)", "crypto-parameter", "Argument[1]", "manual"]
7-
- ["javax.security.auth.kerberos", "KerberosTicket", False, "KerberosTicket", "(byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "crypto-parameter", "Argument[3]", "manual"]
8-
- ["javax.security.auth.kerberos", "KerberosTicket", False, "init", "(byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "crypto-parameter", "Argument[3]", "manual"]
9-
- ["javax.security.auth.kerberos", "KeyImpl", False, "KeyImpl", "(byte[], int)", "crypto-parameter", "Argument[0]", "manual"]
106
- ["javax.security.auth.kerberos", "KerberosKey", False, "KerberosKey", "(KerberosPrincipal, char[], String)", "", "Argument[1]", "credential-password", "manual"]
117
- ["javax.security.auth.kerberos", "KeyImpl", False, "KeyImpl", "(KerberosPrincipal, char[], String)", "", "Argument[1]", "credential-password", "manual"]
8+
- ["javax.security.auth.kerberos", "KerberosKey", False, "KerberosKey", "(KerberosPrincipal, byte[], int, int)", "", "Argument[1]", "crypto-parameter", "manual"]
9+
- ["javax.security.auth.kerberos", "KerberosTicket", False, "KerberosTicket", "(byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "", "Argument[3]", "crypto-parameter", "manual"]
10+
- ["javax.security.auth.kerberos", "KerberosTicket", False, "init", "(byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "", "Argument[3]", "crypto-parameter", "manual"]
11+
- ["javax.security.auth.kerberos", "KeyImpl", False, "KeyImpl", "(byte[], int)", "", "Argument[0]", "crypto-parameter", "manual"]

java/ql/lib/ext/sun.security.jgss.krb5.model.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["sun.security.jgss.krb5", "CipherHelper", False, "desCbcDecrypt", "(WrapToken, byte[], InputStream, int, byte[], int)", "crypto-parameter", "Argument[1]", "manual"]
7-
- ["sun.security.jgss.krb5", "CipherHelper", False, "desCbcDecrypt", "(WrapToken, byte[], byte[], int, int, byte[], int)", "crypto-parameter", "Argument[1]", "manual"]
8-
- ["sun.security.jgss.krb5", "CipherHelper", False, "getDesCbcChecksum", "(byte[], byte[], byte[], int, int)", "crypto-parameter", "Argument[0]", "manual"]
9-
- ["sun.security.jgss.krb5", "CipherHelper", False, "getDesEncryptionKey", "(byte[])", "crypto-parameter", "Argument[0]", "manual"]
10-
- ["sun.security.jgss.krb5", "CipherHelper", False, "getInitializedDes", "(boolean, byte[], byte[])", "crypto-parameter", "Argument[1]", "manual"]
11-
- ["sun.security.jgss.krb5", "Krb5InitCredential", False, "Krb5InitCredential", "(Krb5NameElement, Credentials, byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "crypto-parameter", "Argument[5]", "manual"]
12-
- ["sun.security.jgss.krb5", "Krb5InitCredential", False, "Krb5InitCredential", "(Krb5NameElement, byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "crypto-parameter", "Argument[4]", "manual"]
6+
- ["sun.security.jgss.krb5", "CipherHelper", False, "desCbcDecrypt", "(WrapToken, byte[], InputStream, int, byte[], int)", "", "Argument[1]", "crypto-parameter", "manual"]
7+
- ["sun.security.jgss.krb5", "CipherHelper", False, "desCbcDecrypt", "(WrapToken, byte[], byte[], int, int, byte[], int)", "", "Argument[1]", "crypto-parameter", "manual"]
8+
- ["sun.security.jgss.krb5", "CipherHelper", False, "getDesCbcChecksum", "(byte[], byte[], byte[], int, int)", "", "Argument[0]", "crypto-parameter", "manual"]
9+
- ["sun.security.jgss.krb5", "CipherHelper", False, "getDesEncryptionKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
10+
- ["sun.security.jgss.krb5", "CipherHelper", False, "getInitializedDes", "(boolean, byte[], byte[])", "", "Argument[1]", "crypto-parameter", "manual"]
11+
- ["sun.security.jgss.krb5", "Krb5InitCredential", False, "Krb5InitCredential", "(Krb5NameElement, Credentials, byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "", "Argument[5]", "crypto-parameter", "manual"]
12+
- ["sun.security.jgss.krb5", "Krb5InitCredential", False, "Krb5InitCredential", "(Krb5NameElement, byte[], KerberosPrincipal, KerberosPrincipal, byte[], int, boolean[], Date, Date, Date, Date, InetAddress[])", "", "Argument[4]", "crypto-parameter", "manual"]

0 commit comments

Comments
 (0)