From da8a7f36d18263f213cf86f1652ae7aeea29f963 Mon Sep 17 00:00:00 2001 From: "REDMOND\\brodes" Date: Tue, 8 Nov 2022 12:43:22 -0500 Subject: [PATCH] More cleanup --- .../WinCng/WindowsCngPQCVulnerableUsage.qll | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WinCng/WindowsCngPQCVulnerableUsage.qll b/cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WinCng/WindowsCngPQCVulnerableUsage.qll index fbac511039b..412941a48e5 100644 --- a/cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WinCng/WindowsCngPQCVulnerableUsage.qll +++ b/cpp/ql/src/experimental/campaigns/nccoe-pqc-migration/QuantumVulnerableDiscovery/WinCng/WindowsCngPQCVulnerableUsage.qll @@ -1,12 +1,6 @@ import cpp import WindowsCng -predicate keyGenAndImportFunctionName(string name) { name in ["BCryptImportKeyPair", "BCryptGenerateKeyPair"] } - -predicate keyGenAndImportFunction(Function f){ - exists(string name | f.hasGlobalName(name) and keyGenAndImportFunctionName(name)) -} - //TODO: Verify NCrypt calls (parameters) & find all other APIs that should be included (i.e. decrypt, etc.) @@ -46,7 +40,7 @@ predicate stepOpenAlgorithmProvider(DataFlow::Node node1, DataFlow::Node node2) predicate stepImportGenerateKeyPair(DataFlow::Node node1, DataFlow::Node node2) { exists(FunctionCall call | node1.asExpr() = call.getArgument(0) and - keyGenAndImportFunction(call.getTarget()) and + exists(string name | name in ["BCryptImportKeyPair", "BCryptGenerateKeyPair"] and call.getTarget().hasGlobalName(name)) and node2.asDefiningArgument() = call.getArgument(1) ) }