fix: update tcpdump checker (#2972)

ffontaine · web-flow · commit f5a231605b26 · 2023-05-10T11:56:31.000-07:00
Update tcpdump checker to avoid a false positive with shortcut-fe.ko

Signed-off-by: Fabrice Fontaine &lt;fabrice.fontaine@orange.com&gt;
diff --git a/cve_bin_tool/checkers/tcpdump.py b/cve_bin_tool/checkers/tcpdump.py
@@ -21,6 +21,6 @@ class TcpdumpChecker(Checker):
         r"tcpdump-([0-9]+\.[0-9]+\.[0-9]+)",
         r"([0-9]+\.[0-9]+\.[0-9]+)\r?\n[0-9a-f]*lookup_(?:emem|protoid)",
         r"Running\r?\n([0-9]+\.[0-9]+\.[0-9]+)\r?\n0123456789",
-        r"tcpdump[0-9a-zA-Z ,!'%:_=\(\)\\\.\-\r\n]*([0-9]+\.[0-9]+\.[0-9]+)",
+        r"tcpdump[0-9a-zA-Z ,!'%:_=\(\)\\\.\-\r\n]*\r?\n([0-9]+\.[0-9]+\.[0-9]+)",
     ]
     VENDOR_PRODUCT = [("tcpdump", "tcpdump")]
diff --git a/test/test_data/tcpdump.py b/test/test_data/tcpdump.py
@@ -23,6 +23,7 @@
         "version": "4.9.2",
         "version_strings": ["Running\n4.9.2\n0123456789"],
     },
+    {"product": "tcpdump", "version": "4.1.1", "version_strings": ["tcpdump\n4.1.1"]},
 ]
 package_test_data = [
     {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ class TcpdumpChecker(Checker):`
`21`	`21`	`r"tcpdump-([0-9]+\.[0-9]+\.[0-9]+)",`
`22`	`22`	`r"([0-9]+\.[0-9]+\.[0-9]+)\r?\n[0-9a-f]*lookup_(?:emem\|protoid)",`
`23`	`23`	`r"Running\r?\n([0-9]+\.[0-9]+\.[0-9]+)\r?\n0123456789",`
`24`		`- r"tcpdump[0-9a-zA-Z ,!'%:_=\(\)\\\.\-\r\n]*([0-9]+\.[0-9]+\.[0-9]+)",`
	`24`	`+ r"tcpdump[0-9a-zA-Z ,!'%:_=\(\)\\\.\-\r\n]*\r?\n([0-9]+\.[0-9]+\.[0-9]+)",`
`25`	`25`	`]`
`26`	`26`	`VENDOR_PRODUCT = [("tcpdump", "tcpdump")]`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`"version": "4.9.2",`
`24`	`24`	`"version_strings": ["Running\n4.9.2\n0123456789"],`
`25`	`25`	`},`
	`26`	`+ {"product": "tcpdump", "version": "4.1.1", "version_strings": ["tcpdump\n4.1.1"]},`
`26`	`27`	`]`
`27`	`28`	`package_test_data = [`
`28`	`29`	`{`