quantum-c#: add HashAlgorithms

github · fegge · Jun 16, 2025 · Jun 16, 2025 · Jun 19, 2025 · Jun 19, 2025
commit 9970e586b247b477df24e6fdc04a903bc0ff5edd
@@ -60,6 +60,21 @@ class SigningNamedCurvePropertyAccess extends PropertyAccess {
   string getCurveName() { result = curveName }
 }
 
+class HashAlgorithmNameType extends CryptographyType {
+  HashAlgorithmNameType() { this.hasName("HashAlgorithmName") }
+}
+
+class HashAlgorithmName extends PropertyAccess {
+  string algorithmName;
+
+  HashAlgorithmName() {
+    this.getType() instanceof HashAlgorithmNameType and
+    this.getProperty().getName() = algorithmName
+  }
+
+  string getAlgorithmName() { result = algorithmName }
+}
+
 /**
  * Private predicate mapping NIST names to SEC names and leaving all others the same.
  */
@@ -76,12 +91,12 @@ private predicate eccurveNameMapping(string nist, string secp) {
 }
 
 // OPERATION INSTANCES
-private class ECDsaClass extends Type {
-  ECDsaClass() { this.hasFullyQualifiedName("System.Security.Cryptography", "ECDsa") }
+private class ECDsaClass extends CryptographyType {
+  ECDsaClass() { this.hasName("ECDsa") }
 }
 
-private class RSAClass extends Type {
-  RSAClass() { this.hasFullyQualifiedName("System.Security.Cryptography", "RSA") }
+private class RSAClass extends CryptographyType {
+  RSAClass() { this.hasName("RSA") }
 }
 
 class ByteArrayType extends Type {
@@ -92,7 +107,7 @@ class ReadOnlyByteSpanType extends Type {
   ReadOnlyByteSpanType() { this.getName() = "ReadOnlySpan<Byte>" }
 }
 
-abstract class DotNetSigner extends MethodCall {
+class DotNetSigner extends MethodCall {
   DotNetSigner() { this.getTarget().getName().matches(["Verify%", "Sign%"]) }
 
   Expr getMessageArg() {
@@ -117,6 +132,11 @@ abstract class DotNetSigner extends MethodCall {
     result = this
   }
 
+  Expr getHashAlgorithmArg() {
+    // Get the hash algorithm argument if it has the correct type.
+    result = this.getAnArgument() and result.getType() instanceof HashAlgorithmNameType
+  }
+
   predicate isSigner() { this.getTarget().getName().matches("Sign%") }
 
   predicate isVerifier() { this.getTarget().getName().matches("Verify%") }

@@ -9,13 +9,14 @@ class ECDsaORRSASigningOperationInstance extends Crypto::SignatureOperationInsta
   CryptographyCreateCall creator;
 
   ECDsaORRSASigningOperationInstance() {
-    this instanceof DotNetSigner and
     CryptographyCreateToUseFlow::flow(DataFlow::exprNode(creator), DataFlow::exprNode(this))
   }
 
-  // TODO FIXME
   override Crypto::AlgorithmValueConsumer getAnAlgorithmValueConsumer() {
     result = creator.getAlgorithmArg()
+    or
+    // FIXME: currently not working
+    result = super.getHashAlgorithmArg()
   }
 
   override Crypto::KeyOperationSubtype getKeyOperationSubtype() {