oval_definitions.h   oval_definitions.h 
skipping to change at line 161 skipping to change at line 161
typedef enum { typedef enum {
OVAL_DATATYPE_UNKNOWN = 0, OVAL_DATATYPE_UNKNOWN = 0,
OVAL_DATATYPE_BINARY = 1, OVAL_DATATYPE_BINARY = 1,
OVAL_DATATYPE_BOOLEAN = 2, OVAL_DATATYPE_BOOLEAN = 2,
OVAL_DATATYPE_EVR_STRING = 3, OVAL_DATATYPE_EVR_STRING = 3,
OVAL_DATATYPE_FILESET_REVISION = 4, OVAL_DATATYPE_FILESET_REVISION = 4,
OVAL_DATATYPE_FLOAT = 5, OVAL_DATATYPE_FLOAT = 5,
OVAL_DATATYPE_IOS_VERSION = 6, OVAL_DATATYPE_IOS_VERSION = 6,
OVAL_DATATYPE_VERSION = 7, OVAL_DATATYPE_VERSION = 7,
OVAL_DATATYPE_INTEGER = 8, OVAL_DATATYPE_INTEGER = 8,
OVAL_DATATYPE_STRING = 9 OVAL_DATATYPE_STRING = 9,
OVAL_DATATYPE_RECORD = 10,
OVAL_DATATYPE_SEXP = 11
} oval_datatype_t; } oval_datatype_t;
/// Varref types /// Varref types
typedef enum { typedef enum {
OVAL_ENTITY_VARREF_UNKNOWN, OVAL_ENTITY_VARREF_UNKNOWN,
OVAL_ENTITY_VARREF_NONE, OVAL_ENTITY_VARREF_NONE,
OVAL_ENTITY_VARREF_ATTRIBUTE, OVAL_ENTITY_VARREF_ATTRIBUTE,
OVAL_ENTITY_VARREF_ELEMENT OVAL_ENTITY_VARREF_ELEMENT
} oval_entity_varref_type_t; } oval_entity_varref_type_t;
skipping to change at line 233 skipping to change at line 235
/// Datetime format enumeration. /// Datetime format enumeration.
typedef enum { typedef enum {
OVAL_DATETIME_UNKNOWN = 0, OVAL_DATETIME_UNKNOWN = 0,
OVAL_DATETIME_YEAR_MONTH_DAY = 1, OVAL_DATETIME_YEAR_MONTH_DAY = 1,
OVAL_DATETIME_MONTH_DAY_YEAR = 2, OVAL_DATETIME_MONTH_DAY_YEAR = 2,
OVAL_DATETIME_DAY_MONTH_YEAR = 3, OVAL_DATETIME_DAY_MONTH_YEAR = 3,
OVAL_DATETIME_WIN_FILETIME = 4, OVAL_DATETIME_WIN_FILETIME = 4,
OVAL_DATETIME_SECONDS_SINCE_EPOCH = 5 OVAL_DATETIME_SECONDS_SINCE_EPOCH = 5
} oval_datetime_format_t; } oval_datetime_format_t;
typedef enum {
OVAL_RECORD_FIELD_UNKNOWN = 0,
OVAL_RECORD_FIELD_STATE = 1,
OVAL_RECORD_FIELD_ITEM = 2,
} oval_record_field_type_t;
/** /**
* Get the family associated with a given subtype. * Get the family associated with a given subtype.
*/ */
oval_family_t oval_subtype_get_family(oval_subtype_t); oval_family_t oval_subtype_get_family(oval_subtype_t);
const char *oval_operator_get_text(oval_operator_t); const char *oval_operator_get_text(oval_operator_t);
const char *oval_subtype_get_text(oval_subtype_t); const char *oval_subtype_get_text(oval_subtype_t);
const char *oval_family_get_text(oval_family_t); const char *oval_family_get_text(oval_family_t);
const char *oval_check_get_text(oval_check_t); const char *oval_check_get_text(oval_check_t);
const char *oval_existence_get_text(oval_existence_t); const char *oval_existence_get_text(oval_existence_t);
const char *oval_affected_family_get_text(oval_affected_family_t); const char *oval_affected_family_get_text(oval_affected_family_t);
const char *oval_datatype_get_text(oval_datatype_t); const char *oval_datatype_get_text(oval_datatype_t);
oval_datatype_t oval_datatype_from_text(const char *);
const char *oval_operation_get_text(oval_operation_t); const char *oval_operation_get_text(oval_operation_t);
const char *oval_set_operation_get_text(oval_setobject_operation_t); const char *oval_set_operation_get_text(oval_setobject_operation_t);
const char *oval_datetime_format_get_text(oval_datetime_format_t); const char *oval_datetime_format_get_text(oval_datetime_format_t);
const char *oval_arithmetic_operation_get_text(oval_arithmetic_operation_t) ; const char *oval_arithmetic_operation_get_text(oval_arithmetic_operation_t) ;
/** /**
* @struct oval_definition_model * @struct oval_definition_model
* Oval definition model * Oval definition model
*/ */
struct oval_definition_model; struct oval_definition_model;
skipping to change at line 427 skipping to change at line 436
/** /**
* @struct oval_entity * @struct oval_entity
* OVAL entity * OVAL entity
*/ */
struct oval_entity; struct oval_entity;
/** /**
* @struct oval_entity_iterator * @struct oval_entity_iterator
*/ */
struct oval_entity_iterator; struct oval_entity_iterator;
/** /**
* @struct oval_record_field
*/
struct oval_record_field;
/**
* @struct oval_record_field_iterator
*/
struct oval_record_field_iterator;
/**
* @struct oval_setobject * @struct oval_setobject
* OVAL set object * OVAL set object
*/ */
struct oval_setobject; struct oval_setobject;
/** /**
* @struct oval_setobject_iteraor * @struct oval_setobject_iteraor
* @see oval_setobject_get_subsets * @see oval_setobject_get_subsets
*/ */
struct oval_setobject_iterator; struct oval_setobject_iterator;
/** /**
skipping to change at line 2442 skipping to change at line 2459
* @name Setters * @name Setters
* @{ * @{
*/ */
/** /**
* @memberof oval_state_content * @memberof oval_state_content
*/ */
void oval_state_content_set_entity(struct oval_state_content *, struct oval _entity *); void oval_state_content_set_entity(struct oval_state_content *, struct oval _entity *);
/** /**
* @memberof oval_state_content * @memberof oval_state_content
*/ */
void oval_state_content_add_record_field(struct oval_state_content *, struc
t oval_record_field *);
/**
* @memberof oval_state_content
*/
void oval_state_content_set_varcheck(struct oval_state_content *, oval_chec k_t); void oval_state_content_set_varcheck(struct oval_state_content *, oval_chec k_t);
/** /**
* @memberof oval_state_content * @memberof oval_state_content
*/ */
void oval_state_content_set_entcheck(struct oval_state_content *, oval_chec k_t); void oval_state_content_set_entcheck(struct oval_state_content *, oval_chec k_t);
/** @} */ /** @} */
/** /**
* @name Getters * @name Getters
* @{ * @{
*/ */
/** /**
* Get entity of a state content. * Get entity of a state content.
* @return A pointer to the entity attribute of the specified @ref oval_sta te_content. * @return A pointer to the entity attribute of the specified @ref oval_sta te_content.
* @memberof oval_state_content * @memberof oval_state_content
*/ */
struct oval_entity *oval_state_content_get_entity(struct oval_state_content *); struct oval_entity *oval_state_content_get_entity(struct oval_state_content *);
/** /**
* @memberof oval_state_content
*/
struct oval_record_field_iterator *oval_state_content_get_record_fields(str
uct oval_state_content *);
/**
* Get multipe variable values processing of a state content. * Get multipe variable values processing of a state content.
* @memberof oval_state_content * @memberof oval_state_content
*/ */
oval_check_t oval_state_content_get_var_check(struct oval_state_content *); oval_check_t oval_state_content_get_var_check(struct oval_state_content *);
/** /**
* Get multipe entities processing of a state content. * Get multipe entities processing of a state content.
* @memberof oval_state_content * @memberof oval_state_content
*/ */
oval_check_t oval_state_content_get_ent_check(struct oval_state_content *); oval_check_t oval_state_content_get_ent_check(struct oval_state_content *);
/** /**
skipping to change at line 2723 skipping to change at line 2748
* @{ * @{
*/ */
/** /**
* Return <b>true</b> if the entity instance is valid * Return <b>true</b> if the entity instance is valid
* @memberof oval_entity * @memberof oval_entity
*/ */
bool oval_entity_is_valid(struct oval_entity *entity); bool oval_entity_is_valid(struct oval_entity *entity);
/** @} */ /** @} */
/** /**
* @memberof oval_record_field
*/
struct oval_record_field *oval_record_field_new(oval_record_field_type_t);
/**
* @memberof oval_record_field
*/
struct oval_record_field *oval_record_field_clone(struct oval_record_field
*);
/**
* @memberof oval_record_field
*/
void oval_record_field_free(struct oval_record_field *);
/**
* @name Setters
* @{
*/
/**
* @memberof oval_record_field
*/
void oval_record_field_set_name(struct oval_record_field *, char *);
/**
* @memberof oval_record_field
*/
void oval_record_field_set_value(struct oval_record_field *, char *);
/**
* @memberof oval_record_field
*/
void oval_record_field_set_datatype(struct oval_record_field *, oval_dataty
pe_t);
/**
* @memberof oval_record_field
*/
void oval_record_field_set_mask(struct oval_record_field *, int);
/**
* @memberof oval_record_field
*/
void oval_record_field_set_operation(struct oval_record_field *, oval_opera
tion_t);
/**
* @memberof oval_record_field
*/
void oval_record_field_set_variable(struct oval_record_field *, struct oval
_variable *);
/**
* @memberof oval_record_field
*/
void oval_record_field_set_var_check(struct oval_record_field *, oval_check
_t);
/**
* @memberof oval_record_field
*/
void oval_record_field_set_ent_check(struct oval_record_field *, oval_check
_t);
/** @} */
/**
* @name Getters
* @{
*/
/**
* @memberof oval_record_field
*/
oval_record_field_type_t oval_record_field_get_type(struct oval_record_fiel
d *);
/**
* @memberof oval_record_field
*/
char *oval_record_field_get_name(struct oval_record_field *);
/**
* @memberof oval_record_field
*/
char *oval_record_field_get_value(struct oval_record_field *);
/**
* @memberof oval_record_field
*/
oval_datatype_t oval_record_field_get_datatype(struct oval_record_field *);
/**
* @memberof oval_record_field
*/
int oval_record_field_get_mask(struct oval_record_field *);
/**
* @memberof oval_record_field
*/
oval_operation_t oval_record_field_get_operation(struct oval_record_field *
);
/**
* @memberof oval_record_field
*/
struct oval_variable *oval_record_field_get_variable(struct oval_record_fie
ld *);
/**
* @memberof oval_record_field
*/
oval_check_t oval_record_field_get_var_check(struct oval_record_field *);
/**
* @memberof oval_record_field
*/
oval_check_t oval_record_field_get_ent_check(struct oval_record_field *);
/** @} */
/**
* @name Iterators
* @{
*/
/**
* @memberof oval_record_field
*/
bool oval_record_field_iterator_has_more(struct oval_record_field_iterator
*);
/**
* @memberof oval_record_field
*/
struct oval_record_field *oval_record_field_iterator_next(struct oval_recor
d_field_iterator *);
/**
* @memberof oval_record_field
*/
void oval_record_field_iterator_free(struct oval_record_field_iterator *);
/** @} */
/**
* @name Evaluators
* @{
*/
bool oval_record_field_is_valid(struct oval_record_field *);
/** @} */
/**
* @memberof oval_filter * @memberof oval_filter
*/ */
struct oval_filter *oval_filter_new(struct oval_definition_model *); struct oval_filter *oval_filter_new(struct oval_definition_model *);
/** /**
* @memberof oval_filter * @memberof oval_filter
*/ */
void oval_filter_free(struct oval_filter *); void oval_filter_free(struct oval_filter *);
/** /**
* @memberof oval_filter * @memberof oval_filter
*/ */
skipping to change at line 2989 skipping to change at line 3132
* @memberof oval_component * @memberof oval_component
*/ */
void oval_component_set_type(struct oval_component *component, oval_compone nt_type_t type); void oval_component_set_type(struct oval_component *component, oval_compone nt_type_t type);
/** /**
* set attribute @ref Oval_component_object->object. * set attribute @ref Oval_component_object->object.
* IF component->type <> @ref OVAL_COMPONENT_OBJECTREF OR component->object <> NULL, this method does nothing . * IF component->type <> @ref OVAL_COMPONENT_OBJECTREF OR component->object <> NULL, this method does nothing .
* @memberof oval_component * @memberof oval_component
*/ */
void oval_component_set_object(struct oval_component *, struct oval_object *object); void oval_component_set_object(struct oval_component *, struct oval_object *object);
/** /**
* set attribute @ref Oval_component_object->object_field. * set attribute @ref Oval_component_object->item_field.
* IF component->type <> @ref OVAL_COMPONENT_OBJECTREF OR component->object
_field <> NULL, this method does nothing.
* OTHERWISE the method uses a copy of the field parameter to set component
->object_field
* @memberof oval_component * @memberof oval_component
*/ */
void oval_component_set_object_field(struct oval_component *, char *field); void oval_component_set_item_field(struct oval_component *, char *);
/**
* set attribute @ref Oval_component_object->record_field.
* @memberof oval_component
*/
void oval_component_set_record_field(struct oval_component *, char *);
/** /**
* set attribute @ref Oval_component_object->variable. * set attribute @ref Oval_component_object->variable.
* IF component->type <> @ref OVAL_COMPONENT_OBJECTREF OR component->variab le <> NULL, this method does nothing. * IF component->type <> @ref OVAL_COMPONENT_OBJECTREF OR component->variab le <> NULL, this method does nothing.
* @memberof oval_component * @memberof oval_component
*/ */
void oval_component_set_variable(struct oval_component *, struct oval_varia ble *variable); void oval_component_set_variable(struct oval_component *, struct oval_varia ble *variable);
/** /**
* set attribute @ref Oval_component_object->object_field.
* IF component->type <> @ref OVAL_COMPONENT_OBJECTREF OR component->object
_field <> NULL, this method does nothing.
* OTHERWISE the method uses a copy of the field parameter to set component
->object_field
* @memberof oval_component * @memberof oval_component
*/ */
void oval_component_add_function_component(struct oval_component *, struct oval_component *); //type==OVAL_COMPONENT_FUNCTION void oval_component_add_function_component(struct oval_component *, struct oval_component *); //type==OVAL_COMPONENT_FUNCTION
/** /**
* @memberof oval_component * @memberof oval_component
*/ */
void oval_component_set_arithmetic_operation(struct oval_component *, oval_ arithmetic_operation_t); //type==OVAL_COMPONENT_ARITHMETIC void oval_component_set_arithmetic_operation(struct oval_component *, oval_ arithmetic_operation_t); //type==OVAL_COMPONENT_ARITHMETIC
/** /**
* @memberof oval_component * @memberof oval_component
*/ */
skipping to change at line 3068 skipping to change at line 3211
oval_component_type_t oval_component_get_type(struct oval_component *); oval_component_type_t oval_component_get_type(struct oval_component *);
/** /**
* Returns attribute @ref Oval_component_object->object. * Returns attribute @ref Oval_component_object->object.
* IF component->type <> @ref OVAL_COMPONENT_OBJECTREF, this method shall r eturn NULL. * IF component->type <> @ref OVAL_COMPONENT_OBJECTREF, this method shall r eturn NULL.
* @return A pointer to the object attribute of the specified @ref oval_com ponent. * @return A pointer to the object attribute of the specified @ref oval_com ponent.
* @note applications should not free the @ref Oval_object returned by this method * @note applications should not free the @ref Oval_object returned by this method
* @memberof oval_component * @memberof oval_component
*/ */
struct oval_object *oval_component_get_object(struct oval_component *); //type==OVAL_COMPONENT_OBJECTREF struct oval_object *oval_component_get_object(struct oval_component *); //type==OVAL_COMPONENT_OBJECTREF
/** /**
* Returns attribute @ref Oval_component_object->object_field. * Returns attribute @ref Oval_component_object->item_field.
* IF component->type <> @ref OVAL_COMPONENT_OBJECTREF, this method shall r * @return A pointer to the item_field attribute of the specified @ref oval
eturn NULL. _component.
* @return A pointer to the object_field attribute of the specified @ref ov
al_component.
* @note applications should not free the char* returned by this method * @note applications should not free the char* returned by this method
* @memberof oval_component * @memberof oval_component
*/ */
char *oval_component_get_object_field(struct oval_component *); char *oval_component_get_item_field(struct oval_component *);
/**
* Returns attribute @ref Oval_component_object->record_field.
* @return A pointer to the record_field attribute of the specified @ref ov
al_component.
* @note applications should not free the char* returned by this method
* @memberof oval_component
*/
char *oval_component_get_record_field(struct oval_component *);
/** /**
* Returns attribute @ref Oval_component_variable->variable. * Returns attribute @ref Oval_component_variable->variable.
* IF component->type <> @ref OVAL_COMPONENT_VARREF, this method shall retu rn NULL. * IF component->type <> @ref OVAL_COMPONENT_VARREF, this method shall retu rn NULL.
* @return A pointer to the variable attribute of the specified @ref oval_c omponent. * @return A pointer to the variable attribute of the specified @ref oval_c omponent.
* @note applications should not free the @ref Oval_variable returned by th is method * @note applications should not free the @ref Oval_variable returned by th is method
* @memberof oval_component * @memberof oval_component
*/ */
struct oval_variable *oval_component_get_variable(struct oval_component *); struct oval_variable *oval_component_get_variable(struct oval_component *);
/** /**
* Returns attribute @ref Oval_function->components. * Returns attribute @ref Oval_function->components.
 End of changes. 12 change blocks. 
18 lines changed or deleted 176 lines changed or added


 oval_system_characteristics.h   oval_system_characteristics.h 
skipping to change at line 756 skipping to change at line 756
* @memberof oval_sysent * @memberof oval_sysent
*/ */
void oval_sysent_set_name(struct oval_sysent *sysent, char *name); void oval_sysent_set_name(struct oval_sysent *sysent, char *name);
/** /**
* @memberof oval_sysent * @memberof oval_sysent
*/ */
void oval_sysent_set_value(struct oval_sysent *sysent, char *value); void oval_sysent_set_value(struct oval_sysent *sysent, char *value);
/** /**
* @memberof oval_sysent * @memberof oval_sysent
*/ */
void oval_sysent_add_record_field(struct oval_sysent *, struct oval_record_
field *);
/**
* @memberof oval_sysent
*/
void oval_sysent_set_status(struct oval_sysent *sysent, oval_syschar_status _t status); void oval_sysent_set_status(struct oval_sysent *sysent, oval_syschar_status _t status);
/** /**
* @memberof oval_sysent * @memberof oval_sysent
*/ */
void oval_sysent_set_datatype(struct oval_sysent *sysent, oval_datatype_t t ype); void oval_sysent_set_datatype(struct oval_sysent *sysent, oval_datatype_t t ype);
/** /**
* @memberof oval_sysent * @memberof oval_sysent
*/ */
void oval_sysent_set_mask(struct oval_sysent *sysent, int mask); void oval_sysent_set_mask(struct oval_sysent *sysent, int mask);
/** @} */ /** @} */
skipping to change at line 784 skipping to change at line 788
*/ */
char *oval_sysent_get_name(struct oval_sysent *); char *oval_sysent_get_name(struct oval_sysent *);
/** /**
* Get system data item value. * Get system data item value.
* @memberof oval_sysent * @memberof oval_sysent
*/ */
char *oval_sysent_get_value(struct oval_sysent *); char *oval_sysent_get_value(struct oval_sysent *);
/** /**
* @memberof oval_sysent
*/
struct oval_record_field_iterator *oval_sysent_get_record_fields(struct ova
l_sysent *);
/**
* Get system data item status. * Get system data item status.
* @memberof oval_sysent * @memberof oval_sysent
*/ */
oval_syschar_status_t oval_sysent_get_status(struct oval_sysent *); oval_syschar_status_t oval_sysent_get_status(struct oval_sysent *);
/** /**
* Get system data item data type. * Get system data item data type.
* @memberof oval_sysent * @memberof oval_sysent
*/ */
oval_datatype_t oval_sysent_get_datatype(struct oval_sysent *); oval_datatype_t oval_sysent_get_datatype(struct oval_sysent *);
skipping to change at line 838 skipping to change at line 847
* @{ * @{
*/ */
/** /**
* Return <b>true</b> if the sysent instance is valid * Return <b>true</b> if the sysent instance is valid
* @memberof oval_sysent * @memberof oval_sysent
*/ */
bool oval_sysent_is_valid(struct oval_sysent *sysent); bool oval_sysent_is_valid(struct oval_sysent *sysent);
/** @} */ /** @} */
/** /**
* @name Setters
* @{
*/
/**
* @memberof oval_record_field
*/
void oval_record_field_set_status(struct oval_record_field *, oval_syschar_
status_t);
/** @} */
/**
* @name Getters
* @{
*/
/**
* @memberof oval_record_field
*/
oval_syschar_status_t oval_record_field_get_status(struct oval_record_field
*);
/** @} */
/**
* @memberof oval_message * @memberof oval_message
*/ */
struct oval_message *oval_message_new(void); struct oval_message *oval_message_new(void);
/** /**
* @return A copy of the specified @ref oval_message. * @return A copy of the specified @ref oval_message.
* @memberof oval_message * @memberof oval_message
*/ */
struct oval_message *oval_message_clone(struct oval_message *old_message); struct oval_message *oval_message_clone(struct oval_message *old_message);
/** /**
* @memberof oval_message * @memberof oval_message
 End of changes. 3 change blocks. 
0 lines changed or deleted 32 lines changed or added


 oval_types.h   oval_types.h 
skipping to change at line 176 skipping to change at line 176
typedef enum { typedef enum {
OVAL_INDEPENDENT_FAMILY = OVAL_FAMILY_INDEPENDENT + 1, OVAL_INDEPENDENT_FAMILY = OVAL_FAMILY_INDEPENDENT + 1,
OVAL_INDEPENDENT_FILE_MD5 = OVAL_FAMILY_INDEPENDENT + 2, OVAL_INDEPENDENT_FILE_MD5 = OVAL_FAMILY_INDEPENDENT + 2,
OVAL_INDEPENDENT_FILE_HASH = OVAL_FAMILY_INDEPENDENT + 3, OVAL_INDEPENDENT_FILE_HASH = OVAL_FAMILY_INDEPENDENT + 3,
OVAL_INDEPENDENT_ENVIRONMENT_VARIABLE = OVAL_FAMILY_INDEPENDENT + 4, OVAL_INDEPENDENT_ENVIRONMENT_VARIABLE = OVAL_FAMILY_INDEPENDENT + 4,
OVAL_INDEPENDENT_SQL = OVAL_FAMILY_INDEPENDENT + 5, OVAL_INDEPENDENT_SQL = OVAL_FAMILY_INDEPENDENT + 5,
OVAL_INDEPENDENT_TEXT_FILE_CONTENT_54 = OVAL_FAMILY_INDEPENDENT + 6, OVAL_INDEPENDENT_TEXT_FILE_CONTENT_54 = OVAL_FAMILY_INDEPENDENT + 6,
OVAL_INDEPENDENT_TEXT_FILE_CONTENT = OVAL_FAMILY_INDEPENDENT + 7, OVAL_INDEPENDENT_TEXT_FILE_CONTENT = OVAL_FAMILY_INDEPENDENT + 7,
OVAL_INDEPENDENT_UNKNOWN = OVAL_FAMILY_INDEPENDENT + 8, OVAL_INDEPENDENT_UNKNOWN = OVAL_FAMILY_INDEPENDENT + 8,
OVAL_INDEPENDENT_VARIABLE = OVAL_FAMILY_INDEPENDENT + 9, OVAL_INDEPENDENT_VARIABLE = OVAL_FAMILY_INDEPENDENT + 9,
OVAL_INDEPENDENT_XML_FILE_CONTENT = OVAL_FAMILY_INDEPENDENT + 10 OVAL_INDEPENDENT_XML_FILE_CONTENT = OVAL_FAMILY_INDEPENDENT + 10,
OVAL_INDEPENDENT_LDAP57 = OVAL_FAMILY_INDEPENDENT + 11,
OVAL_INDEPENDENT_LDAP = OVAL_FAMILY_INDEPENDENT + 12,
OVAL_INDEPENDENT_SQL57 = OVAL_FAMILY_INDEPENDENT + 13
} oval_independent_subtype_t; } oval_independent_subtype_t;
/// IOS subtypes /// IOS subtypes
typedef enum { typedef enum {
OVAL_IOS_GLOBAL = OVAL_FAMILY_IOS + 1, OVAL_IOS_GLOBAL = OVAL_FAMILY_IOS + 1,
OVAL_IOS_INTERFACE = OVAL_FAMILY_IOS + 2, OVAL_IOS_INTERFACE = OVAL_FAMILY_IOS + 2,
OVAL_IOS_LINE = OVAL_FAMILY_IOS + 3, OVAL_IOS_LINE = OVAL_FAMILY_IOS + 3,
OVAL_IOS_SNMP = OVAL_FAMILY_IOS + 4, OVAL_IOS_SNMP = OVAL_FAMILY_IOS + 4,
OVAL_IOS_TCLSH = OVAL_FAMILY_IOS + 5, OVAL_IOS_TCLSH = OVAL_FAMILY_IOS + 5,
OVAL_IOS_VERSION_55 = OVAL_FAMILY_IOS + 6 OVAL_IOS_VERSION_55 = OVAL_FAMILY_IOS + 6
skipping to change at line 230 skipping to change at line 233
typedef enum { typedef enum {
OVAL_UNIX_FILE = OVAL_FAMILY_UNIX + 1, OVAL_UNIX_FILE = OVAL_FAMILY_UNIX + 1,
OVAL_UNIX_INETD = OVAL_FAMILY_UNIX + 2, OVAL_UNIX_INETD = OVAL_FAMILY_UNIX + 2,
OVAL_UNIX_INTERFACE = OVAL_FAMILY_UNIX + 3, OVAL_UNIX_INTERFACE = OVAL_FAMILY_UNIX + 3,
OVAL_UNIX_PASSWORD = OVAL_FAMILY_UNIX + 4, OVAL_UNIX_PASSWORD = OVAL_FAMILY_UNIX + 4,
OVAL_UNIX_PROCESS = OVAL_FAMILY_UNIX + 5, OVAL_UNIX_PROCESS = OVAL_FAMILY_UNIX + 5,
OVAL_UNIX_RUNLEVEL = OVAL_FAMILY_UNIX + 6, OVAL_UNIX_RUNLEVEL = OVAL_FAMILY_UNIX + 6,
OVAL_UNIX_SCCS = OVAL_FAMILY_UNIX + 7, OVAL_UNIX_SCCS = OVAL_FAMILY_UNIX + 7,
OVAL_UNIX_SHADOW = OVAL_FAMILY_UNIX + 8, OVAL_UNIX_SHADOW = OVAL_FAMILY_UNIX + 8,
OVAL_UNIX_UNAME = OVAL_FAMILY_UNIX + 9, OVAL_UNIX_UNAME = OVAL_FAMILY_UNIX + 9,
OVAL_UNIX_XINETD = OVAL_FAMILY_UNIX + 10 OVAL_UNIX_XINETD = OVAL_FAMILY_UNIX + 10,
OVAL_UNIX_DNSCACHE = OVAL_FAMILY_UNIX + 11
} oval_unix_subtype_t; } oval_unix_subtype_t;
/// Windows subtypes /// Windows subtypes
typedef enum { typedef enum {
OVAL_WINDOWS_ACCESS_TOKEN = OVAL_FAMILY_WINDOWS + 1, OVAL_WINDOWS_ACCESS_TOKEN = OVAL_FAMILY_WINDOWS + 1,
OVAL_WINDOWS_ACTIVE_DIRECTORY = OVAL_FAMILY_WINDOWS + 2, OVAL_WINDOWS_ACTIVE_DIRECTORY = OVAL_FAMILY_WINDOWS + 2,
OVAL_WINDOWS_AUDIT_EVENT_POLICY = OVAL_FAMILY_WINDOWS + 3, OVAL_WINDOWS_AUDIT_EVENT_POLICY = OVAL_FAMILY_WINDOWS + 3,
OVAL_WINDOWS_AUDIT_EVENT_SUBCATEGORIES = OVAL_FAMILY_WINDOWS + 4, OVAL_WINDOWS_AUDIT_EVENT_SUBCATEGORIES = OVAL_FAMILY_WINDOWS + 4,
OVAL_WINDOWS_FILE = OVAL_FAMILY_WINDOWS + 5, OVAL_WINDOWS_FILE = OVAL_FAMILY_WINDOWS + 5,
OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS_53 = OVAL_FAMILY_WINDOWS + 6, OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS_53 = OVAL_FAMILY_WINDOWS + 6,
 End of changes. 2 change blocks. 
2 lines changed or deleted 6 lines changed or added


 xccdf_policy.h   xccdf_policy.h 
skipping to change at line 416 skipping to change at line 416
*/ */
struct xccdf_item * xccdf_policy_tailor_item(struct xccdf_policy * policy, struct xccdf_item * item); struct xccdf_item * xccdf_policy_tailor_item(struct xccdf_policy * policy, struct xccdf_item * item);
/** /**
* Return names of files that are used in checks of particular rules. Every check needs this file to be * Return names of files that are used in checks of particular rules. Every check needs this file to be
* evaluated properly. If this file will not be imported and bind to the XC CDF Policy system the result * evaluated properly. If this file will not be imported and bind to the XC CDF Policy system the result
* of rule after evaluation will be "Not checked" * of rule after evaluation will be "Not checked"
*/ */
struct oscap_stringlist * xccdf_policy_model_get_files(struct xccdf_policy_ model * policy_model); struct oscap_stringlist * xccdf_policy_model_get_files(struct xccdf_policy_ model * policy_model);
/**
* Return names of files that are used in checks of particular rules. Every
check needs this file to be
* evaluated properly. If this file will not be imported and bind to the XC
CDF Policy system the result
* of rule after evaluation will be "Not checked"
*/
struct oscap_stringlist * xccdf_item_get_files(struct xccdf_item * item);
/************************************************************/ /************************************************************/
/** @} End of Evaluators group */ /** @} End of Evaluators group */
/************************************************************/ /************************************************************/
/** /**
* @name Iterators * @name Iterators
* @{ * @{
* */ * */
/** /**
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/