quanntum-c#: refactor class names

Author: fcasal

csharp/ql/lib/experimental/quantum/dotnet/Cryptography.qll

@@ -1,11 +1,27 @@
 private import csharp
 private import experimental.quantum.Language
 
+class CryptographyType extends Type {
+  CryptographyType() { this.hasFullyQualifiedName("System.Security.Cryptography", _) }
+}
+
+class ECParameters extends CryptographyType {
+  ECParameters() { this.hasName("ECParameters") }
+}
+
+class RSAParameters extends CryptographyType {
+  RSAParameters() { this.hasName("RSAParameters") }
+}
+
+class ECCurve extends CryptographyType {
+  ECCurve() { this.hasName("ECCurve") }
+}
+
 // This class models Create calls for the ECDsa and RSA classes in .NET.
-class CryptographyCreateCall extends MethodCall {
-  CryptographyCreateCall() {
+class SigningCreateCall extends MethodCall {
+  SigningCreateCall() {
     this.getTarget().getName() = "Create" and
-    this.getQualifier().getType().hasFullyQualifiedName("System.Security.Cryptography", _)
+    this.getQualifier().getType() instanceof CryptographyType
   }
 
   Expr getAlgorithmArg() {
@@ -25,37 +41,10 @@ class CryptographyCreateCall extends MethodCall {
   }
 }
 
-class ECDsaCreateCall extends CryptographyCreateCall {
+class ECDsaCreateCall extends SigningCreateCall {
   ECDsaCreateCall() { this.getQualifier().getType().hasName("ECDsa") }
 }
 
-// TODO
-// class HashAlgorithmCreateCall extends CryptographyCreateCall {
-//   ValueOrRefType type;
-
-//   HashAlgorithmCreateCall() { type = this.getQualifier().getType().getDeclaringType() }
-// }
-
-class RSACreateCall extends CryptographyCreateCall {
-  RSACreateCall() { this.getQualifier().getType().hasName("RSA") }
-}
-
-class CryptographyType extends Type {
-  CryptographyType() { this.hasFullyQualifiedName("System.Security.Cryptography", _) }
-}
-
-class ECParameters extends CryptographyType {
-  ECParameters() { this.hasName("ECParameters") }
-}
-
-class RSAParameters extends CryptographyType {
-  RSAParameters() { this.hasName("RSAParameters") }
-}
-
-class ECCurve extends CryptographyType {
-  ECCurve() { this.hasName("ECCurve") }
-}
-
 // This class is used to model the `ECDsa.Create(ECParameters)` call
 class ECDsaCreateCallWithParameters extends ECDsaCreateCall {
   ECDsaCreateCallWithParameters() { this.getArgument(0).getType() instanceof ECParameters }
@@ -65,6 +54,28 @@ class ECDsaCreateCallWithECCurve extends ECDsaCreateCall {
   ECDsaCreateCallWithECCurve() { this.getArgument(0).getType() instanceof ECCurve }
 }
 
+class RSACreateCall extends SigningCreateCall {
+  RSACreateCall() { this.getQualifier().getType().hasName("RSA") }
+}
+
+class HashAlgorithmCreateCall extends SigningCreateCall {
+  HashAlgorithmCreateCall() {
+    this.getQualifier()
+        .getType()
+        .hasName([
+            "MD5",
+            "RIPEMD160",
+            "SHA1",
+            "SHA256",
+            "SHA384",
+            "SHA512",
+            "SHA3_256",
+            "SHA3_384",
+            "SHA3_512"
+          ])
+  }
+}
+
 class SigningNamedCurvePropertyAccess extends PropertyAccess {
   string curveName;
 
@@ -163,8 +174,8 @@ class ReadOnlyByteSpanType extends Type {
   ReadOnlyByteSpanType() { this.getName() = "ReadOnlySpan<Byte>" }
 }
 
-class DotNetSigner extends MethodCall {
-  DotNetSigner() { this.getTarget().getName().matches(["Verify%", "Sign%"]) }
+class SignerUse extends MethodCall {
+  SignerUse() { this.getTarget().getName().matches(["Verify%", "Sign%"]) }
 
   Expr getMessageArg() {
     // Both Sign and Verify methods take the message as the first argument.
@@ -200,10 +211,10 @@ class DotNetSigner extends MethodCall {
   predicate isVerifier() { this.getTarget().getName().matches("Verify%") }
 }
 
-private class ECDsaSigner extends DotNetSigner {
+private class ECDsaSigner extends SignerUse {
   ECDsaSigner() { this.getQualifier().getType() instanceof ECDsaClass }
 }
 
-private class RSASigner extends DotNetSigner {
+private class RSASigner extends SignerUse {
   RSASigner() { this.getQualifier().getType() instanceof RSAClass }
 }

csharp/ql/lib/experimental/quantum/dotnet/FlowAnalysis.qll

@@ -32,7 +32,7 @@ signature class UseCallSig instanceof QualifiableExpr {
   predicate isIntermediate();
 }
 
-module CryptographyCreateToUseFlow = CreationToUseFlow<CryptographyCreateCall, DotNetSigner>;
+module SigningCreateToUseFlow = CreationToUseFlow<SigningCreateCall, SignerUse>;
 
 module CreationToUseFlow<CreationCallSig Creation, UseCallSig Use> {
   private module CreationToUseConfig implements DataFlow::ConfigSig {

csharp/ql/lib/experimental/quantum/dotnet/OperationInstances.qll

@@ -4,12 +4,12 @@ private import DataFlow
 private import FlowAnalysis
 private import Cryptography
 
-class ECDsaORRSASigningOperationInstance extends Crypto::SignatureOperationInstance instanceof DotNetSigner
+class ECDsaORRSASigningOperationInstance extends Crypto::SignatureOperationInstance instanceof SignerUse
 {
-  CryptographyCreateCall creator;
+  SigningCreateCall creator;
 
   ECDsaORRSASigningOperationInstance() {
-    creator = CryptographyCreateToUseFlow::getCreationFromUse(this, _, _)
+    creator = SigningCreateToUseFlow::getCreationFromUse(this, _, _)
   }
 
   override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {