Permalink
Browse files

Fixed windows OVAL enumeration strings, added missing strings from OV…

…AL 5.11

This enables openscap to parse Windows content successfully.
  • Loading branch information...
mpreisler committed Mar 2, 2015
1 parent 69626ae commit d1d65ad88f07064b755bb6a4d554ac96ab924c1b
Showing with 54 additions and 21 deletions.
  1. +32 −18 src/OVAL/oval_enumerations.c
  2. +22 −3 src/OVAL/public/oval_types.h
@@ -536,39 +536,53 @@ static const struct oscap_string_map OVAL_SUBTYPE_UNIX_MAP[] = {
};
static const struct oscap_string_map OVAL_SUBTYPE_WINDOWS_MAP[] = {
- {OVAL_WINDOWS_ACCESS_TOKEN, "access_token"},
- {OVAL_WINDOWS_ACTIVE_DIRECTORY, "active_directory"},
- {OVAL_WINDOWS_AUDIT_EVENT_POLICY, "audit_event_policy"},
- {OVAL_WINDOWS_AUDIT_EVENT_SUBCATEGORIES, "audit_event_subcatagories"},
+ {OVAL_WINDOWS_ACCESS_TOKEN, "accesstoken"},
+ {OVAL_WINDOWS_ACTIVE_DIRECTORY, "activedirectory"},
+ {OVAL_WINDOWS_AUDIT_EVENT_POLICY, "auditeventpolicy"},
+ {OVAL_WINDOWS_AUDIT_EVENT_POLICY_SUBCATEGORIES, "auditeventpolicysubcategories"},
{OVAL_WINDOWS_FILE, "file"},
- {OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS_53, "file_audited_permissions_53"},
- {OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS, "file_audited_permissions"},
- {OVAL_WINDOWS_FILE_EFFECTIVE_RIGHTS_53, "file_effective_rights_53"},
- {OVAL_WINDOWS_FILE_EFFECTIVE_RIGHTS, "file_effective_rights"},
+ {OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS_53, "fileauditedpermissions53"},
+ {OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS, "fileauditedpermissions"},
+ {OVAL_WINDOWS_FILE_EFFECTIVE_RIGHTS_53, "fileeffectiverights53"},
+ {OVAL_WINDOWS_FILE_EFFECTIVE_RIGHTS, "fileeffectiverights"},
{OVAL_WINDOWS_GROUP, "group"},
{OVAL_WINDOWS_GROUP_SID, "group_sid"},
{OVAL_WINDOWS_INTERFACE, "interface"},
- {OVAL_WINDOWS_LOCKOUT_POLICY, "lockout_policy"},
+ {OVAL_WINDOWS_LOCKOUT_POLICY, "lockoutpolicy"},
{OVAL_WINDOWS_METABASE, "metabase"},
- {OVAL_WINDOWS_PASSWORD_POLICY, "password_policy"},
+ {OVAL_WINDOWS_PASSWORD_POLICY, "passwordpolicy"},
{OVAL_WINDOWS_PORT, "port"},
- {OVAL_WINDOWS_PRINTER_EFFECTIVE_RIGHTS, "printer_effective_rights"},
+ {OVAL_WINDOWS_PRINTER_EFFECTIVE_RIGHTS, "printereffectiverights"},
{OVAL_WINDOWS_PROCESS, "process"},
{OVAL_WINDOWS_REGISTRY, "registry"},
- {OVAL_WINDOWS_REGKEY_AUDITED_PERMISSIONS_53, "regkey_audited_permissions_53"},
- {OVAL_WINDOWS_REGKEY_AUDITED_PERMISSIONS, "regkey_audited_permissions"},
- {OVAL_WINDOWS_REGKEY_EFFECTIVE_RIGHTS_53, "regkey_effective_rights_53"},
- {OVAL_WINDOWS_REGKEY_EFFECTIVE_RIGHTS, "regkey_effective_rights"},
- {OVAL_WINDOWS_SHARED_RESOURCE, "shared_resource"},
+ {OVAL_WINDOWS_REGKEY_AUDITED_PERMISSIONS_53, "regkeyauditedpermissions53"},
+ {OVAL_WINDOWS_REGKEY_AUDITED_PERMISSIONS, "regkeyauditedpermissions"},
+ {OVAL_WINDOWS_REGKEY_EFFECTIVE_RIGHTS_53, "regkeyeffectiverights53"},
+ {OVAL_WINDOWS_REGKEY_EFFECTIVE_RIGHTS, "regkeyeffectiverights"},
+ {OVAL_WINDOWS_SHARED_RESOURCE, "sharedresource"},
{OVAL_WINDOWS_SID, "sid"},
{OVAL_WINDOWS_SID_SID, "sid_sid"},
{OVAL_WINDOWS_USER_ACCESS_CONTROL, "user_access_control"},
{OVAL_WINDOWS_USER, "user"},
- {OVAL_WINDOWS_USER_SID_55, "user_sid_55"},
+ {OVAL_WINDOWS_USER_SID_55, "user_sid55"},
{OVAL_WINDOWS_USER_SID, "user_sid"},
{OVAL_WINDOWS_VOLUME, "volume"},
{OVAL_WINDOWS_WMI, "wmi"},
- {OVAL_WINDOWS_WUA_UPDATE_SEARCHER, "wua_update_searcher"},
+ {OVAL_WINDOWS_WUA_UPDATE_SEARCHER, "wuaupdatesearcher"},
+ {OVAL_WINDOWS_ACTIVE_DIRECTORY_57, "activedirectory57"},
+ {OVAL_WINDOWS_CMDLET, "cmdlet"},
+ {OVAL_WINDOWS_DNSCACHE, "dnscache"},
+ {OVAL_WINDOWS_LICENSE, "license"},
+ {OVAL_WINDOWS_NTUSER, "ntuser"},
+ {OVAL_WINDOWS_PEHEADER, "peheader"},
+ {OVAL_WINDOWS_PROCESS_58, "process58"},
+ {OVAL_WINDOWS_SERVICE, "service"},
+ {OVAL_WINDOWS_SERVICE_EFFECTIVE_RIGHTS, "serviceeffectiverights"},
+ {OVAL_WINDOWS_SHARED_RESOURCE_AUDITED_PERMISSIONS, "sharedresourceauditedpermissions"},
+ {OVAL_WINDOWS_SHARED_RESOURCE_EFFECTIVE_RIGHTS, "sharedresourceeffectiverights"},
+ {OVAL_WINDOWS_SYSTEM_METRIC, "systemmetric"},
+ {OVAL_WINDOWS_USER_RIGHT, "userright"},
+ {OVAL_WINDOWS_WMI_57, "wmi57"},
{OVAL_SUBTYPE_UNKNOWN, NULL}
};
@@ -266,7 +266,7 @@ typedef enum {
OVAL_WINDOWS_ACCESS_TOKEN = OVAL_FAMILY_WINDOWS + 1,
OVAL_WINDOWS_ACTIVE_DIRECTORY = OVAL_FAMILY_WINDOWS + 2,
OVAL_WINDOWS_AUDIT_EVENT_POLICY = OVAL_FAMILY_WINDOWS + 3,
- OVAL_WINDOWS_AUDIT_EVENT_SUBCATEGORIES = OVAL_FAMILY_WINDOWS + 4,
+ OVAL_WINDOWS_AUDIT_EVENT_POLICY_SUBCATEGORIES = OVAL_FAMILY_WINDOWS + 4,
OVAL_WINDOWS_FILE = OVAL_FAMILY_WINDOWS + 5,
OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS_53 = OVAL_FAMILY_WINDOWS + 6,
OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS = OVAL_FAMILY_WINDOWS + 7,
@@ -289,13 +289,32 @@ typedef enum {
OVAL_WINDOWS_SHARED_RESOURCE = OVAL_FAMILY_WINDOWS + 24,
OVAL_WINDOWS_SID = OVAL_FAMILY_WINDOWS + 25,
OVAL_WINDOWS_SID_SID = OVAL_FAMILY_WINDOWS + 26,
- OVAL_WINDOWS_USER_ACCESS_CONTROL = OVAL_FAMILY_WINDOWS + 27,
+ OVAL_WINDOWS_UAC = OVAL_FAMILY_WINDOWS + 27,
OVAL_WINDOWS_USER = OVAL_FAMILY_WINDOWS + 28,
OVAL_WINDOWS_USER_SID_55 = OVAL_FAMILY_WINDOWS + 29,
OVAL_WINDOWS_USER_SID = OVAL_FAMILY_WINDOWS + 30,
OVAL_WINDOWS_VOLUME = OVAL_FAMILY_WINDOWS + 31,
OVAL_WINDOWS_WMI = OVAL_FAMILY_WINDOWS + 32,
- OVAL_WINDOWS_WUA_UPDATE_SEARCHER = OVAL_FAMILY_WINDOWS + 33
+ OVAL_WINDOWS_WUA_UPDATE_SEARCHER = OVAL_FAMILY_WINDOWS + 33,
+ OVAL_WINDOWS_ACTIVE_DIRECTORY_57 = OVAL_FAMILY_WINDOWS + 34,
+ OVAL_WINDOWS_CMDLET = OVAL_FAMILY_WINDOWS + 35,
+ OVAL_WINDOWS_DNSCACHE = OVAL_FAMILY_WINDOWS + 36,
+ OVAL_WINDOWS_LICENSE = OVAL_FAMILY_WINDOWS + 37,
+ OVAL_WINDOWS_NTUSER = OVAL_FAMILY_WINDOWS + 38,
+ OVAL_WINDOWS_PEHEADER = OVAL_FAMILY_WINDOWS + 39,
+ OVAL_WINDOWS_PROCESS_58 = OVAL_FAMILY_WINDOWS + 40,
+ OVAL_WINDOWS_SERVICE = OVAL_FAMILY_WINDOWS + 41,
+ OVAL_WINDOWS_SERVICE_EFFECTIVE_RIGHTS = OVAL_FAMILY_WINDOWS + 42,
+ OVAL_WINDOWS_SHARED_RESOURCE_AUDITED_PERMISSIONS = OVAL_FAMILY_WINDOWS + 43,
+ OVAL_WINDOWS_SHARED_RESOURCE_EFFECTIVE_RIGHTS = OVAL_FAMILY_WINDOWS + 44,
+ OVAL_WINDOWS_SYSTEM_METRIC = OVAL_FAMILY_WINDOWS + 45,
+ OVAL_WINDOWS_USER_RIGHT = OVAL_FAMILY_WINDOWS + 46,
+ OVAL_WINDOWS_WMI_57 = OVAL_FAMILY_WINDOWS + 47,
+
+ // deprecated, use OVAL_WINDOWS_AUTID_EVENT_POLICY_SUBCATEGORIES instead
+ OVAL_WINDOWS_AUDIT_EVENT_SUBCATEGORIES = OVAL_FAMILY_WINDOWS + 4,
+ // deprecated, use OVAL_WINDOWS_UAC instead
+ OVAL_WINDOWS_USER_ACCESS_CONTROL = OVAL_FAMILY_WINDOWS + 27,
} oval_windows_subtype_t;
/// severity level

0 comments on commit d1d65ad

Please sign in to comment.