Swift: Further simplify.

Author: geoffw0

swift/ql/src/queries/Security/CWE-1204/StaticInitializationVector.ql

@@ -39,7 +39,7 @@ class EncryptionInitializationSink extends Expr {
               "AES", "ChaCha20", "Blowfish", "Rabbit", "CBC", "CFB", "GCM", "OCB", "OFB", "PCBC",
               "CCM", "CTR"
             ], fName) and
-      fName.matches("%init(%iv:%") and
+      fName.matches("%init(%") and
       call.getArgumentWithLabel("iv").getExpr() = this
     )
   }

swift/ql/src/queries/Security/CWE-259/ConstantPassword.ql

@@ -35,7 +35,7 @@ class ConstantPasswordSink extends Expr {
     exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getFullName() = ["HKDF", "PBKDF1", "PBKDF2", "Scrypt"] and
       c.getAMember() = f and
-      f.getName().matches("%init(%password:%") and
+      f.getName().matches("%init(%") and
       call.getStaticTarget() = f and
       call.getArgumentWithLabel("password").getExpr() = this
     )

swift/ql/src/queries/Security/CWE-760/ConstantSalt.ql

@@ -35,7 +35,7 @@ class ConstantSaltSink extends Expr {
     exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getFullName() = ["HKDF", "PBKDF1", "PBKDF2", "Scrypt"] and
       c.getAMember() = f and
-      f.getName().matches("%init(%salt:%") and
+      f.getName().matches("%init(%") and
       call.getStaticTarget() = f and
       call.getArgumentWithLabel("salt").getExpr() = this
     )

swift/ql/src/queries/Security/CWE-916/InsufficientHashIterations.ql

@@ -36,7 +36,7 @@ class InsufficientHashIterationsSink extends Expr {
     exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getFullName() = ["PBKDF1", "PBKDF2"] and
       c.getAMember() = f and
-      f.getName().matches("init(%iterations:%") and
+      f.getName().matches("init(%") and
       call.getStaticTarget() = f and
       call.getArgumentWithLabel("iterations").getExpr() = this
     )