Apply suggestions from code review ty mathias <3

Co-authored-by: Mathias Vorreiter Pedersen <mathiasvp@github.com>

Author: chanel-y

powershell/ql/lib/semmle/code/powershell/security/cryptography/CryptographyModule.qll

@@ -75,10 +75,7 @@ class HashAlgorithmObjectCreation extends HashAlgorithm, CryptoAlgorithmObjectCr
   string algName;
 
   HashAlgorithmObjectCreation() {
-    (
-      objectName = "system.security.cryptography." + algName or
-      objectName = "system.security.cryptography." + algName + "cryptoserviceprovider"
-    ) and
+    this.getObjectName() = "system.security.cryptography." + algName + ["", "cryptoserviceprovider"] and
     isHashingAlgorithm(algName)
   }
 
@@ -90,10 +87,7 @@ class HashAlgorithmCreateCall extends HashAlgorithm, CryptoAlgorithmCreateCall {
 
   HashAlgorithmCreateCall() {
     isHashingAlgorithm(algName) and
-    (
-      objectName = algName or
-      objectName = "system.security.cryptography." + algName
-    )
+    this.getObjectName() = ["", "system.security.cryptography."] + algName
   }
 
   override string getName() { result = algName }
@@ -103,10 +97,7 @@ class HashAlgorithmCreateFromNameCall extends HashAlgorithm, CryptoAlgorithmCrea
   string algName;
 
   HashAlgorithmCreateFromNameCall() {
-    (
-      objectName = algName or
-      objectName = "system.security.cryptography." + algName
-    ) and
+    this.getObjectName() = ["", "system.security.cryptography."] + algName and
     isHashingAlgorithm(algName)
   }
 
@@ -133,11 +124,7 @@ class SymmetricAlgorithmCreateCall extends SymmetricAlgorithm, CryptoAlgorithmCr
 
   SymmetricAlgorithmCreateCall() {
     isSymmetricAlgorithm(algName) and
-    (
-      objectName = algName or
-      objectName = "system.security.cryptography." + algName or
-      objectName = "system.security.cryptography.symmetricalgorithm." + algName
-    )
+    this.getObjectName() = ["", "system.security.cryptography.", "system.security.cryptography.symmetricalgorithm."] + algName
   }
 
   override string getName() { result = algName }
@@ -147,10 +134,7 @@ class SymmetricAlgorithmCreateArgCall extends SymmetricAlgorithm, CryptoAlgorith
   string algName;
 
   SymmetricAlgorithmCreateArgCall() {
-    algName = this.getObjectName() and
-    isSymmetricAlgorithm(algName)
-    or
-    objectName = "system.security.cryptography." + algName and
+    algName = ["", "system.security.cryptography."] + this.getObjectName() and
     isSymmetricAlgorithm(algName)
   }
 
@@ -163,11 +147,7 @@ class SymmetricAlgorithmCreateFromNameCall extends SymmetricAlgorithm,
   string algName;
 
   SymmetricAlgorithmCreateFromNameCall() {
-    (
-      objectName = algName or
-      objectName = "system.security.cryptography." + algName or
-      objectName = "system.security.cryptography.symmetricalgorithm." + algName
-    ) and
+    this.getObjectName() = ["", "system.security.cryptography.", "system.security.cryptography.symmetricalgorithm."] + algName and
     isSymmetricAlgorithm(algName)
   }
 

powershell/ql/src/queries/security/cwe-327/ApprovedCipherMode.ql

@@ -29,7 +29,7 @@ class AesModeProperty extends MemberExpr {
             .getAnArgument()
             .getValue()
             .stringMatches("System.Security.Cryptography.AesManaged") or
-        aesObjectCreation.(DataFlow::CallNode) =
+        aesObjectCreation =
           API::getTopLevelMember("system")
               .getMember("security")
               .getMember("cryptography")
@@ -46,8 +46,10 @@ class AesModeProperty extends MemberExpr {
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    source instanceof BlockMode and
-    not source.(BlockMode).getBlockModeName() = ["cbc", "cts", "xts"]
+    exists(BlockMode blockMode |
+      source = blockMode and
+      not blockMode.getBlockModeName() = ["cbc", "cts", "xts"]
+    )
   }
 
   predicate isSink(DataFlow::Node sink) {