| xccdf_benchmark.h | | xccdf_benchmark.h | |
| | | | |
| skipping to change at line 1400 | | skipping to change at line 1400 | |
| /** | | /** | |
| * Return true if the list is not empty, false otherwise | | * Return true if the list is not empty, false otherwise | |
| * @memberof xccdf_warning_iterator | | * @memberof xccdf_warning_iterator | |
| */ | | */ | |
| bool xccdf_warning_iterator_has_more(struct xccdf_warning_iterator *it); | | bool xccdf_warning_iterator_has_more(struct xccdf_warning_iterator *it); | |
| /** | | /** | |
| * Free the iterator structure (it makes no changes to the list structure) | | * Free the iterator structure (it makes no changes to the list structure) | |
| * @memberof xccdf_warning_iterator | | * @memberof xccdf_warning_iterator | |
| */ | | */ | |
| void xccdf_warning_iterator_free(struct xccdf_warning_iterator *it); | | void xccdf_warning_iterator_free(struct xccdf_warning_iterator *it); | |
|
| | | /** | |
| | | * Reset the iterator structure (it makes no changes to the underlying list | |
| | | ) | |
| | | * @memberof xccdf_warning_iterator | |
| | | */ | |
| | | void xccdf_warning_iterator_reset(struct xccdf_warning_iterator *it); | |
| | | | |
| /** | | /** | |
| * Return the next xccdf_instance structure from the list and increment the
iterator | | * Return the next xccdf_instance structure from the list and increment the
iterator | |
| * @memberof xccdf_instance_iterator | | * @memberof xccdf_instance_iterator | |
| */ | | */ | |
| struct xccdf_instance *xccdf_instance_iterator_next(struct xccdf_instance_i
terator *it); | | struct xccdf_instance *xccdf_instance_iterator_next(struct xccdf_instance_i
terator *it); | |
| /** | | /** | |
| * Return true if the list is not empty, false otherwise | | * Return true if the list is not empty, false otherwise | |
| * @memberof xccdf_instance_iterator | | * @memberof xccdf_instance_iterator | |
| */ | | */ | |
| | | | |
| skipping to change at line 3307 | | skipping to change at line 3312 | |
| void xccdf_identity_iterator_remove(struct xccdf_identity_iterator *it); | | void xccdf_identity_iterator_remove(struct xccdf_identity_iterator *it); | |
| /// @memberof xccdf_score_iterator | | /// @memberof xccdf_score_iterator | |
| void xccdf_score_iterator_remove(struct xccdf_score_iterator *it); | | void xccdf_score_iterator_remove(struct xccdf_score_iterator *it); | |
| /// @memberof xccdf_target_fact_iterator | | /// @memberof xccdf_target_fact_iterator | |
| void xccdf_target_fact_iterator_remove(struct xccdf_target_fact_iterator *i
t); | | void xccdf_target_fact_iterator_remove(struct xccdf_target_fact_iterator *i
t); | |
| /// @memberof xccdf_target_identifier_iterator | | /// @memberof xccdf_target_identifier_iterator | |
| void xccdf_target_identifier_iterator_remove(struct xccdf_target_identifier
_iterator *it); | | void xccdf_target_identifier_iterator_remove(struct xccdf_target_identifier
_iterator *it); | |
| /// @memberof xccdf_value_instance_iterator | | /// @memberof xccdf_value_instance_iterator | |
| void xccdf_value_instance_iterator_remove(struct xccdf_value_instance_itera
tor *it); | | void xccdf_value_instance_iterator_remove(struct xccdf_value_instance_itera
tor *it); | |
| | | | |
|
| // reset iterators | | | |
| /// @memberof xccdf_plain_text_iterator | | | |
| void xccdf_plain_text_iterator_reset(struct xccdf_plain_text_iterator *it); | | | |
| /// @memberof xccdf_warning_iterator | | | |
| void xccdf_warning_iterator_reset(struct xccdf_warning_iterator *it); | | | |
| /// @memberof xccdf_value_instance_iterator | | | |
| void xccdf_value_instance_iterator_reset(struct xccdf_value_instance_iterat | | | |
| or *it); | | | |
| /// @memberof xccdf_result_iterator | | | |
| void xccdf_result_iterator_reset(struct xccdf_result_iterator *it); | | | |
| /// @memberof xccdf_override_iterator | | | |
| void xccdf_override_iterator_reset(struct xccdf_override_iterator *it); | | | |
| /// @memberof xccdf_message_iterator | | | |
| void xccdf_message_iterator_reset(struct xccdf_message_iterator *it); | | | |
| /// @memberof xccdf_instance_iterator | | | |
| void xccdf_instance_iterator_reset(struct xccdf_instance_iterator *it); | | | |
| /// @memberof xccdf_rule_result_iterator | | | |
| void xccdf_rule_result_iterator_reset(struct xccdf_rule_result_iterator *it | | | |
| ); | | | |
| /// @memberof xccdf_identity_iterator | | | |
| void xccdf_identity_iterator_reset(struct xccdf_identity_iterator *it); | | | |
| /// @memberof xccdf_score_iterator | | | |
| void xccdf_score_iterator_reset(struct xccdf_score_iterator *it); | | | |
| /// @memberof xccdf_target_fact_iterator | | | |
| void xccdf_target_fact_iterator_reset(struct xccdf_target_fact_iterator *it | | | |
| ); | | | |
| | | | |
| // textual substitution interface | | // textual substitution interface | |
| | | | |
| /** | | /** | |
| * Type of textual substitution | | * Type of textual substitution | |
| * @deprecated This type is deprecated. It is not flexible enough to be app
lied on XCCDF 1.2+ | | * @deprecated This type is deprecated. It is not flexible enough to be app
lied on XCCDF 1.2+ | |
| * documents. Please use @ref xml_iterate module instead. | | * documents. Please use @ref xml_iterate module instead. | |
| */ | | */ | |
| typedef enum xccdf_subst_type { | | typedef enum xccdf_subst_type { | |
| XCCDF_SUBST_NONE, | | XCCDF_SUBST_NONE, | |
| XCCDF_SUBST_SUB, ///< substitute cdf:sub element | | XCCDF_SUBST_SUB, ///< substitute cdf:sub element | |
| | | | |
End of changes. 2 change blocks. |
| 27 lines changed or deleted | | 6 lines changed or added | |
|
| xccdf_session.h | | xccdf_session.h | |
| | | | |
| skipping to change at line 212 | | skipping to change at line 212 | |
| | | | |
| /** | | /** | |
| * Set whether the OVAL result files shall be exported. | | * Set whether the OVAL result files shall be exported. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @param to_export_oval_results whether to export results or not. | | * @param to_export_oval_results whether to export results or not. | |
| */ | | */ | |
| void xccdf_session_set_oval_results_export(struct xccdf_session *session, b
ool to_export_oval_results); | | void xccdf_session_set_oval_results_export(struct xccdf_session *session, b
ool to_export_oval_results); | |
| | | | |
| /** | | /** | |
|
| | | * Set that check engine plugin's result files shall be exported. | |
| | | * @memberof xccdf_session | |
| | | * @param session XCCDF Session | |
| | | * @param to_export_results whether to export results from check engine plu | |
| | | gins or not. | |
| | | */ | |
| | | void xccdf_session_set_check_engine_plugins_results_export(struct xccdf_ses | |
| | | sion *session, bool to_export_results); | |
| | | | |
| | | /** | |
| * Set that SCE reult files shall be exported. | | * Set that SCE reult files shall be exported. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @param to_export_sce_results whether to export SCE results or not. | | * @param to_export_sce_results whether to export SCE results or not. | |
| */ | | */ | |
|
| void xccdf_session_set_sce_results_export(struct xccdf_session *session, bo
ol to_export_sce_results); | | OSCAP_DEPRECATED(void xccdf_session_set_sce_results_export(struct xccdf_ses
sion *session, bool to_export_sce_results)); | |
| | | | |
| /** | | /** | |
| * Set whether the OVAL variables files shall be exported. | | * Set whether the OVAL variables files shall be exported. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @param to_export_oval_variables whether to export results or not. | | * @param to_export_oval_variables whether to export results or not. | |
| */ | | */ | |
| void xccdf_session_set_oval_variables_export(struct xccdf_session *session,
bool to_export_oval_variables); | | void xccdf_session_set_oval_variables_export(struct xccdf_session *session,
bool to_export_oval_variables); | |
| | | | |
| /** | | /** | |
| | | | |
| skipping to change at line 281 | | skipping to change at line 289 | |
| * Get Source DataStream index of the session. | | * Get Source DataStream index of the session. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @warning This is applicable only on sessions which are SDS. NULL is retu
rned | | * @warning This is applicable only on sessions which are SDS. NULL is retu
rned | |
| * otherwise. | | * otherwise. | |
| * @return sds index | | * @return sds index | |
| */ | | */ | |
| struct ds_sds_index *xccdf_session_get_sds_idx(struct xccdf_session *sessio
n); | | struct ds_sds_index *xccdf_session_get_sds_idx(struct xccdf_session *sessio
n); | |
| | | | |
| /** | | /** | |
| * Load and parse all XCCDF structures needed to evaluate this session. Thi
s is | | * Load and parse all XCCDF structures needed to evaluate this session. Thi
s is | |
|
| * only a placeholder for load_xccdf, load_cpe, load_oval and load_sce func
tions. | | * only a placeholder for load_xccdf, load_cpe, load_oval and load_check_en
gine_plugins functions. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @returns zero on success | | * @returns zero on success | |
| */ | | */ | |
| int xccdf_session_load(struct xccdf_session *session); | | int xccdf_session_load(struct xccdf_session *session); | |
| | | | |
| /** | | /** | |
| * Load and parse XCCDF file. If the file upon which is based this session
is | | * Load and parse XCCDF file. If the file upon which is based this session
is | |
| * Source DataStream use functions @ref xccdf_session_set_datastream_id and | | * Source DataStream use functions @ref xccdf_session_set_datastream_id and | |
| * @ref xccdf_session_set_component_id to select particular component withi
n | | * @ref xccdf_session_set_component_id to select particular component withi
n | |
| | | | |
| skipping to change at line 320 | | skipping to change at line 328 | |
| | | | |
| /** | | /** | |
| * Load and parse OVAL definitions files for the XCCDF session. | | * Load and parse OVAL definitions files for the XCCDF session. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @returns zero on success | | * @returns zero on success | |
| */ | | */ | |
| int xccdf_session_load_oval(struct xccdf_session *session); | | int xccdf_session_load_oval(struct xccdf_session *session); | |
| | | | |
| /** | | /** | |
|
| * Load Script Check Engine (if available) to the XCCDF session. | | * Load extra check engine from a plugin of given name to the XCCDF session | |
| | | . | |
| | | * | |
| | | * Extra check engines are in loadable shared objects. This function is | |
| | | * designed to be called !after! xccdf_session_load has been called. | |
| | | * XCCDF has to have already been loaded for this to work because the callb | |
| | | acks | |
| | | * are registered as part of this function! | |
| | | * | |
| | | * @memberof xccdf_session | |
| | | * @param session XCCDF Session | |
| | | * @returns zero on success | |
| | | */ | |
| | | int xccdf_session_load_check_engine_plugin(struct xccdf_session *session, c | |
| | | onst char* plugin_name); | |
| | | | |
| | | /** | |
| | | * Load extra check engines (if any are available) to the XCCDF session. | |
| | | * | |
| | | * Extra check engines are in loadable shared objects and this function | |
| | | * searches if any such are available and loads them if they are. | |
| | | * | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @returns zero on success | | * @returns zero on success | |
| */ | | */ | |
|
| int xccdf_session_load_sce(struct xccdf_session *session); | | int xccdf_session_load_check_engine_plugins(struct xccdf_session *session); | |
| | | | |
| | | /** | |
| | | * @deprecated | |
| | | * SCE is no longer part of the main openscap library, | |
| | | * use xccdf_session_load_check_engine_plugins instead. | |
| | | */ | |
| | | OSCAP_DEPRECATED(int xccdf_session_load_sce(struct xccdf_session *session)) | |
| | | ; | |
| | | | |
| /** | | /** | |
| * Load Tailoring file (if applicable) to the XCCDF session. | | * Load Tailoring file (if applicable) to the XCCDF session. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @returns zero on success | | * @returns zero on success | |
| */ | | */ | |
| int xccdf_session_load_tailoring(struct xccdf_session *session); | | int xccdf_session_load_tailoring(struct xccdf_session *session); | |
| | | | |
| /** | | /** | |
| | | | |
| skipping to change at line 360 | | skipping to change at line 393 | |
| | | | |
| /** | | /** | |
| * Export OVAL (result and variables) files. | | * Export OVAL (result and variables) files. | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @returns zero on success | | * @returns zero on success | |
| */ | | */ | |
| int xccdf_session_export_oval(struct xccdf_session *session); | | int xccdf_session_export_oval(struct xccdf_session *session); | |
| | | | |
| /** | | /** | |
|
| | | * Export results (if any) from any check engine plugins that are loaded | |
| | | * | |
| | | * Only applicable if enabled by @ref xccdf_session_set_check_engine_plugin | |
| | | s_results_export). | |
| | | * @memberof xccdf_session | |
| | | * @param session XCCDF Session | |
| | | * @returns zero on success | |
| | | */ | |
| | | int xccdf_session_export_check_engine_plugins(struct xccdf_session *session | |
| | | ); | |
| | | | |
| | | /** | |
| * Export SCE files (if enabled by @ref xccdf_session_set_sce_results_expor
t). | | * Export SCE files (if enabled by @ref xccdf_session_set_sce_results_expor
t). | |
|
| | | * | |
| | | * @deprecated Please use xccdf_session_export_check_engine_plugins instead | |
| | | . | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @returns zero on success | | * @returns zero on success | |
| */ | | */ | |
|
| int xccdf_session_export_sce(struct xccdf_session *session); | | OSCAP_DEPRECATED(int xccdf_session_export_sce(struct xccdf_session *session
)); | |
| | | | |
| /** | | /** | |
| * Export ARF (if enabled by @ref xccdf_session_set_arf_export). | | * Export ARF (if enabled by @ref xccdf_session_set_arf_export). | |
| * @memberof xccdf_session | | * @memberof xccdf_session | |
| * @param session XCCDF Session | | * @param session XCCDF Session | |
| * @returns zero on success | | * @returns zero on success | |
| */ | | */ | |
| int xccdf_session_export_arf(struct xccdf_session *session); | | int xccdf_session_export_arf(struct xccdf_session *session); | |
| | | | |
| /** | | /** | |
| | | | |
End of changes. 8 change blocks. |
| 5 lines changed or deleted | | 59 lines changed or added | |
|