error.h   error.h 
skipping to change at line 63 skipping to change at line 63
/** /**
* @name OpenSCAP error families * @name OpenSCAP error families
* @{ * @{
*/ */
#define OSCAP_EFAMILY_NONE 0 /**< None */ #define OSCAP_EFAMILY_NONE 0 /**< None */
#define OSCAP_EFAMILY_GLIBC 1 /**< Errno errors */ #define OSCAP_EFAMILY_GLIBC 1 /**< Errno errors */
#define OSCAP_EFAMILY_XML 2 /**< Libxml errors */ #define OSCAP_EFAMILY_XML 2 /**< Libxml errors */
#define OSCAP_EFAMILY_OSCAP 3 /**< OSCAP general errors */ #define OSCAP_EFAMILY_OSCAP 3 /**< OSCAP general errors */
#define OSCAP_EFAMILY_OVAL 4 /**< OVAL errors (OVAL & probes) */ #define OSCAP_EFAMILY_OVAL 4 /**< OVAL errors (OVAL & probes) */
#define OSCAP_EFAMILY_XCCDF 5 /**< XCCDF errors */ #define OSCAP_EFAMILY_XCCDF 5 /**< XCCDF errors */
#define OSCAP_EFAMILY_SCE 6 /**< SCE errors */
/** @} */ /** @} */
/** /**
* @name OSCAP family codes * @name OSCAP family codes
* @{ * @{
*/ */
#define OSCAP_ENONE 0 /**< None */ #define OSCAP_ENONE 0 /**< None */
#define OSCAP_EXMLELEM 1 /**< Unknown XML element */ #define OSCAP_EXMLELEM 1 /**< Unknown XML element */
#define OSCAP_EINVARG 2 /**< Function called with invalid argument * / #define OSCAP_EINVARG 2 /**< Function called with invalid argument * /
#define OSCAP_ENOTIMPL 254 /**< Not implemented*/ #define OSCAP_ENOTIMPL 254 /**< Not implemented*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 oval_agent_api.h   oval_agent_api.h 
skipping to change at line 63 skipping to change at line 63
typedef struct oval_agent_session oval_agent_session_t; typedef struct oval_agent_session oval_agent_session_t;
/** /**
* Create new session for OVAL agent from OVAL definition model * Create new session for OVAL agent from OVAL definition model
* @param model OVAL Definition model * @param model OVAL Definition model
* @param name Name of file that can be referenced from XCCDF Benchmark * @param name Name of file that can be referenced from XCCDF Benchmark
*/ */
oval_agent_session_t * oval_agent_new_session(struct oval_definition_model * model, const char * name); oval_agent_session_t * oval_agent_new_session(struct oval_definition_model * model, const char * name);
/** /**
* Set a generator template for the provided agent session. The
* template should be used for all newly created OVAL documents. If
* there already are some models in the session, they are modified as
* well.
*/
void oval_agent_set_generator_template(oval_agent_session_t *, struct oval_
generator *);
/**
* Get the current generator template from the session.
*/
struct oval_generator *oval_agent_get_generator_template(oval_agent_session
_t *);
/**
* Probe the system and evaluate specified definition * Probe the system and evaluate specified definition
* @return 0 on success; -1 error; 1 warning * @return 0 on success; -1 error; 1 warning
*/ */
int oval_agent_eval_definition(oval_agent_session_t *, const char *); int oval_agent_eval_definition(oval_agent_session_t *, const char *);
/** /**
* Get the OVAL result of a definition from an agent session * Get the OVAL result of a definition from an agent session
* @return 0 on success; -1 error * @return 0 on success; -1 error
*/ */
int oval_agent_get_definition_result(oval_agent_session_t *, const char *, oval_result_t *); int oval_agent_get_definition_result(oval_agent_session_t *, const char *, oval_result_t *);
 End of changes. 1 change blocks. 
0 lines changed or deleted 15 lines changed or added


 oval_agent_xccdf_api.h   oval_agent_xccdf_api.h 
