Skip to content

Commit a8eb95a

Browse files
egregius313egregius313
committed
Remove redundant engineUnwrap method models
Most implementations of `engineUnwrap` are overriding the method from `javax.crypto.CipherSpi`. Therefore, these models can be compressed into a single model.
1 parent 64d23d4 commit a8eb95a

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,26 @@ extensions:
77
- ["com.sun.crypto.provider", "KeyProtector", False, "KeyProtector", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
88
- ["com.sun.crypto.provider", "PBKDF2KeyImpl", False, "deriveKey", "(Mac,byte[],byte[],int,int)", "", "Argument[1]", "credentials-password", "manual"]
99
- ["com.sun.crypto.provider", "PBKDF2KeyImpl", False, "getPasswordBytes", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
10-
- ["com.sun.crypto.provider", "AESCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
1110
- ["com.sun.crypto.provider", "AESCrypt", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
12-
- ["com.sun.crypto.provider", "AESWrapCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
13-
- ["com.sun.crypto.provider", "ARCFOURCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
1411
- ["com.sun.crypto.provider", "ARCFOURCipher", False, "init", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
15-
- ["com.sun.crypto.provider", "BlowfishCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
1612
- ["com.sun.crypto.provider", "BlowfishCrypt", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
1713
- ["com.sun.crypto.provider", "CipherBlockChaining", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
1814
- ["com.sun.crypto.provider", "CipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
1915
- ["com.sun.crypto.provider", "CipherFeedback", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
2016
- ["com.sun.crypto.provider", "CipherWithWrappingSpi", False, "constructPrivateKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
2117
- ["com.sun.crypto.provider", "CipherWithWrappingSpi", False, "constructPublicKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
2218
- ["com.sun.crypto.provider", "CipherWithWrappingSpi", False, "constructSecretKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
23-
- ["com.sun.crypto.provider", "CipherWithWrappingSpi", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
2419
- ["com.sun.crypto.provider", "ConstructKeys", False, "constructPrivateKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
2520
- ["com.sun.crypto.provider", "ConstructKeys", False, "constructPublicKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
2621
- ["com.sun.crypto.provider", "ConstructKeys", False, "constructSecretKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
2722
- ["com.sun.crypto.provider", "CounterMode", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
28-
- ["com.sun.crypto.provider", "DESCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
2923
- ["com.sun.crypto.provider", "DESCrypt", False, "expandKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
3024
- ["com.sun.crypto.provider", "DESCrypt", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
3125
- ["com.sun.crypto.provider", "DESKey", False, "DESKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
3226
- ["com.sun.crypto.provider", "DESKey", False, "DESKey", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]
3327
- ["com.sun.crypto.provider", "DESKeyGenerator", False, "setParityBit", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]
34-
- ["com.sun.crypto.provider", "DESedeCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
3528
- ["com.sun.crypto.provider", "DESedeKey", False, "DESedeKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
3629
- ["com.sun.crypto.provider", "DESedeKey", False, "DESedeKey", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]
37-
- ["com.sun.crypto.provider", "DESedeWrapCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
3830
- ["com.sun.crypto.provider", "DHPrivateKey", False, "DHPrivateKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
3931
- ["com.sun.crypto.provider", "DHPublicKey", False, "DHPublicKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
4032
- ["com.sun.crypto.provider", "ElectronicCodeBook", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
@@ -45,18 +37,8 @@ extensions:
4537
- ["com.sun.crypto.provider", "OutputFeedback", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
4638
- ["com.sun.crypto.provider", "PBECipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
4739
- ["com.sun.crypto.provider", "PBES1Core", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
48-
- ["com.sun.crypto.provider", "PBES2Core", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
49-
- ["com.sun.crypto.provider", "PBEWithMD5AndDESCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
50-
- ["com.sun.crypto.provider", "PBEWithMD5AndTripleDESCipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
5140
- ["com.sun.crypto.provider", "PCBC", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
5241
- ["com.sun.crypto.provider", "PKCS12PBECipherCore", False, "implUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
53-
- ["com.sun.crypto.provider", "PKCS12PBECipherCore$PBEWithSHA1AndDESede", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
54-
- ["com.sun.crypto.provider", "PKCS12PBECipherCore$PBEWithSHA1AndRC2_128", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
55-
- ["com.sun.crypto.provider", "PKCS12PBECipherCore$PBEWithSHA1AndRC2_40", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
56-
- ["com.sun.crypto.provider", "PKCS12PBECipherCore$PBEWithSHA1AndRC4_128", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
57-
- ["com.sun.crypto.provider", "PKCS12PBECipherCore$PBEWithSHA1AndRC4_40", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
58-
- ["com.sun.crypto.provider", "RC2Cipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
5942
- ["com.sun.crypto.provider", "RC2Crypt", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
60-
- ["com.sun.crypto.provider", "RSACipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
6143
- ["com.sun.crypto.provider", "SymmetricCipher", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
6244
- ["com.sun.crypto.provider", "TlsMasterSecretGenerator$TlsMasterSecretKey", False, "TlsMasterSecretKey", "(byte[],int,int)", "", "Argument[0]", "crypto-parameter", "manual"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ extensions:
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"]
88
- ["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"]
109
- ["javax.crypto", "EncryptedPrivateKeyInfo", False, "checkPKCS8Encoding", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
10+
- ["javax.crypto", "CipherSpi", True, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ extensions:
88
- ["sun.security.pkcs11", "ConstructKeys", False, "constructPrivateKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
99
- ["sun.security.pkcs11", "ConstructKeys", False, "constructPublicKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
1010
- ["sun.security.pkcs11", "ConstructKeys", False, "constructSecretKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
11-
- ["sun.security.pkcs11", "P11Cipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
12-
- ["sun.security.pkcs11", "P11RSACipher", False, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
1311
- ["sun.security.pkcs11", "P11SecretKeyFactory", False, "fixDESParity", "(byte[],int)", "", "Argument[0]", "crypto-parameter", "manual"]

0 commit comments

Comments
 (0)