[PATCH 09/25] Moved ensure_redhat_gpgkey_installed -> shared/ - RHEL7

Shawn Wells shawn at redhat.com
Tue Dec 24 01:59:00 UTC 2013


-------------- next part --------------
>From e37c60140fef4911c7dad2e700590d1b428c78a8 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Mon, 23 Dec 2013 02:40:30 -0500
Subject: [PATCH 09/25] Moved ensure_redhat_gpgkey_installed -> shared/ - RHEL7
 testing - Updating CPE info

Signed-off-by: Shawn Wells <shawn at redhat.com>
---
:100644 120000 4afc79b... b990ffa... T	RHEL/6/input/checks/ensure_redhat_gpgkey_installed.xml
:000000 120000 0000000... b990ffa... A	RHEL/7/input/checks/ensure_redhat_gpgkey_installed.xml
:000000 100644 0000000... ef1cb93... A	shared/oval/ensure_redhat_gpgkey_installed.xml
 .../checks/ensure_redhat_gpgkey_installed.xml      | 44 +-------------------
 .../checks/ensure_redhat_gpgkey_installed.xml      |  1 +
 shared/oval/ensure_redhat_gpgkey_installed.xml     | 47 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/RHEL/6/input/checks/ensure_redhat_gpgkey_installed.xml b/RHEL/6/input/checks/ensure_redhat_gpgkey_installed.xml
deleted file mode 100644
index 4afc79b..0000000
--- a/RHEL/6/input/checks/ensure_redhat_gpgkey_installed.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<def-group>
-  <definition class="compliance" id="ensure_redhat_gpgkey_installed"
-  version="1">
-    <metadata>
-      <title>Red Hat Release and Auxiliary gpg-pubkey Packages Installed</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The Red Hat release and auxiliary key packages are required to be installed.</description>
-      <reference source="swells" ref_id="20130915" ref_url="test_attestation" />
-    </metadata>
-    <criteria comment="packages gpg-pubkey-fd431d51-4ae0493b and gpg-pubkey-2fa658e0-45700c69 are installed"
-	      operator="AND">
-      <criterion comment="package gpg-pubkey-fd431d51-4ae0493b is installed"
-		 test_ref="test_package_gpgkey-fd431d51-4ae0493b_installed" />
-      <criterion comment="package gpg-pubkey-2fa658e0-45700c69 is installed"
-		 test_ref="test_package_gpgkey-2fa658e0-45700c69_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="only one" check_existence="any_exist"
-  id="test_package_gpgkey-fd431d51-4ae0493b_installed" version="1"
-  comment="Red Hat release key package is installed">
-    <linux:object object_ref="obj_package_gpg-pubkey" />
-    <linux:state state_ref="state_package_gpg-pubkey-fd431d51-4ae0493b" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_state id="state_package_gpg-pubkey-fd431d51-4ae0493b" version="1">
-    <linux:release>4ae0493b</linux:release>
-    <linux:version>fd431d51</linux:version>
-  </linux:rpminfo_state>
-  <linux:rpminfo_test check="only one" check_existence="any_exist"
-  id="test_package_gpgkey-2fa658e0-45700c69_installed" version="1"
-  comment="Red Hat auxiliary key package is installed">
-    <linux:object object_ref="obj_package_gpg-pubkey" />
-    <linux:state state_ref="state_package_gpg-pubkey-2fa658e0-45700c69" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_gpg-pubkey" version="1">
-    <linux:name>gpg-pubkey</linux:name>
-  </linux:rpminfo_object>
-  <linux:rpminfo_state id="state_package_gpg-pubkey-2fa658e0-45700c69" version="1">
-    <linux:release>45700c69</linux:release>
-    <linux:version>2fa658e0</linux:version>
-  </linux:rpminfo_state>
-</def-group>
diff --git a/RHEL/6/input/checks/ensure_redhat_gpgkey_installed.xml b/RHEL/6/input/checks/ensure_redhat_gpgkey_installed.xml
new file mode 120000
index 0000000..b990ffa
--- /dev/null
+++ b/RHEL/6/input/checks/ensure_redhat_gpgkey_installed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/ensure_redhat_gpgkey_installed.xml
\ No newline at end of file
diff --git a/RHEL/7/input/checks/ensure_redhat_gpgkey_installed.xml b/RHEL/7/input/checks/ensure_redhat_gpgkey_installed.xml
new file mode 120000
index 0000000..b990ffa
--- /dev/null
+++ b/RHEL/7/input/checks/ensure_redhat_gpgkey_installed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/ensure_redhat_gpgkey_installed.xml
\ No newline at end of file
diff --git a/shared/oval/ensure_redhat_gpgkey_installed.xml b/shared/oval/ensure_redhat_gpgkey_installed.xml
new file mode 100644
index 0000000..ef1cb93
--- /dev/null
+++ b/shared/oval/ensure_redhat_gpgkey_installed.xml
@@ -0,0 +1,47 @@
+<def-group>
+  <definition class="compliance" id="ensure_redhat_gpgkey_installed"
+  version="1">
+    <metadata>
+      <title>Red Hat Release and Auxiliary gpg-pubkey Packages Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The Red Hat release and auxiliary key packages are required to be installed.</description>
+      <reference source="swells" ref_id="20130915" ref_url="test_attestation" />
+      <!-- rhel7 <reference source="swells" ref_id="20130915" ref_url="test_attestation" /> -->
+    </metadata>
+    <criteria comment="packages gpg-pubkey-fd431d51-4ae0493b and gpg-pubkey-2fa658e0-45700c69 are installed"
+	      operator="AND">
+      <criterion comment="package gpg-pubkey-fd431d51-4ae0493b is installed"
+		 test_ref="test_package_gpgkey-fd431d51-4ae0493b_installed" />
+      <criterion comment="package gpg-pubkey-2fa658e0-45700c69 is installed"
+		 test_ref="test_package_gpgkey-2fa658e0-45700c69_installed" />
+    </criteria>
+  </definition>
+
+  <linux:rpminfo_test check="only one" check_existence="any_exist"
+  id="test_package_gpgkey-fd431d51-4ae0493b_installed" version="1"
+  comment="Red Hat release key package is installed">
+    <linux:object object_ref="obj_package_gpg-pubkey" />
+    <linux:state state_ref="state_package_gpg-pubkey-fd431d51-4ae0493b" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_state id="state_package_gpg-pubkey-fd431d51-4ae0493b" version="1">
+    <linux:release>4ae0493b</linux:release>
+    <linux:version>fd431d51</linux:version>
+  </linux:rpminfo_state>
+
+  <linux:rpminfo_test check="only one" check_existence="any_exist"
+  id="test_package_gpgkey-2fa658e0-45700c69_installed" version="1"
+  comment="Red Hat auxiliary key package is installed">
+    <linux:object object_ref="obj_package_gpg-pubkey" />
+    <linux:state state_ref="state_package_gpg-pubkey-2fa658e0-45700c69" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_gpg-pubkey" version="1">
+    <linux:name>gpg-pubkey</linux:name>
+  </linux:rpminfo_object>
+  <linux:rpminfo_state id="state_package_gpg-pubkey-2fa658e0-45700c69" version="1">
+    <linux:release>45700c69</linux:release>
+    <linux:version>2fa658e0</linux:version>
+  </linux:rpminfo_state>
+</def-group>
-- 
1.8.3.1



More information about the scap-security-guide mailing list