diff --git a/cve_bin_tool/checkers/ffmpeg.py b/cve_bin_tool/checkers/ffmpeg.py index 67349af992..ea4bfac3c8 100644 --- a/cve_bin_tool/checkers/ffmpeg.py +++ b/cve_bin_tool/checkers/ffmpeg.py @@ -22,7 +22,7 @@ class FfmpegChecker(Checker): ] FILENAME_PATTERNS = [r"ffmpeg"] VERSION_PATTERNS = [ - r"%s version ([0-9]+\.[0-9]+\.[0-9]+)", + r"%s version ([0-9]+\.[0-9]+\.[0-9]+)[a-zA-Z0-9 \(\)%~\-\r\n]*(?:avutil|FFmpeg)", r"FFmpeg version ([0-9]+\.[0-9]+\.[0-9]+)", ] VENDOR_PRODUCT = [("ffmpeg", "ffmpeg")] diff --git a/test/condensed-downloads/ffmpeg-5.1.2-9.fc38.aarch64.rpm.tar.gz b/test/condensed-downloads/ffmpeg-5.1.2-9.fc38.aarch64.rpm.tar.gz new file mode 100644 index 0000000000..6e9c1369ac Binary files /dev/null and b/test/condensed-downloads/ffmpeg-5.1.2-9.fc38.aarch64.rpm.tar.gz differ diff --git a/test/condensed-downloads/ffmpeg_3.2.14-1~deb9u1_amd64.deb.tar.gz b/test/condensed-downloads/ffmpeg_3.2.14-1~deb9u1_amd64.deb.tar.gz new file mode 100644 index 0000000000..cc6fca7606 Binary files /dev/null and b/test/condensed-downloads/ffmpeg_3.2.14-1~deb9u1_amd64.deb.tar.gz differ diff --git a/test/test_data/ffmpeg.py b/test/test_data/ffmpeg.py index 4953d17356..d2d6c183e6 100644 --- a/test/test_data/ffmpeg.py +++ b/test/test_data/ffmpeg.py @@ -2,11 +2,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later mapping_test_data = [ + { + "product": "ffmpeg", + "version": "5.1.2", + "version_strings": [ + "%s version 5.1.2\n Copyright (c) %d-%d the FFmpeg developers" + ], + }, { "product": "ffmpeg", "version": "4.1.3", "version_strings": [ - "%s version 4.1.3", + "%s version 4.1.3-4ubuntu1\n%s built with %s\navutil", "Codec '%s' is not recognized by FFmpeg.", ], }, @@ -17,6 +24,13 @@ }, ] package_test_data = [ + { + "url": "http://rpmfind.net/linux/rpmfusion/free/fedora/development/rawhide/Everything/aarch64/os/Packages/f/", + "package_name": "ffmpeg-5.1.2-9.fc38.aarch64.rpm", + "product": "ffmpeg", + "version": "5.1.2", + "other_products": [], + }, { "url": "http://archive.ubuntu.com/ubuntu/pool/universe/f/ffmpeg/", "package_name": "ffmpeg_4.3.1-4ubuntu1_amd64.deb", @@ -24,6 +38,13 @@ "version": "4.3.1", "other_products": [], }, + { + "url": "http://ftp.fr.debian.org/debian/pool/main/f/ffmpeg/", + "package_name": "ffmpeg_3.2.14-1~deb9u1_amd64.deb", + "product": "ffmpeg", + "version": "3.2.14", + "other_products": [], + }, { "url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/", "package_name": "libffmpeg-full_3.4.9-1_x86_64.ipk", diff --git a/test/test_data/squashfs.py b/test/test_data/squashfs.py index e820e166f6..5e0def98bd 100644 --- a/test/test_data/squashfs.py +++ b/test/test_data/squashfs.py @@ -14,14 +14,14 @@ "package_name": "squashfs-4.5.1-3.1.aarch64.rpm", "product": "squashfs", "version": "4.5.1", - "other_products": ["ffmpeg"], + "other_products": [], }, { "url": "http://rpmfind.net/linux/opensuse/ports/armv6hl/tumbleweed/repo/oss/armv6hl/", "package_name": "squashfs-4.5.1-3.1.armv6hl.rpm", "product": "squashfs", "version": "4.5.1", - "other_products": ["ffmpeg"], + "other_products": [], }, { "url": "http://ftp.fr.debian.org/debian/pool/main/s/squashfs-tools/", @@ -35,7 +35,7 @@ "package_name": "squashfs-tools_4.5.1-1_arm64.deb", "product": "squashfs", "version": "4.5.1", - "other_products": ["ffmpeg"], + "other_products": [], }, { "url": "https://downloads.openwrt.org/releases/packages-19.07/x86_64/packages/",