Skip to content

Commit 1edca19

Browse files
egregius313egregius313
committed
Remove redundant KeyStoreSpi models
`java.security.KeyStoreSpi` is an abstract class. This removes its subclasses' models, and instead uses model-as-data's capability to use subclasses.
1 parent 24c809b commit 1edca19

File tree

5 files changed

+5
-30
lines changed

5 files changed

+5
-30
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["com.sun.crypto.provider", "JceKeyStore", False, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
7-
- ["com.sun.crypto.provider", "JceKeyStore", False, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
8-
- ["com.sun.crypto.provider", "JceKeyStore", False, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
9-
- ["com.sun.crypto.provider", "JceKeyStore", False, "engineStore", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
106
- ["com.sun.crypto.provider", "JceKeyStore", False, "getPreKeyedHash", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
117
- ["com.sun.crypto.provider", "KeyProtector", False, "KeyProtector", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
128
- ["com.sun.crypto.provider", "PBKDF2KeyImpl", False, "deriveKey", "(Mac,byte[],byte[],int,int)", "", "Argument[1]", "credentials-password", "manual"]
@@ -45,7 +41,6 @@ extensions:
4541
- ["com.sun.crypto.provider", "FeedbackCipher", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
4642
- ["com.sun.crypto.provider", "GaloisCounterMode", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
4743
- ["com.sun.crypto.provider", "GaloisCounterMode", False, "init", "(boolean,String,byte[],byte[],int)", "", "Argument[2]", "crypto-parameter", "manual"]
48-
- ["com.sun.crypto.provider", "JceKeyStore", False, "engineSetKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "crypto-parameter", "manual"]
4944
- ["com.sun.crypto.provider", "KeyProtector", False, "recover", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
5045
- ["com.sun.crypto.provider", "OutputFeedback", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
5146
- ["com.sun.crypto.provider", "PBECipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ extensions:
99
- ["java.security", "KeyStore", False, "store", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
1010
- ["java.security", "KeyStore$PasswordProtection", False, "PasswordProtection", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
1111
- ["java.security", "KeyStore$PasswordProtection", False, "PasswordProtection", "(char[],String,AlgorithmParameterSpec)", "", "Argument[0]", "credentials-password", "manual"]
12-
- ["java.security", "KeyStoreSpi", False, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
13-
- ["java.security", "KeyStoreSpi", False, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
14-
- ["java.security", "KeyStoreSpi", False, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
15-
- ["java.security", "KeyStoreSpi", False, "engineStore", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
1612
- ["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"]
13+
- ["java.security", "KeyStoreSpi", True, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
14+
- ["java.security", "KeyStoreSpi", True, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
15+
- ["java.security", "KeyStoreSpi", True, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
16+
- ["java.security", "KeyStoreSpi", True, "engineStore", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
17+
- ["java.security", "KeyStoreSpi", True, "engineSetKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "credentials-key", "manual"]

‎java/ql/lib/ext/sun.security.pkcs11.model.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["sun.security.pkcs11", "P11KeyStore", False, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
7-
- ["sun.security.pkcs11", "P11KeyStore", False, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
8-
- ["sun.security.pkcs11", "P11KeyStore", False, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
9-
- ["sun.security.pkcs11", "P11KeyStore", False, "engineStore", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
106
- ["sun.security.pkcs11", "P11KeyStore$PasswordCallbackHandler", False, "PasswordCallbackHandler", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
117
- ["sun.security.pkcs11", "Secmod$KeyStoreLoadParameter", False, "KeyStoreLoadParameter", "(TrustType,char[])", "", "Argument[1]", "credentials-password", "manual"]
128
- ["sun.security.pkcs11", "ConstructKeys", False, "constructPrivateKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
139
- ["sun.security.pkcs11", "ConstructKeys", False, "constructPublicKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
1410
- ["sun.security.pkcs11", "ConstructKeys", False, "constructSecretKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
1511
- ["sun.security.pkcs11", "P11Cipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
16-
- ["sun.security.pkcs11", "P11KeyStore", False, "engineSetKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "crypto-parameter", "manual"]
1712
- ["sun.security.pkcs11", "P11RSACipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
1813
- ["sun.security.pkcs11", "P11SecretKeyFactory", False, "fixDESParity", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]

‎java/ql/lib/ext/sun.security.pkcs12.model.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,5 @@ extensions:
66
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "calculateMac", "(char[],byte[])", "", "Argument[0]", "credentials-password", "manual"]
77
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "createEncryptedData", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
88
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "encryptContent", "(byte[],char[])", "", "Argument[1]", "credentials-password", "manual"]
9-
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
10-
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
11-
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
12-
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "engineStore", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
139
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "getPBEKey", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
1410
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "loadSafeContents", "(DerInputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
15-
- ["sun.security.pkcs12", "PKCS12KeyStore", False, "engineSetKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "crypto-parameter", "manual"]

‎java/ql/lib/ext/sun.security.provider.model.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,5 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["sun.security.provider", "DomainKeyStore", False, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
7-
- ["sun.security.provider", "DomainKeyStore", False, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
8-
- ["sun.security.provider", "DomainKeyStore", False, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
9-
- ["sun.security.provider", "DomainKeyStore", False, "engineStore", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
10-
- ["sun.security.provider", "JavaKeyStore", False, "engineGetKey", "(String,char[])", "", "Argument[1]", "credentials-password", "manual"]
11-
- ["sun.security.provider", "JavaKeyStore", False, "engineLoad", "(InputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
12-
- ["sun.security.provider", "JavaKeyStore", False, "engineSetKeyEntry", "(String,Key,char[],Certificate[])", "", "Argument[2]", "credentials-password", "manual"]
13-
- ["sun.security.provider", "JavaKeyStore", False, "engineStore", "(OutputStream,char[])", "", "Argument[1]", "credentials-password", "manual"]
146
- ["sun.security.provider", "JavaKeyStore", False, "getPreKeyedHash", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
157
- ["sun.security.provider", "KeyProtector", False, "KeyProtector", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
16-
- ["sun.security.provider", "DomainKeyStore", False, "engineSetKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "crypto-parameter", "manual"]
17-
- ["sun.security.provider", "JavaKeyStore", False, "engineSetKeyEntry", "(String,byte[],Certificate[])", "", "Argument[1]", "crypto-parameter", "manual"]

0 commit comments

Comments
 (0)