fix: improve cryptsetup checker

Update cryptsetup pattern to detect version in libcryptsetup Signed-off-by: Fabrice Fontaine <[email protected]>
ffontaine · Apr 25, 2024 · ee2b409 · ee2b409
1 parent f58f6ed
commit ee2b409
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/cve_bin_tool/checkers/cryptsetup.py b/cve_bin_tool/checkers/cryptsetup.py
@@ -17,5 +17,9 @@ class CryptsetupChecker(Checker):
         r"Only LUKS2 format is currently supported. Please use cryptsetup-reencrypt tool for LUKS1.",
     ]
     FILENAME_PATTERNS = [r"cryptsetup"]
-    VERSION_PATTERNS = [r"cryptsetup ([0-9]+\.[0-9]+\.[0-9]+)"]
+    VERSION_PATTERNS = [
+        r"cryptsetup ([0-9]+\.[0-9]+\.[0-9]+)",
+        r"cryptsetup library version %s.\r?\n([0-9]+\.[0-9]+\.[0-9]+)",
+        r"([0-9]+\.[0-9]+\.[0-9]+)\r?\nCrypto backend \(%s\) initialized in cryptsetup",
+    ]
     VENDOR_PRODUCT = [("cryptsetup_project", "cryptsetup")]
diff --git a/test/condensed-downloads/libcryptsetup12_2.1.0-5+deb10u2_arm64.deb.tar.gz b/test/condensed-downloads/libcryptsetup12_2.1.0-5+deb10u2_arm64.deb.tar.gz
diff --git a/test/test_data/cryptsetup.py b/test/test_data/cryptsetup.py
@@ -29,9 +29,15 @@
         "version": "2.3.6",
     },
     {
-        "url": " 	http://mirror.centos.org/altarch/7/os/aarch64/Packages/",
+        "url": "http://mirror.centos.org/altarch/7/os/aarch64/Packages/",
         "package_name": "cryptsetup-2.0.3-6.el7.aarch64.rpm",
         "product": "cryptsetup",
         "version": "2.0.3",
     },
+    {
+        "url": "http://ftp.fr.debian.org/debian/pool/main/c/cryptsetup/",
+        "package_name": "libcryptsetup12_2.1.0-5+deb10u2_arm64.deb",
+        "product": "cryptsetup",
+        "version": "2.1.0",
+    },
 ]