skipping to change at line 91 skipping to change at line 91
/** /**
* Function to register predefined oval callback for XCCDF evaluation procc ess * Function to register predefined oval callback for XCCDF evaluation procc ess
* @param model XCCDF Policy Model * @param model XCCDF Policy Model
* @param sess oval_agent_session_t parameter for passing session data to c allback * @param sess oval_agent_session_t parameter for passing session data to c allback
* @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_oval(struct xccdf_policy_model * mo del, struct oval_agent_session * sess); bool xccdf_policy_model_register_engine_oval(struct xccdf_policy_model * mo del, struct oval_agent_session * sess);
/** /**
* @deprecated
* Transform OVAL Sysinfo into XCCDF Test Result * Transform OVAL Sysinfo into XCCDF Test Result
* This function has been deprecated, please use xccdf_result_fill_sysinfo(
..) instead
*
* @param session OVAL Agent session * @param session OVAL Agent session
* @param ritem XCCDF Result * @param ritem XCCDF Result
*/ */
void oval_agent_export_sysinfo_to_xccdf_result(struct oval_agent_session * session, struct xccdf_result * ritem); void oval_agent_export_sysinfo_to_xccdf_result(struct oval_agent_session * session, struct xccdf_result * ritem);
/** /**
* @) END OVALDEF * @) END OVALDEF
* @) END OVALAGENT * @) END OVALAGENT
*/ */
#endif /**OVAL_AGENT_XCCDF_API_H_ */ #endif /**OVAL_AGENT_XCCDF_API_H_ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 oval_definitions.h   oval_definitions.h 
skipping to change at line 2362 skipping to change at line 2362
* @return A copy of the specified @ref oval_value. * @return A copy of the specified @ref oval_value.
* @memberof oval_value * @memberof oval_value
*/ */
struct oval_value *oval_value_clone(struct oval_value *old_value); struct oval_value *oval_value_clone(struct oval_value *old_value);
/** /**
* @memberof oval_value * @memberof oval_value
*/ */
void oval_value_free(struct oval_value *); void oval_value_free(struct oval_value *);
/** /**
* @name Setters
* @{
*/
/**
* @memberof oval_value
*/
void oval_value_set_datatype(struct oval_value *, oval_datatype_t);
/**
* @name Getters * @name Getters
* @{ * @{
*/ */
/** /**
* Get OVAL value datatype. * Get OVAL value datatype.
* @memberof oval_value * @memberof oval_value
*/ */
oval_datatype_t oval_value_get_datatype(struct oval_value *); oval_datatype_t oval_value_get_datatype(struct oval_value *);
/** /**
* Get OVAL value as a text. * Get OVAL value as a text.
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 oval_types.h   oval_types.h 
skipping to change at line 204 skipping to change at line 204
/// Linux subtypes /// Linux subtypes
typedef enum { typedef enum {
OVAL_LINUX_DPKG_INFO = OVAL_FAMILY_LINUX + 1, OVAL_LINUX_DPKG_INFO = OVAL_FAMILY_LINUX + 1,
OVAL_LINUX_INET_LISTENING_SERVERS = OVAL_FAMILY_LINUX + 2, OVAL_LINUX_INET_LISTENING_SERVERS = OVAL_FAMILY_LINUX + 2,
OVAL_LINUX_RPM_INFO = OVAL_FAMILY_LINUX + 3, OVAL_LINUX_RPM_INFO = OVAL_FAMILY_LINUX + 3,
OVAL_LINUX_SLACKWARE_PKG_INFO_TEST = OVAL_FAMILY_LINUX + 4, OVAL_LINUX_SLACKWARE_PKG_INFO_TEST = OVAL_FAMILY_LINUX + 4,
OVAL_LINUX_PARTITION = OVAL_FAMILY_LINUX + 5, OVAL_LINUX_PARTITION = OVAL_FAMILY_LINUX + 5,
OVAL_LINUX_IFLISTENERS = OVAL_FAMILY_LINUX + 6, OVAL_LINUX_IFLISTENERS = OVAL_FAMILY_LINUX + 6,
OVAL_LINUX_RPMVERIFY = OVAL_FAMILY_LINUX + 7, OVAL_LINUX_RPMVERIFY = OVAL_FAMILY_LINUX + 7,
OVAL_LINUX_SELINUXBOOLEAN = OVAL_FAMILY_LINUX + 8, OVAL_LINUX_SELINUXBOOLEAN = OVAL_FAMILY_LINUX + 8,
OVAL_LINUX_SELINUXSECURITYCONTEXT = OVAL_FAMILY_LINUX + 9 OVAL_LINUX_SELINUXSECURITYCONTEXT = OVAL_FAMILY_LINUX + 9,
OVAL_LINUX_INET_LISTENING_SERVER = OVAL_FAMILY_LINUX + 102,
} oval_linux_subtype_t; } oval_linux_subtype_t;
/// MacOS subtypes /// MacOS subtypes
typedef enum { typedef enum {
OVAL_MACOS_ACCOUNT_INFO = OVAL_FAMILY_MACOS + 1, OVAL_MACOS_ACCOUNT_INFO = OVAL_FAMILY_MACOS + 1,
OVAL_MACOS_INET_LISTENING_SERVERS = OVAL_FAMILY_MACOS + 2, OVAL_MACOS_INET_LISTENING_SERVERS = OVAL_FAMILY_MACOS + 2,
OVAL_MACOS_NVRAM_INFO = OVAL_FAMILY_MACOS + 3, OVAL_MACOS_NVRAM_INFO = OVAL_FAMILY_MACOS + 3,
OVAL_MACOS_PWPOLICY = OVAL_FAMILY_MACOS + 4 OVAL_MACOS_PWPOLICY = OVAL_FAMILY_MACOS + 4
} oval_macos_subtype_t; } oval_macos_subtype_t;
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 xccdf.h   xccdf.h 
skipping to change at line 675 skipping to change at line 675
/** /**
* Export a benchmark to an XML stream * Export a benchmark to an XML stream
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
* @return Integer * @return Integer
* @retval -1 if error occurred * @retval -1 if error occurred
*/ */
int xccdf_benchmark_export(struct xccdf_benchmark *benchmark, const char *f ile); int xccdf_benchmark_export(struct xccdf_benchmark *benchmark, const char *f ile);
/** /**
* Collect system info and store it in the TestResult.
* @memberof xccdf_result
*/
void xccdf_result_fill_sysinfo(struct xccdf_result *result);
/**
* Export a TestResult to an XML stream * Export a TestResult to an XML stream
* @memberof xccdf_result * @memberof xccdf_result
* @return Integer * @return Integer
* @retval -1 if error occurred * @retval -1 if error occurred
*/ */
int xccdf_result_export(struct xccdf_result *result, const char *file); int xccdf_result_export(struct xccdf_result *result, const char *file);
/** /**
* Resolve an benchmark. * Resolve an benchmark.
* @returns whether the resolving process has been successful * @returns whether the resolving process has been successful
 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 410 skipping to change at line 410
/** /**
* Clone the item and tailor it against given policy (profile) * Clone the item and tailor it against given policy (profile)
* @param policy Policy with profile * @param policy Policy with profile
* @param item XCCDF item to be tailored * @param item XCCDF item to be tailored
* @return new item that has to be freed by user * @return new item that has to be freed by user
*/ */
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);
/** /**
* xccdf_policy_model_get_files and xccdf_item_get_files each return oscap_
file_entries instead of raw strings
*/
struct oscap_file_entry;
/// @memberof oscap_file_entry
struct oscap_file_entry *oscap_file_entry_new(void);
/// @memberof oscap_file_entry
struct oscap_file_entry *oscap_file_entry_dup(struct oscap_file_entry* file
_entry);
/// @memberof oscap_file_entry
void oscap_file_entry_free(struct oscap_file_entry* entry);
/// @memberof oscap_file_entry
const char* oscap_file_entry_get_system(struct oscap_file_entry* entry);
/// @memberof oscap_file_entry
const char* oscap_file_entry_get_file(struct oscap_file_entry* entry);
/** @struct oscap_file_entry_iterator
* @see oscap_iterator
*/
struct oscap_file_entry_iterator;
/// @memberof oscap_file_entry_iterator
const struct oscap_file_entry *oscap_file_entry_iterator_next(struct oscap_
file_entry_iterator *it);
/// @memberof oscap_file_entry_iterator
bool oscap_file_entry_iterator_has_more(struct oscap_file_entry_iterator *i
t);
/// @memberof oscap_file_entry_iterator
void oscap_file_entry_iterator_free(struct oscap_file_entry_iterator *it);
/// @memberof oscap_file_entry_iterator
void oscap_file_entry_iterator_reset(struct oscap_file_entry_iterator *it);
/** @struct oscap_file_entry_list
* @see oscap_list
*/
struct oscap_file_entry_list;
/// @memberof oscap_file_entry_list
struct oscap_file_entry_list* oscap_file_entry_list_new(void);
/// @memberof oscap_file_entry_list
void oscap_file_entry_list_free(struct oscap_file_entry_list* list);
/// @memberof oscap_file_entry_list
struct oscap_file_entry_iterator* oscap_file_entry_list_get_files(struct os
cap_file_entry_list* list);
/**
* 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"
*
*
* The resulting list should be freed with oscap_filelist_free.
*/
struct oscap_file_entry_list * xccdf_policy_model_get_systems_and_files(str
uct 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"
*
* The resulting list should be freed with oscap_filelist_free.
*/
struct oscap_file_entry_list * xccdf_item_get_systems_and_files(struct xccd
f_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 * 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"
 End of changes. 1 change blocks. 
0 lines changed or deleted 72 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/