diff --git a/cpe/README b/cpe/README index e3c1122c66..9f0fb4a10a 100644 --- a/cpe/README +++ b/cpe/README @@ -1,14 +1,3 @@ This folder contains the default CPE dictionary and its associated OVAL file. -Synchronized with the official NIST NVD CPE Dictionary v2.3 -from https://nvd.nist.gov/products/cpe with the following exceptions, -that are kept for backward-compatibility: - -cpe:/o:redhat:enterprise_linux:6 deprecated -cpe:/o:redhat:enterprise_linux:7 no cover-all name for 7.x versions -cpe:/o:redhat:enterprise_linux:8 no cover-all name for 8.x versions -cpe:/o:centos:centos:7 no cover-all name for 7.x versions -cpe:/o:centos:centos:8 no cover-all name for 8.x versions - -In the next API-breaking version the internal CPE dictionary will be removed -completely. \ No newline at end of file +It has only one dummy entry and can be customized by a distribution packager. diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml index 02d5361890..6c93b79cc2 100644 --- a/cpe/openscap-cpe-dict.xml +++ b/cpe/openscap-cpe-dict.xml @@ -1,56 +1,7 @@ - - - Red Hat Enterprise Linux - oval:org.open-scap.cpe.rhel:def:1 - - - Red Hat Enterprise Linux 5 - oval:org.open-scap.cpe.rhel:def:5 - - - Red Hat Enterprise Linux 6 - oval:org.open-scap.cpe.rhel:def:6 - - - Red Hat Enterprise Linux 7 - oval:org.open-scap.cpe.rhel:def:7 - - - Red Hat Enterprise Linux 8 - oval:org.open-scap.cpe.rhel:def:8 - - - Community Enterprise Operating System 5 - oval:org.open-scap.cpe.rhel:def:1005 - - - Community Enterprise Operating System 6 - oval:org.open-scap.cpe.rhel:def:1006 - - - Community Enterprise Operating System 7 - oval:org.open-scap.cpe.rhel:def:1007 - - - Community Enterprise Operating System 8 - oval:org.open-scap.cpe.centos:def:8 - - - Fedora 32 - oval:org.open-scap.cpe.fedora:def:32 - - - Fedora 33 - oval:org.open-scap.cpe.fedora:def:33 - - - Fedora 34 - oval:org.open-scap.cpe.fedora:def:34 - - - Fedora 35 - oval:org.open-scap.cpe.fedora:def:35 + + + Linux + oval:org.open-scap.cpe.linux:def:1 diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml index 64099400b8..99bed4a246 100644 --- a/cpe/openscap-cpe-oval.xml +++ b/cpe/openscap-cpe-oval.xml @@ -12,1448 +12,34 @@ 2012-11-22T15:00:00+01:00 - + Red Hat Enterprise Linux - Red Hat Enterprise Linux + Linux - - The operating system installed on the system is Red Hat Enterprise Linux + + The operating system installed is Linux - - - - - - Red Hat Enterprise Linux 5 - - Red Hat Enterprise Linux 5 - - - The operating system installed on the system is Red Hat Enterprise Linux 5 - - - - - - - - Red Hat Enterprise Linux 6 - - Red Hat Enterprise Linux 6 - - - The operating system installed on the system is Red Hat Enterprise Linux 6 - - - - - - - - Red Hat Enterprise Linux 7 - - Red Hat Enterprise Linux 7 - - - The operating system installed on the system is Red Hat Enterprise Linux 7 - - - - - - - - - - - - Red Hat Enterprise Linux 8 - - Red Hat Enterprise Linux 8 - - - The operating system installed on the system is Red Hat Enterprise Linux 8 - - - - - - - - Oracle Linux 5 - - Oracle Linux 5 - - - The operating system installed on the system is Oracle Linux 5 - - - - - - - - Oracle Linux 6 - - Oracle Linux 6 - - - The operating system installed on the system is Oracle Linux 6 - - - - - - - - Oracle Linux 7 - - Oracle Linux 7 - - - The operating system installed on the system is Oracle Linux 7 - - - - - - - - Oracle Linux 8 - - Oracle Linux 8 - - - The operating system installed on the system is Oracle Linux 8 - - - - - - - - Community Enterprise Operating System 5 - - Community Enterprise Operating System 5 - - - The operating system installed on the system is Community Enterprise Operating System 5 - - - - - - - - Community Enterprise Operating System 6 - - Community Enterprise Operating System 6 - - - The operating system installed on the system is Community Enterprise Operating System 6 - - - - - - - - Community Enterprise Operating System 7 - - Community Enterprise Operating System 7 - - - The operating system installed on the system is Community Enterprise Operating System 7 - - - - - - - - Community Enterprise Operating System 8 - - Community Enterprise Operating System 8 - - - The operating system installed on the system is Community Enterprise Operating System 8 - - - - - - - - - Scientific Linux 5 - - Scientific Linux 5 - - - The operating system installed on the system is Scientific Linux 5 - - - - - - - - Scientific Linux 6 - - Scientific Linux 6 - - - The operating system installed on the system is Scientific Linux 6 - - - - - - - - Scientific Linux 7 - - Scientific Linux 7 - - - The operating system installed on the system is Scientific Linux 7 - - - - - - - - Fedora 16 - - Fedora 16 - - - The operating system installed on the system is Fedora 16 - - - - - - - - Fedora 17 - - Fedora 17 - - - The operating system installed on the system is Fedora 17 - - - - - - - - Fedora 18 - - Fedora 18 - - - The operating system installed on the system is Fedora 18 - - - - - - - - Fedora 19 - - Fedora 19 - - - The operating system installed on the system is Fedora 19 - - - - - - - - Fedora 20 - - Fedora 20 - - - The operating system installed on the system is Fedora 20 - - - - - - - - Fedora 21 - - Fedora 21 - - - The operating system installed on the system is Fedora 21 - - - - - - - - Fedora 22 - - Fedora 22 - - - The operating system installed on the system is Fedora 22 - - - - - - - - Fedora 23 - - Fedora 23 - - - The operating system installed on the system is Fedora 23 - - - - - - - - Fedora 24 - - Fedora 24 - - - The operating system installed on the system is Fedora 24 - - - - - - - - Fedora 25 - - Fedora 25 - - - The operating system installed on the system is Fedora 25 - - - - - - - - Fedora 26 - - Fedora 26 - - - The operating system installed on the system is Fedora 26 - - - - - - - - Fedora 27 - - Fedora 27 - - - The operating system installed on the system is Fedora 27 - - - - - - - - Fedora 28 - - Fedora 28 - - - The operating system installed on the system is Fedora 28 - - - - - - - - Fedora 29 - - Fedora 29 - - - The operating system installed on the system is Fedora 29 - - - - - - - - Fedora 30 - - Fedora 30 - - - The operating system installed on the system is Fedora 30 - - - - - - - - Fedora 31 - - Fedora 31 - - - The operating system installed on the system is Fedora 31 - - - - - - - - Fedora 32 - - Fedora 32 - - - The operating system installed on the system is Fedora 32 - - - - - - - - Fedora 33 - - Fedora 33 - - - The operating system installed on the system is Fedora 33 - - - - - - - - Fedora 34 - - Fedora 34 - - - The operating system installed on the system is Fedora 34 - - - - - - - - Fedora 35 - - Fedora 35 - - - The operating system installed on the system is Fedora 35 - - - - - - - - - - SUSE Linux Enterprise All Platforms - - SUSE Linux Enterprise All Platforms - - - The operating system installed on the system is SUSE Linux Enterprise - - - - - - - - - - - - SUSE Linux Enterprise Server 10 - - SUSE Linux Enterprise Server 10 - - - The operating system installed on the system is SUSE Linux Enterprise Server 10 - - - - - - - - - SUSE Linux Enterprise Desktop 10 - - SUSE Linux Enterprise Desktop 10 - - - The operating system installed on the system is SUSE Linux Enterprise Desktop 10 - - - - - - - - - SUSE Linux Enterprise 11 - - SUSE Linux Enterprise Server 11 - SUSE Linux Enterprise Desktop 11 - - - - The operating system installed on the system is SUSE Linux Enterprise 11. - - - - - - - - - - - - - - SUSE Linux Enterprise Server 12 - - SUSE Linux Enterprise Server 12 - - - The operating system installed on the system is SUSE Linux Enterprise Server 12 - - - - - - - - - SUSE Linux Enterprise Desktop 12 - - SUSE Linux Enterprise Desktop 12 - - - The operating system installed on the system is SUSE Linux Enterprise Desktop 12 - - - - - - - - - openSUSE All Versions - - openSUSE - - - The operating system installed on the system is openSUSE - - - - - - - - - openSUSE 11.4 - - openSUSE 11.4 - - - The operating system installed on the system is openSUSE 11.4 - - - - - - - - - openSUSE 13.1 - - openSUSE 13.1 - - - The operating system installed on the system is openSUSE 13.1 - - - - - - - - - openSUSE 13.2 - - openSUSE 13.2 - - - The operating system installed on the system is openSUSE 13.2 - - - - - - - - openSUSE Leap 42.1 - - openSUSE Leap 42.1 - - - - The operating system installed on the system is openSUSE Leap 42.1 - - - - - - - - openSUSE Leap 42.2 - - openSUSE Leap 42.2 - - - - The operating system installed on the system is openSUSE Leap 42.2 - - - - - - - - openSUSE Leap 42.3 - - openSUSE Leap 42.3 - - - The operating system installed on the system is openSUSE Leap 42.3 - - - - - - - - openSUSE Leap 15.0 - - openSUSE Leap 15.0 - - - The operating system installed on the system is openSUSE Leap 15.0 - - - - - - - - Wind River Linux - - Wind River Linux - - - The operating system installed on the system is Wind River Linux - - - - - - - - - Wind River Linux 8 - - Wind River Linux 8 - - - The operating system installed on the system is Wind River Linux 8 - - - - - - - - Wind River Linux 1019 - - Wind River Linux 1019 - - - The operating system installed on the system is Wind River Linux 1019 - - - - - - - - Microsoft Windows 7 - - Microsoft Windows 7 - - - The operating system installed on the system is Microsoft Windows 7 - - - - - - - - Microsoft Windows 8 - - Microsoft Windows 8 - - - The operating system installed on the system is Microsoft Windows 8 - - - - - - - - Microsoft Windows 8.1 - - Microsoft Windows 8.1 - - - The operating system installed on the system is Microsoft Windows 8.1 - - - - - - - - Microsoft Windows 10 - - Microsoft Windows 10 - - - The operating system installed on the system is Microsoft Windows 10 - - - - - - - - Microsoft Windows Server 2008 - - Microsoft Windows Server 2008 - - - The operating system installed on the system is Microsoft Windows Server 2008 - - - - - - - - Microsoft Windows Server 2012 - - Microsoft Windows Server 2012 - - - The operating system installed on the system is Microsoft Windows Server 2012 - - - - - - - - Microsoft Windows Server 2016 - - Microsoft Windows Server 2016 - - - The operating system installed on the system is Microsoft Windows Server 2016 - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - redhat-release - - - ^fedora-release.* - - - - - - - - - - /etc/redhat-release - - - sles-release - - - sled-release - - - openSUSE-release - - - /etc/wrlinux-release - - - /etc - wrlinux-release - ^VERSION=.([[:digit:]]*) - 1 - - - /etc - os-release - ^VERSION=.(\d*.\d*) - 1 - - - redhat-release-virtualization-host - - - /etc/redhat-release - ^Red Hat Enterprise Linux release (\d)\.\d+$ - 1 - - - oraclelinux-release - - - HKEY_LOCAL_MACHINE - SOFTWARE\Microsoft\Windows NT\CurrentVersion - ProductName - - - /etc/os-release - ^ID="(\w+)"$ - 1 - - - /etc/os-release - ^VERSION_ID="(\d)"$ - 1 - + unix - - ^redhat-release - - - ^5[^\d] - - - ^redhat-release - ^6[^\d] - - - ^redhat-release - ^7[^\d] - - - ^redhat-release - ^8[^\d] - - - ^centos-release - ^5 - - - ^centos-release - ^6 - - - ^centos-release - ^7 - - - centos - - - 8 - - - ^sl-release - ^5 - - - ^sl-release - ^6 - - - ^sl-release - ^7 - - - ^oraclelinux-release - ^5 - - - ^oraclelinux-release - ^6 - - - ^oraclelinux-release - ^7 - - - ^oraclelinux-release - ^8 - - - ^16$ - - - ^17$ - - - ^18$ - - - ^19$ - - - ^20$ - - - ^21$ - - - ^22$ - - - ^23$ - - - ^24$ - - - ^25$ - - - ^26$ - - - ^27$ - - - ^28$ - - - ^29$ - - - ^30$ - - - ^31$ - - - ^32$ - - - ^33$ - - - ^34$ - - - ^35$ - - - ^sles-release - - - ^sled-release - - - ^10($|[^\d]) - - - ^11($|[^\d]) - - - ^12($|[^\d]) - - - ^10($|[^\d]) - - - ^11($|[^\d]) - - - ^12($|[^\d]) - - - ^openSUSE-release - - - ^11.4$ - - - ^13.1$ - - - ^13.2$ - - - ^42.1$ - - - ^42.2$ - - - ^42.3$ - - - ^15.0$ - - - 8 - - - 10.19 - - - 7 - - - ^Windows 7.*$ - - - ^Windows 8.*$ - - - ^Windows 8\.1.*$ - - - ^Windows 10.*$ - - - ^.*2008.*$ - - - ^.*2012.*$ - - - ^.*2016.*$ -