C#: Collapse Sink classes.

michaelnebel · michaelnebel · commit 1d405dba1470 · 2022-07-18T14:28:49.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/security/cryptography/HardcodedSymmetricEncryptionKey.qll b/csharp/ql/lib/semmle/code/csharp/security/cryptography/HardcodedSymmetricEncryptionKey.qll
@@ -58,15 +58,15 @@ module HardcodedSymmetricEncryptionKey {
   }
 
   private class SymmetricAlgorithmCreateEncryptorSink extends Sink {
-    SymmetricAlgorithmCreateEncryptorSink() { sinkNode(this, "encryption-encryptor") }
+    private string kind;
 
-    override string getDescription() { result = "Encryptor(rgbKey, IV)" }
-  }
-
-  private class SymmetricAlgorithmCreateDecryptorSink extends Sink {
-    SymmetricAlgorithmCreateDecryptorSink() { sinkNode(this, "encryption-decryptor") }
+    SymmetricAlgorithmCreateEncryptorSink() { sinkNode(this, kind) and kind.matches("encryption%") }
 
-    override string getDescription() { result = "Decryptor(rgbKey, IV)" }
+    override string getDescription() {
+      kind = "encryption-encryptor" and result = "Encryptor(rgbKey, IV)"
+      or
+      kind = "encryption-decryptor" and result = "Decryptor(rgbKey, IV)"
+    }
   }
 
   private class CreateSymmetricKeySink extends Sink {
