oval_definitions.h   oval_definitions.h 
skipping to change at line 127 skipping to change at line 127
OVAL_CHECK_AT_LEAST_ONE = 2, OVAL_CHECK_AT_LEAST_ONE = 2,
OVAL_CHECK_NONE_EXIST = 3, OVAL_CHECK_NONE_EXIST = 3,
OVAL_CHECK_NONE_SATISFY = 4, OVAL_CHECK_NONE_SATISFY = 4,
OVAL_CHECK_ONLY_ONE = 5 OVAL_CHECK_ONLY_ONE = 5
} oval_check_t; } oval_check_t;
/// Type of object content /// Type of object content
typedef enum { typedef enum {
OVAL_OBJECTCONTENT_UNKNOWN = 0, OVAL_OBJECTCONTENT_UNKNOWN = 0,
OVAL_OBJECTCONTENT_ENTITY = 1, OVAL_OBJECTCONTENT_ENTITY = 1,
OVAL_OBJECTCONTENT_SET = 2 OVAL_OBJECTCONTENT_SET = 2,
OVAL_OBJECTCONTENT_FILTER = 3
} oval_object_content_type_t; } oval_object_content_type_t;
/// Type of OVAL entity /// Type of OVAL entity
typedef enum { typedef enum {
OVAL_ENTITY_TYPE_UNKNOWN, OVAL_ENTITY_TYPE_UNKNOWN,
OVAL_ENTITY_TYPE_ANY, OVAL_ENTITY_TYPE_ANY,
OVAL_ENTITY_TYPE_BINARY, OVAL_ENTITY_TYPE_BINARY,
OVAL_ENTITY_TYPE_BOOLEAN, OVAL_ENTITY_TYPE_BOOLEAN,
OVAL_ENTITY_TYPE_FLOAT, OVAL_ENTITY_TYPE_FLOAT,
OVAL_ENTITY_TYPE_INTEGER, OVAL_ENTITY_TYPE_INTEGER,
OVAL_ENTITY_TYPE_STRING, OVAL_ENTITY_TYPE_STRING,
} oval_entity_type_t; } oval_entity_type_t;
/// Type of filter action
typedef enum {
OVAL_FILTER_ACTION_UNKNOWN = 0,
OVAL_FILTER_ACTION_EXCLUDE,
OVAL_FILTER_ACTION_INCLUDE
} oval_filter_action_t;
/// Datatypes /// Datatypes
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,
 End of changes. 2 change blocks. 
1 lines changed or deleted 9 lines changed or added


 oval_results.h   oval_results.h 
