oscap.h   oscap.h 
skipping to change at line 180 skipping to change at line 180
/// SCAP document type identifiers /// SCAP document type identifiers
typedef enum oscap_document_type { typedef enum oscap_document_type {
OSCAP_DOCUMENT_OVAL_DEFINITIONS = 1, ///< OVAL Definitions file OSCAP_DOCUMENT_OVAL_DEFINITIONS = 1, ///< OVAL Definitions file
OSCAP_DOCUMENT_OVAL_VARIABLES, ///< OVAL Variables OSCAP_DOCUMENT_OVAL_VARIABLES, ///< OVAL Variables
OSCAP_DOCUMENT_OVAL_SYSCHAR, ///< OVAL system characteristi cs file OSCAP_DOCUMENT_OVAL_SYSCHAR, ///< OVAL system characteristi cs file
OSCAP_DOCUMENT_OVAL_RESULTS, ///< OVAL results file OSCAP_DOCUMENT_OVAL_RESULTS, ///< OVAL results file
OSCAP_DOCUMENT_OVAL_DIRECTIVES, ///< OVAL directives file OSCAP_DOCUMENT_OVAL_DIRECTIVES, ///< OVAL directives file
OSCAP_DOCUMENT_XCCDF, ///< XCCDF benchmark file OSCAP_DOCUMENT_XCCDF, ///< XCCDF benchmark file
OSCAP_DOCUMENT_CPE_LANGUAGE, ///< CPE language file OSCAP_DOCUMENT_CPE_LANGUAGE, ///< CPE language file
OSCAP_DOCUMENT_CPE_DICTIONARY, ///< CPE dictionary file OSCAP_DOCUMENT_CPE_DICTIONARY, ///< CPE dictionary file
OSCAP_DOCUMENT_SCE_RESULT, ///< SCE result file
} oscap_document_type_t; } oscap_document_type_t;
/** /**
* Validate a SCAP document file against a XML schema. * Validate a SCAP document file against a XML schema.
* *
* Schemas are searched relative to path specified by the OSCAP_SCHEMA_PATH environment variable, * Schemas are searched relative to path specified by the OSCAP_SCHEMA_PATH environment variable,
* which contains a list of colon-separated paths. * which contains a list of colon-separated paths.
* If the variable does not exist a default path is used (usually something like $PREFIX/share/openscap/schemas). * If the variable does not exist a default path is used (usually something like $PREFIX/share/openscap/schemas).
* *
* Directory structure must adhere $SCHEMA_PATH/$STANDARD/$VERSION/$SCHEMAF ILE.xsd structure, where $STANDARD * Directory structure must adhere $SCHEMA_PATH/$STANDARD/$VERSION/$SCHEMAF ILE.xsd structure, where $STANDARD
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 oval_agent_xccdf_api.h   oval_agent_xccdf_api.h 
skipping to change at line 68 skipping to change at line 68
* \code * \code
* struct oval_definition_model * def_model = oval_definition_model_import (oval_file); * struct oval_definition_model * def_model = oval_definition_model_import (oval_file);
* struct xccdf_benchmark * benchmark = xccdf_benchmark_import(file); * struct xccdf_benchmark * benchmark = xccdf_benchmark_import(file);
* struct xccdf_policy_model * policy_model = xccdf_policy_model_new(bench mark); * struct xccdf_policy_model * policy_model = xccdf_policy_model_new(bench mark);
* struct oval_agent_session * sess = oval_agent_new_session(def_model, "n ame-of-file"); * struct oval_agent_session * sess = oval_agent_new_session(def_model, "n ame-of-file");
* ... * ...
* xccdf_policy_model_register_engine_callback(policy_model, "http://oval. mitre.org/XMLSchema/oval-definitions-5", oval_agent_eval_rule, (void *) ses s); * xccdf_policy_model_register_engine_callback(policy_model, "http://oval. mitre.org/XMLSchema/oval-definitions-5", oval_agent_eval_rule, (void *) ses s);
* \endcode * \endcode
* *
*/ */
xccdf_test_result_type_t oval_agent_eval_rule (struct xccdf_policy * policy xccdf_test_result_type_t oval_agent_eval_rule(struct xccdf_policy * policy,
, const char * rule_id, const char * rule_id, const char * id, const char * href,
const char * id, const char * href, struct xccdf_value_binding_iter struct xccdf_value_binding_iterator * it,
ator * it, void * usr); struct xccdf_check_import_iterator * check_import_it,
void * usr);
/** /**
* Resolve variables from XCCDF Value Bindings and set their values to OVAL Variables * Resolve variables from XCCDF Value Bindings and set their values to OVAL Variables
* @param session OVAL Agent Session * @param session OVAL Agent Session
* @param it XCCDF Value Bindng iterator * @param it XCCDF Value Bindng iterator
* @return 0 if resolving pass * @return 0 if resolving pass
* \par Example * \par Example
* Example in oval_agent.c in function oval_agent_eval_rule * Example in oval_agent.c in function oval_agent_eval_rule
*/ */
int oval_agent_resolve_variables(struct oval_agent_session * session, struc t xccdf_value_binding_iterator *it); int oval_agent_resolve_variables(struct oval_agent_session * session, struc t xccdf_value_binding_iterator *it);
 End of changes. 1 change blocks. 
