Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CIS: Cleaned up duplicate OVAL IDs - oval:org.cisecurity:tst:2029, ov…
…al:org.mitre.oval:ste:23230, oval:org.mitre.oval:ste:23231
- Loading branch information
wmunyan
committed
Dec 15, 2016
1 parent
641e316
commit 6cb9051
Showing
6 changed files
with
4 additions
and
12 deletions.
There are no files selected for viewing
5 changes: 0 additions & 5 deletions
5
repository/objects/solaris/patch54_object/0000/oval_org.cisecurity_obj_444.xml
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...e/23000/oval_org.mitre.oval_ste_23230.xml → ...ate/1000/oval_org.cisecurity_ste_1796.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| <registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.mitre.oval:ste:23230" version="1"> | ||
| <registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.cisecurity:ste:1796" version="1"> | ||
| <value operation="pattern match">^ImageMagick 6.[0-9].[1-3]-[0-9] .*$</value> | ||
| </registry_state> |
2 changes: 1 addition & 1 deletion
2
...e/23000/oval_org.mitre.oval_ste_23231.xml → ...ate/1000/oval_org.cisecurity_ste_1797.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| <registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.mitre.oval:ste:23231" version="1"> | ||
| <registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.cisecurity:ste:1797" version="1"> | ||
| <value operation="pattern match">^ImageMagick 7.0.[0-1]-0 .*$</value> | ||
| </registry_state> |
3 changes: 0 additions & 3 deletions
3
repository/tests/solaris/patch54_test/2000/oval_org.cisecurity_tst_2029.xml
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2242.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" check="all" check_existence="at_least_one_exists" comment="Check if the version of ImageMagick is equal 7.0.0-0 or 7.0.1-0" id="oval:org.cisecurity:tst:2242" version="1"> | ||
| <object object_ref="oval:org.cisecurity:obj:486" /> | ||
| <state state_ref="oval:org.mitre.oval:ste:23231" /> | ||
| <state state_ref="oval:org.cisecurity:ste:1797" /> | ||
| </registry_test> |
2 changes: 1 addition & 1 deletion
2
repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2243.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" check="all" check_existence="at_least_one_exists" comment="Check if the ImageMagick is equal to 6.9.3-9 or previous versions" id="oval:org.cisecurity:tst:2243" version="1"> | ||
| <object object_ref="oval:org.cisecurity:obj:486" /> | ||
| <state state_ref="oval:org.mitre.oval:ste:23230" /> | ||
| <state state_ref="oval:org.cisecurity:ste:1796" /> | ||
| </registry_test> |
6cb9051There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wmunyan Why didn't you rise versions of tests? For example oval:org.cisecurity:tst:2242 has version 1 after changing state from oval:org.mitre.oval:ste:23231 to oval:org.cisecurity:ste:1797. How did we get this update without changing in version?
6cb9051There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maria, I apologize for the oversight on this one. I will increment the version number on these two tests.
Cheers,
-Bill M.