skipping to change at line 493 skipping to change at line 493
* @memberof oval_result_test * @memberof oval_result_test
*/ */
void oval_result_test_set_result(struct oval_result_test *, oval_result_t); void oval_result_test_set_result(struct oval_result_test *, oval_result_t);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
void oval_result_test_set_instance(struct oval_result_test *test, int insta nce); void oval_result_test_set_instance(struct oval_result_test *test, int insta nce);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
void oval_result_test_set_message(struct oval_result_test *, struct oval_me ssage *); void oval_result_test_add_message(struct oval_result_test *, struct oval_me ssage *);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
void oval_result_test_add_item(struct oval_result_test *, struct oval_resul t_item *); void oval_result_test_add_item(struct oval_result_test *, struct oval_resul t_item *);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
void oval_result_test_add_binding(struct oval_result_test *, struct oval_va riable_binding *); void oval_result_test_add_binding(struct oval_result_test *, struct oval_va riable_binding *);
/** @} */ /** @} */
skipping to change at line 531 skipping to change at line 531
* @memberof oval_result_test * @memberof oval_result_test
*/ */
oval_result_t oval_result_test_get_result(struct oval_result_test *); oval_result_t oval_result_test_get_result(struct oval_result_test *);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
int oval_result_test_get_instance(struct oval_result_test *); int oval_result_test_get_instance(struct oval_result_test *);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
struct oval_message *oval_result_test_get_message(struct oval_result_test * ); struct oval_message_iterator *oval_result_test_get_messages(struct oval_res ult_test *);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
struct oval_result_item_iterator *oval_result_test_get_items(struct oval_re sult_test *); struct oval_result_item_iterator *oval_result_test_get_items(struct oval_re sult_test *);
/** /**
* @memberof oval_result_test * @memberof oval_result_test
*/ */
struct oval_variable_binding_iterator *oval_result_test_get_bindings(struct oval_result_test *); struct oval_variable_binding_iterator *oval_result_test_get_bindings(struct oval_result_test *);
/** /**
* Return <b>true</b> if the result_test instance is locked. * Return <b>true</b> if the result_test instance is locked.
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 oval_system_characteristics.h   oval_system_characteristics.h 
skipping to change at line 647 skipping to change at line 647
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
void oval_sysitem_set_status(struct oval_sysitem *, oval_syschar_status_t); void oval_sysitem_set_status(struct oval_sysitem *, oval_syschar_status_t);
/** /**
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
void oval_sysitem_set_subtype(struct oval_sysitem *sysitem, oval_subtype_t subtype); void oval_sysitem_set_subtype(struct oval_sysitem *sysitem, oval_subtype_t subtype);
/** /**
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
void oval_sysitem_set_message(struct oval_sysitem *data, char *message); void oval_sysitem_add_message(struct oval_sysitem *, struct oval_message *)
/** ;
* @memberof oval_sysitem
*/
void oval_sysitem_set_message_level(struct oval_sysitem *data, oval_message
_level_t level);
/** /**
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
void oval_sysitem_add_item(struct oval_sysitem *, struct oval_sysent *); void oval_sysitem_add_item(struct oval_sysitem *, struct oval_sysent *);
/** @} */ /** @} */
/** /**
* @name Getters * @name Getters
* @{ * @{
*/ */
skipping to change at line 681 skipping to change at line 677
oval_syschar_status_t oval_sysitem_get_status(struct oval_sysitem *); oval_syschar_status_t oval_sysitem_get_status(struct oval_sysitem *);
/** /**
* Get system data individual items. * Get system data individual items.
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
struct oval_sysent_iterator *oval_sysitem_get_items(struct oval_sysitem *); struct oval_sysent_iterator *oval_sysitem_get_items(struct oval_sysitem *);
/** /**
* Get system data message. * Get system data message.
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
char *oval_sysitem_get_message(struct oval_sysitem *); struct oval_message_iterator *oval_sysitem_get_messages(struct oval_sysitem
/** *);
* Get system data message level.
* @memberof oval_sysitem
*/
oval_message_level_t oval_sysitem_get_message_level(struct oval_sysitem *);
/** /**
* Get system data subtype. * Get system data subtype.
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
oval_subtype_t oval_sysitem_get_subtype(struct oval_sysitem *); oval_subtype_t oval_sysitem_get_subtype(struct oval_sysitem *);
/** /**
* Return <b>true</b> if the sysitem instance is locked. * Return <b>true</b> if the sysitem instance is locked.
* The state of a locked instance cannot be changed. * The state of a locked instance cannot be changed.
* @memberof oval_sysitem * @memberof oval_sysitem
*/ */
 End of changes. 2 change blocks. 
12 lines changed or deleted 4 lines changed or added


 text.h   text.h 
