Change summary models to neutral models for javax.crypto.Cipher

Author: owen-mc

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

@@ -7,43 +7,11 @@ extensions:
       - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "encryption-iv", "manual"]
       - ["javax.crypto", "Cipher", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "hq-generated"]
       - ["javax.crypto", "CipherSpi", True, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "hq-generated"]
-  - addsTo:
-      pack: codeql/java-all
-      extensible: summaryModel
-    data:
-      - ["javax.crypto", "Cipher", True, "doFinal", "()", "", "Argument[this].SyntheticField[cipher.Encrypted]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(ByteBuffer,ByteBuffer)", "", "Argument[this].SyntheticField[cipher.Encrypted]", "Argument[1]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[])", "", "Argument[this].SyntheticField[cipher.Encrypted]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int)", "", "Argument[this].SyntheticField[cipher.Encrypted]", "Argument[0]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int)", "", "Argument[this].SyntheticField[cipher.Encrypted]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[])", "", "Argument[this].SyntheticField[cipher.Encrypted]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "doFinal", "(byte[],int,int,byte[],int)", "", "Argument[this].SyntheticField[cipher.Encrypted]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "unwrap", "(byte[],String,int)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[0]", "Argument[this].SyntheticField[cipher.Encrypted]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(ByteBuffer,ByteBuffer)", "", "Argument[this].SyntheticField[cipher.Encrypted]", "Argument[1]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[])", "", "Argument[0]", "Argument[this].SyntheticField[cipher.Encrypted]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[])", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[])", "", "Argument[this].SyntheticField[cipher.Encrypted]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int)", "", "Argument[0]", "Argument[this].SyntheticField[cipher.Encrypted]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int)", "", "Argument[this].SyntheticField[cipher.Encrypted]", "ReturnValue", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[this].SyntheticField[cipher.Encrypted]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[])", "", "Argument[0]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[])", "", "Argument[this].SyntheticField[cipher.Encrypted]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[this].SyntheticField[cipher.Encrypted]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[],int)", "", "Argument[0]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "update", "(byte[],int,int,byte[],int)", "", "Argument[this].SyntheticField[cipher.Encrypted]", "Argument[3]", "taint", "manual"]
-      - ["javax.crypto", "Cipher", True, "wrap", "(Key)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: neutralModel
     data:
+      - ["javax.crypto", "Cipher", "doFinal", "", "summary", "manual"]
       - ["javax.crypto", "Cipher", "getAlgorithm", "", "summary", "manual"]
       - ["javax.crypto", "Cipher", "getExemptionMechanism", "", "summary", "manual"]
       - ["javax.crypto", "Cipher", "getInstance", "", "summary", "manual"]
@@ -52,4 +20,7 @@ extensions:
       - ["javax.crypto", "Cipher", "getProvider", "", "summary", "manual"]
       - ["javax.crypto", "Cipher", "init", "", "summary", "manual"]
       - ["javax.crypto", "Cipher", "toString", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "unwrap", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "update", "", "summary", "manual"]
       - ["javax.crypto", "Cipher", "updateAAD", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "wrap", "", "summary", "manual"]