Moving queries and modifying query to include BCryptEncrypt

Author: bdrodes

cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WinCng.ql renamed to cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WinCng/WinCng.ql

@@ -14,7 +14,7 @@
 import cpp
 import DataFlow::PathGraph
 import WindowsCng
-import WindowsCngPQCVAsymmetricKeyUsage
+import WindowsCngPQCVulnerableUsage
 
 // CNG-specific DataFlow configuration
 class BCryptConfiguration extends TaintTracking::Configuration {

cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WindowsCng.qll renamed to cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WinCng/WindowsCng.qll

@@ -1,11 +1,21 @@
 import cpp
 import WindowsCng
+
+predicate vulnerableCngFunctionName(string name) {
+    name in ["BCryptSignHash", "BCryptEncrypt"]
+}
+
+predicate vulnerableCngFunction(Function f)
+{
+    exists(string name | f.hasGlobalName(name) and vulnerableCngFunctionName(name))
+}
+
 //TODO: Verify NCrypt calls (parameters) & find all other APIs that should be included (i.e. decrypt, etc.)
 predicate isExprKeyHandleForBCryptSignHash(Expr e){
     exists( FunctionCall call |
         e = call.getArgument(0)
-         and
-         call.getTarget().hasGlobalName("BCryptSignHash")
+        and
+        vulnerableCngFunction(call.getTarget())
     )
 }