skipping to change at line 113 skipping to change at line 113
/// @memberof oscap_stringlist /// @memberof oscap_stringlist
struct oscap_string_iterator *oscap_stringlist_get_strings(const struct osc ap_stringlist* list); struct oscap_string_iterator *oscap_stringlist_get_strings(const struct osc ap_stringlist* list);
/// @memberof oscap_stringlist /// @memberof oscap_stringlist
struct oscap_stringlist *oscap_stringlist_clone(struct oscap_stringlist *li st); struct oscap_stringlist *oscap_stringlist_clone(struct oscap_stringlist *li st);
/// @memberof oscap_text /// @memberof oscap_text
const char *oscap_text_get_text(const struct oscap_text *text); const char *oscap_text_get_text(const struct oscap_text *text);
/// @memberof oscap_text /// @memberof oscap_text
const char *oscap_text_get_lang(const struct oscap_text *text); const char *oscap_text_get_lang(const struct oscap_text *text);
/**
* Get plaintext representation of the text.
* Caller is responsible for freeing returned string.
* @memberof oscap_text
*/
char *oscap_text_get_plaintext(const struct oscap_text *text);
/** /**
* Does this text posses a HTML content? * Does this text posses a HTML content?
* @memberof oscap_text * @memberof oscap_text
*/ */
bool oscap_text_get_is_html(const struct oscap_text *text); bool oscap_text_get_is_html(const struct oscap_text *text);
/** /**
* Can this text contain substitutions? * Can this text contain substitutions?
* @memberof oscap_text * @memberof oscap_text
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 xccdf_policy.h   xccdf_policy.h 
skipping to change at line 136 skipping to change at line 136
void xccdf_policy_import_results(struct xccdf_policy *, char *import_namesp ace, const char *file); void xccdf_policy_import_results(struct xccdf_policy *, char *import_namesp ace, const char *file);
/** /**
* Import/Export function * Import/Export function
* Not yet implemented * Not yet implemented
* @memberof xccdf_policy * @memberof xccdf_policy
*/ */
void xccdf_policy_export_results(struct xccdf_policy *, char *scoring_model _namespace, const char *file); void xccdf_policy_export_results(struct xccdf_policy *, char *scoring_model _namespace, const char *file);
/** /**
* Function to register callback for checking system * Function to register callback for checking system
* For Python use xccdf_policy_model_register_engine_callback_py
* @param model XCCDF Policy Model * @param model XCCDF Policy Model
* @param sys String representing given checking system * @param sys String representing given checking system
* @param func Callback - pointer to function called by XCCDF Policy system when rule parsed * @param func Callback - pointer to function called by XCCDF Policy system when rule parsed
* @param usr optional parameter for passing user data to callback * @param usr optional parameter for passing user data to callback
* @memberof xccdf_policy_model * @memberof xccdf_policy_model
* @return true if callback registered succesfully, false otherwise * @return true if callback registered succesfully, false otherwise
*/ */
bool xccdf_policy_model_register_engine_callback(struct xccdf_policy_model * model, char * sys, void * func, void * usr); bool xccdf_policy_model_register_engine_callback(struct xccdf_policy_model * model, char * sys, void * func, void * usr);
/** /**
* Function to register output callback for checking system that will be ca * Function to register output callback for checking system that will be ca
lled after each rule evaluation. lled AFTER each rule evaluation.
* For Python use xccdf_policy_model_register_rule_callback_py
* @param model XCCDF Policy Model * @param model XCCDF Policy Model
* @param func Callback - pointer to function called by XCCDF Policy system when rule parsed * @param func Callback - pointer to function called by XCCDF Policy system when rule parsed
* @param usr optional parameter for passing user data to callback * @param usr optional parameter for passing user data to callback
* @memberof xccdf_policy_model * @memberof xccdf_policy_model
* @return true if callback registered succesfully, false otherwise * @return true if callback registered succesfully, false otherwise
* \par Example * \par Example
* With the first function below (register output callback) user registers the callback that will be called after * With the first function below (register output callback) user registers the callback that will be called after
* wach rule evalution is done. Second callback is registered as callback f or evaluation itself and will be called * each rule evalution is done. Second callback is registered as callback f or evaluation itself and will be called
* during the evaluation. * during the evaluation.
* \code * \code
* xccdf_policy_model_register_output_callback(policy_model, callback, NULL ); * xccdf_policy_model_register_output_callback(policy_model, callback, NULL );
* xccdf_policy_model_register_engine_callback(policy_model, "http://oval.m itre.org/XMLSchema/oval-definitions-5", oval_agent_eval_rule, (void *) sess ); * xccdf_policy_model_register_engine_callback(policy_model, "http://oval.m itre.org/XMLSchema/oval-definitions-5", oval_agent_eval_rule, (void *) sess );
* \endcode * \endcode
* The example of callback: * The example of callback:
* \code * \code
* static int callback(const char *id, int result, void *arg) * static int callback(const struct oscap_reporter_message *msg, void *arg)
* { * {
* printf("The result of rule \"%s\" is: %s\n", id, xccdf_test_result_ * xccdf_test_result_type_t result = oscap_reporter_message_get_user2n
type_get_text(result)); um(msg);
* if (result == XCCDF_RESULT_NOT_SELECTED) return 0;
*
* printf("\n");
* printf("Rule ID:\r\t\t\033[1m%s\033[0;0m\n", oscap_reporter_message
_get_user1str(msg));
* printf("Title:\r\t\t%s\n", oscap_reporter_message_get_user3str(msg)
);
* printf("Result:\r\t\t\033[%sm%s\033[0m\n", RESULT_COLORS[result], x
ccdf_test_result_type_get_text((xccdf_test_result_type_t) result));
* return 0; * return 0;
* } * }
* \endcode * \endcode
*/ */
bool xccdf_policy_model_register_output_callback(struct xccdf_policy_model * model, oscap_reporter func, void * usr); bool xccdf_policy_model_register_output_callback(struct xccdf_policy_model * model, oscap_reporter func, void * usr);
/**
* Function to register start callback for checking system that will be cal
led BEFORE each rule evaluation.
* @param model XCCDF Policy Model
* @param func Callback - pointer to function called by XCCDF Policy system
when rule parsed
* @param usr optional parameter for passing user data to callback
* @memberof xccdf_policy_model
* @return true if callback registered succesfully, false otherwise
* \par Example
* With the first function below (register start callback) user registers t
he callback that will be called before
* each rule evalution is started. Second callback is registered as callbac
k for evaluation itself and will be called
* during the evaluation. Last callback is registered output callback.
* \code
* xccdf_policy_model_register_start_callback(policy_model, callback_start,
NULL);
* xccdf_policy_model_register_engine_callback(policy_model, "http://oval.m
itre.org/XMLSchema/oval-definitions-5", oval_agent_eval_rule, (void *) sess
);
* xccdf_policy_model_register_output_callback(policy_model, callback_end,
NULL);
* \endcode
* The example of callback_start:
* \code
* static int callback(const struct oscap_reporter_message *msg, void *arg)
* {
* printf("Evaluating rule \"%s\". Please wait.". oscap_reporter_messa
ge_get_user1num(msg));
* return 0;
* }
* \endcode
*/
bool xccdf_policy_model_register_start_callback(struct xccdf_policy_model *
model, oscap_reporter func, void * usr);
/************************************************************/ /************************************************************/
/** /**
* @name Getters * @name Getters
* Return value is pointer to structure's member. Do not free unless you nu ll the pointer in the structure. * Return value is pointer to structure's member. Do not free unless you nu ll the pointer in the structure.
* Use remove function otherwise. * Use remove function otherwise.
* @{ * @{
* */ * */
/** /**
* Get model from Policy (parent structure of Policy to access the benchmar k) * Get model from Policy (parent structure of Policy to access the benchmar k)
skipping to change at line 231 skipping to change at line 262
* @memberof xccdf_policy * @memberof xccdf_policy
* @return XCCDF Profile * @return XCCDF Profile
*/ */
struct xccdf_profile * xccdf_policy_get_profile(const struct xccdf_policy * ); struct xccdf_profile * xccdf_policy_get_profile(const struct xccdf_policy * );
/** /**
* Get rules from Policy * Get rules from Policy
* @memberof xccdf_policy * @memberof xccdf_policy
* @return xccdf_select_iterator * @return xccdf_select_iterator
*/ */
struct xccdf_select_iterator * xccdf_policy_get_rules(const struct xccdf_po licy *); struct xccdf_select_iterator * xccdf_policy_get_selects(const struct xccdf_ policy *);
/** /**
* Get variable name from value bindings * Get variable name from value bindings
* @memberof xccdf_value_binding * @memberof xccdf_value_binding
* @return String * @return String
*/ */
char * xccdf_value_binding_get_name(const struct xccdf_value_binding *); char * xccdf_value_binding_get_name(const struct xccdf_value_binding *);
/** /**
* Get value from value bindings * Get value from value bindings
skipping to change at line 321 skipping to change at line 352
* @memberof xccdf_policy_model * @memberof xccdf_policy_model
* @return true if policy has been added succesfully * @return true if policy has been added succesfully
*/ */
bool xccdf_policy_model_add_policy(struct xccdf_policy_model *, struct xccd f_policy *); bool xccdf_policy_model_add_policy(struct xccdf_policy_model *, struct xccd f_policy *);
/** /**
* Add rule to Policy * Add rule to Policy
* @memberof xccdf_policy * @memberof xccdf_policy
* @return true if rule has been added succesfully * @return true if rule has been added succesfully
*/ */
bool xccdf_policy_add_rule(struct xccdf_policy *, struct xccdf_select *); bool xccdf_policy_add_select(struct xccdf_policy *, struct xccdf_select *);
/** /**
* Set a new selector to the Policy structure * Set a new selector to the Policy structure
* @memberof xccdf_policy * @memberof xccdf_policy
* @return true if rule has been added succesfully * @return true if rule has been added succesfully
*/ */
bool xccdf_policy_set_selected(struct xccdf_policy * policy, char * idref); bool xccdf_policy_set_selected(struct xccdf_policy * policy, char * idref);
/** /**
* Add result to XCCDF Policy Model * Add result to XCCDF Policy Model
 End of changes. 8 change blocks. 
10 lines changed or deleted 54 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/