From 7848ae57d64bb9118914bcff772df88ce6b9bd6d Mon Sep 17 00:00:00 2001
From: Bob Gendler <robert.gendler@nist.gov>
Date: Thu, 10 Feb 2022 13:09:19 -0500
Subject: [PATCH] changed plist510 to 511

---
 SCAP/macos-cpe-dictionary.xml                   |  2 +-
 SCAP/macos-cpe-oval.xml                         | 17 ++++++++---------
 ...eensaver_ask_for_password_delay_enforce.yaml |  3 ---
 ...prefs_system_wide_preferences_configure.yaml |  3 +++
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/SCAP/macos-cpe-dictionary.xml b/SCAP/macos-cpe-dictionary.xml
index 2eb9c7b5..7d19a320 100644
--- a/SCAP/macos-cpe-dictionary.xml
+++ b/SCAP/macos-cpe-dictionary.xml
@@ -9,7 +9,7 @@
     <generator>
         <product_name>macOS Security Compliance Project</product_name>
         <schema_version>2.3</schema_version>
-        <timestamp>2021-11-16T10:30:56Z</timestamp>
+        <timestamp>2022-02-10T12:16:51Z</timestamp>
     </generator>
     <cpe-item name="cpe:/o:apple:macos:12.0">
         <title xml:lang="en-US">Apple macOS 12.0</title>
diff --git a/SCAP/macos-cpe-oval.xml b/SCAP/macos-cpe-oval.xml
index 03e1a546..c362fd29 100644
--- a/SCAP/macos-cpe-oval.xml
+++ b/SCAP/macos-cpe-oval.xml
@@ -4,7 +4,7 @@
     <generator>
         <oval:product_name>macOS Security Compliance Project</oval:product_name>
         <oval:schema_version>5.11.2</oval:schema_version>
-        <oval:timestamp>2021-11-16T10:30:56Z</oval:timestamp>
+        <oval:timestamp>2022-02-10T12:16:51Z</oval:timestamp>
     </generator>
     <definitions>
         <definition id="oval:gov.nist.mscp.content.cpe.oval:def:1" version="1" class="inventory">
@@ -28,28 +28,27 @@
             <object object_ref="oval:gov.nist.mscp.content.cpe:obj:1"/>
             <state state_ref="oval:gov.nist.mscp.content.cpe:ste:1"/>
         </family_test>
-        <plist510_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#macos" check="all" check_existence="only_one_exists" comment="Apple macOS version is greater than 12.0"
+        <plist511_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#macos" check="all" check_existence="only_one_exists" comment="Apple macOS version is greater than 12.0"
             id="oval:gov.nist.mscp.content.cpe:tst:2" version="2">
             <object object_ref="oval:gov.nist.mscp.content.cpe:obj:2"/>
             <state state_ref="oval:gov.nist.mscp.content.cpe:ste:2"/>
-        </plist510_test>
+        </plist511_test>
     </tests>
     <objects>
         <family_object id="oval:gov.nist.mscp.content.cpe:obj:1" version="1" comment="This variable_object represents the family that the operating system belongs to."
             xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent"/>
-        <plist510_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#macos" comment="The macOS product version plist object." id="oval:gov.nist.mscp.content.cpe:obj:2" version="1">
-            <key>ProductVersion</key>
+        <plist511_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#macos" comment="The macOS product version plist object." id="oval:gov.nist.mscp.content.cpe:obj:2" version="1">
             <filepath>/System/Library/CoreServices/SystemVersion.plist</filepath>
-            <instance datatype="int" operation="equals">1</instance>
-        </plist510_object>
+            <xpath>//*[contains(text(), "ProductVersion")]/following-sibling::*[1]/text()</xpath>
+        </plist511_object>
     </objects>
     <states>
         <family_state id="oval:gov.nist.mscp.content.cpe:ste:1" version="1" comment="The OS is part of the macOS Family." xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent">
             <family>macos</family>
         </family_state>
-        <plist510_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#macos" comment="Is the value is greater than or equal to 12.0" id="oval:gov.nist.mscp.content.cpe:ste:2" version="1">
+        <plist511_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#macos" comment="Is the value is greater than or equal to 12.0" id="oval:gov.nist.mscp.content.cpe:ste:2" version="1">
             <value datatype="version" operation="greater than or equal">12.0</value>
-        </plist510_state>
+        </plist511_state>
     </states>
 </oval_definitions>
 
diff --git a/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml b/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml
index be342002..8fa8a1a4 100644
--- a/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml
+++ b/rules/sysprefs/sysprefs_screensaver_ask_for_password_delay_enforce.yaml
@@ -42,13 +42,10 @@ tags:
   - 800-53r4_high 
   - 800-171 
   - cnssi-1253
-<<<<<<< HEAD
   - cis_lvl1
   - cis_lvl2
   - cisv8
-=======
   - stig
->>>>>>> dev_mont_stig
 severity: "medium"
 mobileconfig: true
 mobileconfig_info:
diff --git a/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml b/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml
index 4a10f29a..87d2e1b1 100644
--- a/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml
+++ b/rules/sysprefs/sysprefs_system_wide_preferences_configure.yaml
@@ -45,6 +45,9 @@ tags:
   - 800-53r4_high 
   - 800-171 
   - cnssi-1253
+  - cis_lvl1
+  - cis_lvl2
+  - cisv8
   - stig
 severity: "medium"
 mobileconfig: false