MsgNotHashedBeforeSigVerfication fixed

trailofbits · Jul 5, 2024 · 3ec87ae · 3ec87ae
1 parent f866d55
commit 3ec87ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/go/src/crypto/MsgNotHashedBeforeSigVerfication/MsgNotHashedBeforeSigVerfication.ql b/go/src/crypto/MsgNotHashedBeforeSigVerfication/MsgNotHashedBeforeSigVerfication.ql
@@ -92,7 +92,7 @@ private module LongestFlowConfig implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source = source }
     predicate isSink(DataFlow::Node sink) { sink = sink }
 }
-module LongestFlowFlow = TaintTracking::Global<LongestFlowConfig>;
+module LongestFlowFlow = DataFlow::Global<LongestFlowConfig>;
 
 /**
  *  Flows from anything to SignatureMsgTruncationFunction
@@ -138,13 +138,15 @@ module AnythingToSignatureMsgTrunFuncConfig implements DataFlow::ConfigSig {
         node.asExpr().getType().getUnderlyingType().(ArrayType).getLength() <= 66
     }
 }
-module AnythingToSignatureMsgTrunFuncFlow = TaintTracking::Global<AnythingToSignatureMsgTrunFuncConfig>;
+module AnythingToSignatureMsgTrunFuncFlow = DataFlow::Global<AnythingToSignatureMsgTrunFuncConfig>;
+import AnythingToSignatureMsgTrunFuncFlow::PathGraph
 
 from AnythingToSignatureMsgTrunFuncFlow::PathNode source, AnythingToSignatureMsgTrunFuncFlow::PathNode sink
 where
     AnythingToSignatureMsgTrunFuncFlow::flowPath(source, sink)
 
     // only the longest flow
+    // TODO: find only flows originating from user input
     and not exists(DataFlow::Node source2 |
         LongestFlowFlow::flow(source2, source.getNode())
         and source2 != source.getNode()

diff --git a/...y-tests/crypto/MsgNotHashedBeforeSigVerfication/MsgNotHashedBeforeSigVerfication.expected b/...y-tests/crypto/MsgNotHashedBeforeSigVerfication/MsgNotHashedBeforeSigVerfication.expected
@@ -1,6 +1,6 @@
 edges
-| MsgNotHashedBeforeSigVerfication.go:78:33:78:46 | "test message" | MsgNotHashedBeforeSigVerfication.go:78:26:78:47 | type conversion |
-| MsgNotHashedBeforeSigVerfication.go:86:31:86:44 | "test message" | MsgNotHashedBeforeSigVerfication.go:86:24:86:45 | type conversion |
+| MsgNotHashedBeforeSigVerfication.go:78:33:78:46 | "test message" | MsgNotHashedBeforeSigVerfication.go:78:26:78:47 | type conversion | provenance |  |
+| MsgNotHashedBeforeSigVerfication.go:86:31:86:44 | "test message" | MsgNotHashedBeforeSigVerfication.go:86:24:86:45 | type conversion | provenance |  |
 nodes
 | MsgNotHashedBeforeSigVerfication.go:78:26:78:47 | type conversion | semmle.label | type conversion |
 | MsgNotHashedBeforeSigVerfication.go:78:33:78:46 | "test message" | semmle.label | "test message" |