4 lines changed or deleted 5 lines changed or added


 xccdf.h   xccdf.h 
skipping to change at line 2193 skipping to change at line 2193
const char *xccdf_check_content_ref_get_href(const struct xccdf_check_conte nt_ref *ref); const char *xccdf_check_content_ref_get_href(const struct xccdf_check_conte nt_ref *ref);
/// @memberof xccdf_check_content_ref /// @memberof xccdf_check_content_ref
const char *xccdf_check_content_ref_get_name(const struct xccdf_check_conte nt_ref *ref); const char *xccdf_check_content_ref_get_name(const struct xccdf_check_conte nt_ref *ref);
/// @memberof xccdf_profile_note /// @memberof xccdf_profile_note
const char *xccdf_profile_note_get_reftag(const struct xccdf_profile_note * note); const char *xccdf_profile_note_get_reftag(const struct xccdf_profile_note * note);
/// @memberof xccdf_profile_note /// @memberof xccdf_profile_note
struct oscap_text *xccdf_profile_note_get_text(const struct xccdf_profile_n ote *note); struct oscap_text *xccdf_profile_note_get_text(const struct xccdf_profile_n ote *note);
/// @memberof xccdf_check_import /// @memberof xccdf_check_import
const char *xccdf_check_import_get_name(const struct xccdf_check_import *it em); const char *xccdf_check_import_get_name(const struct xccdf_check_import *it em);
/// @memberof xccdf_check_import /// @memberof xccdf_check_import
const char *xccdf_check_import_get_xpath(const struct xccdf_check_import *i
tem);
/// @memberof xccdf_check_import
const char *xccdf_check_import_get_content(const struct xccdf_check_import *item); const char *xccdf_check_import_get_content(const struct xccdf_check_import *item);
/// @memberof xccdf_check_export /// @memberof xccdf_check_export
const char *xccdf_check_export_get_value(const struct xccdf_check_export *i tem); const char *xccdf_check_export_get_value(const struct xccdf_check_export *i tem);
/// @memberof xccdf_check_export /// @memberof xccdf_check_export
const char *xccdf_check_export_get_name(const struct xccdf_check_export *it em); const char *xccdf_check_export_get_name(const struct xccdf_check_export *it em);
/// @memberof xccdf_fix /// @memberof xccdf_fix
const char *xccdf_fix_get_content(const struct xccdf_fix *fix); const char *xccdf_fix_get_content(const struct xccdf_fix *fix);
/// @memberof xccdf_fix /// @memberof xccdf_fix
bool xccdf_fix_get_reboot(const struct xccdf_fix *fix); bool xccdf_fix_get_reboot(const struct xccdf_fix *fix);
skipping to change at line 2627 skipping to change at line 2629
bool xccdf_check_content_ref_set_href(struct xccdf_check_content_ref *obj, const char *newval); bool xccdf_check_content_ref_set_href(struct xccdf_check_content_ref *obj, const char *newval);
/// @memberof xccdf_profile_note /// @memberof xccdf_profile_note
bool xccdf_profile_note_set_reftag(struct xccdf_profile_note *obj, const ch ar *newval); bool xccdf_profile_note_set_reftag(struct xccdf_profile_note *obj, const ch ar *newval);
/// @memberof xccdf_profile_note /// @memberof xccdf_profile_note
bool xccdf_profile_note_set_text(struct xccdf_profile_note *obj, struct osc ap_text *newval); bool xccdf_profile_note_set_text(struct xccdf_profile_note *obj, struct osc ap_text *newval);
/// @memberof xccdf_check_import /// @memberof xccdf_check_import
bool xccdf_check_import_set_name(struct xccdf_check_import *obj, const char *newval); bool xccdf_check_import_set_name(struct xccdf_check_import *obj, const char *newval);
/// @memberof xccdf_check_import /// @memberof xccdf_check_import
bool xccdf_check_import_set_xpath(struct xccdf_check_import *obj, const cha
r *newval);
/// @memberof xccdf_check_import
bool xccdf_check_import_set_content(struct xccdf_check_import *obj, const c har *newval); bool xccdf_check_import_set_content(struct xccdf_check_import *obj, const c har *newval);
/// @memberof xccdf_check_export /// @memberof xccdf_check_export
bool xccdf_check_export_set_name(struct xccdf_check_export *obj, const char *newval); bool xccdf_check_export_set_name(struct xccdf_check_export *obj, const char *newval);
/// @memberof xccdf_check_export /// @memberof xccdf_check_export
bool xccdf_check_export_set_value(struct xccdf_check_export *obj, const cha r *newval); bool xccdf_check_export_set_value(struct xccdf_check_export *obj, const cha r *newval);
/// @memberof xccdf_fix /// @memberof xccdf_fix
bool xccdf_fix_set_strategy(struct xccdf_fix *obj, xccdf_strategy_t newval) ; bool xccdf_fix_set_strategy(struct xccdf_fix *obj, xccdf_strategy_t newval) ;
/// @memberof xccdf_fix /// @memberof xccdf_fix
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 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/