cpedict.h   cpedict.h 
skipping to change at line 824 skipping to change at line 824
/************************************************************/ /************************************************************/
/** @} End of Iterators group */ /** @} End of Iterators group */
/************************************************************/ /************************************************************/
/** /**
* @name Evaluators * @name Evaluators
* @{ * @{
* */ * */
/** /**
* Get supported version of CPE dictionary XML * Get the newest supported version of CPE dictionary XML
* @return version of XML file format * @return version of XML file format
* @memberof cpe_dict_model * @memberof cpe_dict_model
*/ */
const char * cpe_dict_model_supported(void); const char * cpe_dict_model_supported(void);
/** /**
* Detects which version the given CPE file is
*
* Deallocate the result after use with "free(..)".
*/
char * cpe_dict_detect_version(const char* file);
/**
* Verify wether given CPE is known according to specified dictionary * Verify wether given CPE is known according to specified dictionary
* @memberof cpe_name * @memberof cpe_name
* @memberof cpe_dict_model * @memberof cpe_dict_model
* @param cpe CPE to verify * @param cpe CPE to verify
* @param dict used CPE dictionary * @param dict used CPE dictionary
* @return true if dictionary contains given CPE * @return true if dictionary contains given CPE
*/ */
bool cpe_name_match_dict(struct cpe_name *cpe, struct cpe_dict_model *dict) ; bool cpe_name_match_dict(struct cpe_name *cpe, struct cpe_dict_model *dict) ;
/** /**
 End of changes. 2 change blocks. 
1 lines changed or deleted 8 lines changed or added


 error.h   error.h 
skipping to change at line 30 skipping to change at line 30
/** /**
* @file * @file
* *
* @addtogroup COMMON * @addtogroup COMMON
* @{ * @{
* @addtogroup ERRORS * @addtogroup ERRORS
* @{ * @{
* Error checking mechanism. Purse of this mechanism is to inform user abou t problems that occured * Error checking mechanism. Purse of this mechanism is to inform user abou t problems that occured
* during executaion of library functions. Mechanism is similar to linux er rno variable. When the problem * during executaion of library functions. Mechanism is similar to linux er rno variable. When the problem
* raise, the information about it is stored in library buffer. This inform ation consists of error family, * raise, the information about it is stored in library buffer. This inform ation consists of error family,
* error code(detailed classification in scope of family) and textual descr iption. Example of usage: * and textual description. Example of usage:
* *
* @code * @code
* syschar = oval_probe_object_eval (pctx, object); * syschar = oval_probe_object_eval (pctx, object);
* if (syschar == NULL && oscap_err()) { * if (syschar == NULL && oscap_err()) {
* printf("Error: (%d) %s\n", oscap_err_code(), oscap_err_desc()); * printf("Error: (%d) %s\n", oscap_err_family(), oscap_err_desc());
* } * }
* oscap_clearerr() * oscap_clearerr()
* @endcode * @endcode
* *
*/ */
#pragma once #pragma once
#ifndef OSCAP_ERROR_H #ifndef OSCAP_ERROR_H
#define OSCAP_ERROR_H #define OSCAP_ERROR_H
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
/// Error family type /// Error family type
typedef uint16_t oscap_errfamily_t; typedef uint16_t oscap_errfamily_t;
/// Error code type
typedef uint16_t oscap_errcode_t;
/** /**
* @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 */ #define OSCAP_EFAMILY_SCE 6 /**< SCE errors */
/** @} */ /** @} */
/** /**
* @name OSCAP family codes
* @{
*/
#define OSCAP_ENONE 0 /**< None */
#define OSCAP_EXMLELEM 1 /**< Unknown XML element */
#define OSCAP_EINVARG 2 /**< Function called with invalid argument *
/
#define OSCAP_ENOTIMPL 254 /**< Not implemented*/
/** @} */
/**
* @name OVAL family codes
* @{
*/
#define OVAL_EOVALINT 1
#define OVAL_EPROBE 253
#define OVAL_EPROBEINVAL 254
#define OVAL_EPROBECONTEXT 255
#define OVAL_EPROBEINIT 256
#define OVAL_EPROBECONN 257
#define OVAL_EPROBENOTSUPP 258
#define OVAL_EPROBEOBJINVAL 259
#define OVAL_EPROBEITEMINVAL 260
#define OVAL_EPROBENODATA 261
#define OVAL_EPROBECLOSE 262
#define OVAL_EPROBESEND 263
#define OVAL_EPROBERECV 264
#define OVAL_EPROBEOBJTRANS 265
#define OVAL_EPROBEITEMTRANS 266
#define OVAL_EPROBEUNKNOWN 511
/** @} */
/**
* @name XCCDF family codes
* @{
*/
#define XCCDF_EREFIDCONFLICT 1 /**< Conflict in refine rules - same idre
f */
#define XCCDF_EREFGROUPATTR 2 /**< Bad attribute of group refid */
#define XCCDF_EUNKNOWNTYPE 3 /**< Bad type of xccdf item */
#define XCCDF_EUNKNOWNCB 4 /**< Unknown callback - missing registrat
ion */
#define XCCDF_EBADID 5 /**< Bad id in reference - item with that
id does not exist */
#define XCCDF_EVALUE 6 /**< Can't find referenced value instance
*/
/** @} */
/**
* Clear an error. * Clear an error.
*/ */
void oscap_clearerr(void); void oscap_clearerr(void);
/** /**
* Check for an error. * Check for an error.
*/ */
bool oscap_err(void); bool oscap_err(void);
/** /**
* Get last error family. * Get last error family.
*/ */
oscap_errfamily_t oscap_err_family(void); oscap_errfamily_t oscap_err_family(void);
/** /**
* Get last error code.
*/
oscap_errcode_t oscap_err_code(void);
/**
* Get last error description. * Get last error description.
*/ */
const char *oscap_err_desc(void); const char *oscap_err_desc(void);
#endif /* OSCAP_ERROR_H */ #endif /* OSCAP_ERROR_H */
 End of changes. 5 change blocks. 
58 lines changed or deleted 2 lines changed or added


 oscap.h   oscap.h 
skipping to change at line 181 skipping to change at line 181
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_SCE_RESULT, ///< SCE result file
OSCAP_DOCUMENT_SDS, ///< Source Data Stream file
OSCAP_DOCUMENT_ARF ///< Result Data Stream 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
* is oval, xccdf, etc., and $VERSION is a version of the standard. * is oval, xccdf, etc., and $VERSION is a version of the standard.
* *
* @param xmlfile File to be validated. * @param xmlfile File to be validated.
* @param doctype Document type represented by the file. * @param doctype Document type represented by the file.
* @param version Version of the document, use NULL for library's default. * @param version Version of the document, use NULL for library's default.
* @param reporetr A reporter to by notified of encountered issues. Can be NULL, if a binary document validates / does not validate answer is satisfac tonary. * @param reporetr A reporter to by notified of encountered issues. Can be NULL, if a binary document validates / does not validate answer is satisfac tonary.
* @param arg Argument for the reporter. * @param arg Argument for the reporter.
* @return Success or failure. * @return 0 on pass; -1 error; 1 fail
*/ */
bool oscap_validate_document(const char *xmlfile, oscap_document_type_t doc int oscap_validate_document(const char *xmlfile, oscap_document_type_t doct
type, const char *version, oscap_reporter reporter, void *arg); ype, const char *version, oscap_reporter reporter, void *arg);
/**
* Validate a SCAP document file against schematron rules.
*
* The rules are searched relative to path specified by the OSCAP_SCHEMA_PA
TH environment variable,
* 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).
*
* @param xmlfile File to be validated.
* @param doctype Document type represented by the file.
* @param version Version of the document, use NULL for library's default.
* @param outfile Report from schematron validation is written into the out
file. If NULL, stdou will be used.
* @return 0 on pass; <0 error; >0 fail
*/
int oscap_schematron_validate_document(const char *xmlfile, oscap_document_
type_t doctype, const char *version, const char *outfile);
/** /**
* Apply a XSLT stylesheet to a XML file. * Apply a XSLT stylesheet to a XML file.
* *
* Stylesheets are searched relative to path specified by the OSCAP_XSLT_PA TH environment variable, * Stylesheets are searched relative to path specified by the OSCAP_XSLT_PA TH 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).
* *
* @param xmlfile File to be transformed. * @param xmlfile File to be transformed.
* @param xsltfile XSLT filename * @param xsltfile XSLT filename
* @param outfile Result file shall be written here (NULL for stdout). * @param outfile Result file shall be written here (NULL for stdout).
* @param params list of key-value pairs to pass to the stylesheet. * @param params list of key-value pairs to pass to the stylesheet.
* @return Success or failure. * @return the number of bytes written or -1 in case of failure
*/ */
bool oscap_apply_xslt(const char *xmlfile, const char *xsltfile, const char *outfile, const char **params); int oscap_apply_xslt(const char *xmlfile, const char *xsltfile, const char *outfile, const char **params);
/** /**
* Apply XSLT stylesheet to a XML file. * Apply XSLT stylesheet to a XML file.
* *
* This function lets user specify environment variable with * This function lets user specify environment variable with
* a XSL stylesheet search path(s) and a fallback path if the variable is n ot defined. * a XSL stylesheet search path(s) and a fallback path if the variable is n ot defined.
* Except for this it is completely identical to oscap_apply_xslt(). * Except for this it is completely identical to oscap_apply_xslt().
* *
* @param xmlfile File to be transformed. * @param xmlfile File to be transformed.
* @param xsltfile XSLT filename * @param xsltfile XSLT filename
* @param outfile Result file shall be written here (NULL for stdout). * @param outfile Result file shall be written here (NULL for stdout).
* @param params list of key-value pairs to pass to the stylesheet. * @param params list of key-value pairs to pass to the stylesheet.
* @return Success or failure. * @return the number of bytes written or -1 in case of failure
*/ */
bool oscap_apply_xslt_var(const char *xmlfile, const char *xsltfile, const char *outfile, const char **params, const char *pathvar, const char *defpat h); int oscap_apply_xslt_var(const char *xmlfile, const char *xsltfile, const c har *outfile, const char **params, const char *pathvar, const char *defpath );
/************************************************************/ /************************************************************/
/** @} validation group end */ /** @} validation group end */
/** @} */ /** @} */
#endif #endif
 End of changes. 7 change blocks. 
7 lines changed or deleted 28 lines changed or added


 oval_definitions.h   oval_definitions.h 
skipping to change at line 3168 skipping to change at line 3168
*/ */
void oval_string_iterator_free(struct oval_string_iterator *); void oval_string_iterator_free(struct oval_string_iterator *);
/** @} */ /** @} */
/** /**
* @) END OVALDEF * @) END OVALDEF
*/ */
/** /**
* Returns the version of the schema this document should be validated agai nst * Returns the version of the schema this document should be validated agai nst
*
* Deallocate the result after use with "free(..)".
*/ */
xmlChar *oval_determine_document_schema_version(const char *, oscap_documen t_type_t); char *oval_determine_document_schema_version(const char *, oscap_document_t ype_t);
/** /**
* @) END OVAL * @) END OVAL
*/ */
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 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_RPMVERIFYFILE = OVAL_FAMILY_LINUX + 71, OVAL_LINUX_RPMVERIFYFILE = OVAL_FAMILY_LINUX + 71,
OVAL_LINUX_RPMVERIFYPACKAGE = OVAL_FAMILY_LINUX + 72,
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_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,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 xccdf.h   xccdf.h 
skipping to change at line 630 skipping to change at line 630
/// @memberof xccdf_version_info /// @memberof xccdf_version_info
const char* xccdf_version_info_get_version(const struct xccdf_version_info* v); const char* xccdf_version_info_get_version(const struct xccdf_version_info* v);
/// @memberof xccdf_version_info /// @memberof xccdf_version_info
const char* xccdf_version_info_get_namespace_uri(const struct xccdf_version _info* v); const char* xccdf_version_info_get_namespace_uri(const struct xccdf_version _info* v);
/// @memberof xccdf_version_info /// @memberof xccdf_version_info
const char* xccdf_version_info_get_cpe_version(const struct xccdf_version_i nfo* v); const char* xccdf_version_info_get_cpe_version(const struct xccdf_version_i nfo* v);
/** /**
* Starts parsing given XCCDF benchmark file to detect its version, * Starts parsing given XCCDF benchmark file to detect its version,
* stops as soon as the version is found * stops as soon as the version is found. Returned string should be
* freed by caller. Return NULL if error occur.
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
*/ */
const struct xccdf_version_info* xccdf_detect_version(const char* file); char * xccdf_detect_version(const char* file);
/************************************************************/ /************************************************************/
/// @memberof xccdf_item /// @memberof xccdf_item
void xccdf_item_free(struct xccdf_item *item); void xccdf_item_free(struct xccdf_item *item);
/// @memberof xccdf_item /// @memberof xccdf_item
struct xccdf_item * xccdf_item_clone(const struct xccdf_item * old_item); struct xccdf_item * xccdf_item_clone(const struct xccdf_item * old_item);
/** /**
skipping to change at line 1673 skipping to change at line 1674
* @memberof xccdf_item * @memberof xccdf_item
*/ */
const char *xccdf_item_get_extends(const struct xccdf_item *item); const char *xccdf_item_get_extends(const struct xccdf_item *item);
/** /**
* @memberof xccdf_item * @memberof xccdf_item
*/ */
struct xccdf_status_iterator *xccdf_item_get_statuses(const struct xccdf_it em *item); struct xccdf_status_iterator *xccdf_item_get_statuses(const struct xccdf_it em *item);
/** /**
* @memberof xccdf_item * @memberof xccdf_item
*/ */
struct oscap_reference_iterator *xccdf_item_get_dc_statuses(const struct xc
cdf_item *item);
/**
* @memberof xccdf_item
*/
struct oscap_reference_iterator *xccdf_item_get_references(const struct xcc df_item *item); struct oscap_reference_iterator *xccdf_item_get_references(const struct xcc df_item *item);
/** /**
* @memberof xccdf_item * @memberof xccdf_item
*/ */
struct oscap_string_iterator *xccdf_item_get_conflicts(const struct xccdf_i tem* item); struct oscap_string_iterator *xccdf_item_get_conflicts(const struct xccdf_i tem* item);
/** /**
* @memberof xccdf_item * @memberof xccdf_item
*/ */
struct oscap_stringlist_iterator *xccdf_item_get_requires(const struct xccd f_item* item); struct oscap_stringlist_iterator *xccdf_item_get_requires(const struct xccd f_item* item);
/** /**
skipping to change at line 1785 skipping to change at line 1790
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
*/ */
struct oscap_text_iterator *xccdf_benchmark_get_rear_matter(const struct xc cdf_benchmark *benchmark); struct oscap_text_iterator *xccdf_benchmark_get_rear_matter(const struct xc cdf_benchmark *benchmark);
/** /**
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
*/ */
struct xccdf_status_iterator *xccdf_benchmark_get_statuses(const struct xcc df_benchmark *benchmark); struct xccdf_status_iterator *xccdf_benchmark_get_statuses(const struct xcc df_benchmark *benchmark);
/** /**
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
*/ */
struct oscap_reference_iterator *xccdf_benchmark_get_dc_statuses(const stru
ct xccdf_benchmark *benchmark);
/**
* @memberof xccdf_benchmark
*/
struct oscap_reference_iterator *xccdf_benchmark_get_references(const struc t xccdf_benchmark *benchmark); struct oscap_reference_iterator *xccdf_benchmark_get_references(const struc t xccdf_benchmark *benchmark);
/** /**
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
*/ */
struct oscap_string_iterator *xccdf_benchmark_get_platforms(const struct xc cdf_benchmark *benchmark); struct oscap_string_iterator *xccdf_benchmark_get_platforms(const struct xc cdf_benchmark *benchmark);
/** /**
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
*/ */
xccdf_status_type_t xccdf_benchmark_get_status_current(const struct xccdf_b enchmark *benchmark); xccdf_status_type_t xccdf_benchmark_get_status_current(const struct xccdf_b enchmark *benchmark);
/** /**
skipping to change at line 1821 skipping to change at line 1830
/** /**
* Get a plain text by ID. * Get a plain text by ID.
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
* @param id ID of the plain text to get. * @param id ID of the plain text to get.
* @return Plain text content. * @return Plain text content.
* @retval NULL if given plain text does not exist * @retval NULL if given plain text does not exist
*/ */
const char *xccdf_benchmark_get_plain_text(const struct xccdf_benchmark *be nchmark, const char *id); const char *xccdf_benchmark_get_plain_text(const struct xccdf_benchmark *be nchmark, const char *id);
/** /**
* Get benchmark item by ID. * Get benchmark xccdf:Item by ID.
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
* @param item ID * @param item ID
* @return Item with given ID * @return Item with given ID
* @retval NULL if no such item exists * @retval NULL if no such item exists
*/ */
struct xccdf_item *xccdf_benchmark_get_item(const struct xccdf_benchmark *b enchmark, const char *id); struct xccdf_item *xccdf_benchmark_get_item(const struct xccdf_benchmark *b enchmark, const char *id);
/** /**
* Get a registered member of xccdf_benchmakr by ID.
* @memberof xccdf_benchmark
* @param type of member: either XCCDF_ITEM, XCCDF_PROFILE, or XCCDF_TESTRE
SULT
* @return xccdf_item with given ID and type
* @return NULL if no such member exists
*/
struct xccdf_item *xccdf_benchmark_get_member(const struct xccdf_benchmark
*benchmark, xccdf_type_t type, const char *key);
/**
* Get an iterator to the benchmark legal notices. * Get an iterator to the benchmark legal notices.
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
* @see xccdf_notice * @see xccdf_notice
*/ */
struct xccdf_notice_iterator *xccdf_benchmark_get_notices(const struct xccd f_benchmark *benchmark); struct xccdf_notice_iterator *xccdf_benchmark_get_notices(const struct xccd f_benchmark *benchmark);
/** /**
* Get an iterator to the benchmark scoring models. * Get an iterator to the benchmark scoring models.
* @memberof xccdf_benchmark * @memberof xccdf_benchmark
* @see xccdf_model * @see xccdf_model
skipping to change at line 1907 skipping to change at line 1925
* @memberof xccdf_profile * @memberof xccdf_profile
*/ */
struct oscap_string_iterator *xccdf_profile_get_platforms(const struct xccd f_profile *profile); struct oscap_string_iterator *xccdf_profile_get_platforms(const struct xccd f_profile *profile);
/** /**
* @memberof xccdf_profile * @memberof xccdf_profile
*/ */
struct xccdf_status_iterator *xccdf_profile_get_statuses(const struct xccdf _profile *profile); struct xccdf_status_iterator *xccdf_profile_get_statuses(const struct xccdf _profile *profile);
/** /**
* @memberof xccdf_profile * @memberof xccdf_profile
*/ */
struct oscap_reference_iterator *xccdf_profile_get_dc_statuses(const struct
xccdf_profile *profile);
/**
* @memberof xccdf_profile
*/
struct oscap_reference_iterator *xccdf_profile_get_references(const struct xccdf_profile *profile); struct oscap_reference_iterator *xccdf_profile_get_references(const struct xccdf_profile *profile);
/** /**
* @memberof xccdf_profile * @memberof xccdf_profile
*/ */
xccdf_status_type_t xccdf_profile_get_status_current(const struct xccdf_pro file *profile); xccdf_status_type_t xccdf_profile_get_status_current(const struct xccdf_pro file *profile);
/** /**
* @memberof xccdf_profile * @memberof xccdf_profile
*/ */
/* const char* xccdf_profile_note_get_tag(const struct xccdf_profile* profi le); TODO */ /* const char* xccdf_profile_note_get_tag(const struct xccdf_profile* profi le); TODO */
/** /**
skipping to change at line 2019 skipping to change at line 2041
* @memberof xccdf_rule * @memberof xccdf_rule
*/ */
struct oscap_string_iterator *xccdf_rule_get_platforms(const struct xccdf_r ule *rule); struct oscap_string_iterator *xccdf_rule_get_platforms(const struct xccdf_r ule *rule);
/** /**
* @memberof xccdf_rule * @memberof xccdf_rule
*/ */
struct xccdf_status_iterator *xccdf_rule_get_statuses(const struct xccdf_ru le *rule); struct xccdf_status_iterator *xccdf_rule_get_statuses(const struct xccdf_ru le *rule);
/** /**
* @memberof xccdf_rule * @memberof xccdf_rule
*/ */
struct oscap_reference_iterator *xccdf_rule_get_dc_statuses(const struct xc
cdf_rule *rule);
/**
* @memberof xccdf_rule
*/
struct oscap_reference_iterator *xccdf_rule_get_references(const struct xcc df_rule *rule); struct oscap_reference_iterator *xccdf_rule_get_references(const struct xcc df_rule *rule);
/** /**
* @memberof xccdf_rule * @memberof xccdf_rule
*/ */
xccdf_status_type_t xccdf_rule_get_status_current(const struct xccdf_rule * rule); xccdf_status_type_t xccdf_rule_get_status_current(const struct xccdf_rule * rule);
/** /**
* @memberof xccdf_rule * @memberof xccdf_rule
*/ */
const char *xccdf_rule_get_impact_metric(const struct xccdf_rule *rule); const char *xccdf_rule_get_impact_metric(const struct xccdf_rule *rule);
/** /**
skipping to change at line 2123 skipping to change at line 2149
bool xccdf_group_get_prohibit_changes(const struct xccdf_group *group); bool xccdf_group_get_prohibit_changes(const struct xccdf_group *group);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_get_hidden(const struct xccdf_group *group); bool xccdf_group_get_hidden(const struct xccdf_group *group);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_get_selected(const struct xccdf_group *group); bool xccdf_group_get_selected(const struct xccdf_group *group);
/// @memberof xccdf_group /// @memberof xccdf_group
struct oscap_string_iterator *xccdf_group_get_platforms(const struct xccdf_ group *group); struct oscap_string_iterator *xccdf_group_get_platforms(const struct xccdf_ group *group);
/// @memberof xccdf_group /// @memberof xccdf_group
struct xccdf_status_iterator *xccdf_group_get_statuses(const struct xccdf_g roup *group); struct xccdf_status_iterator *xccdf_group_get_statuses(const struct xccdf_g roup *group);
/// @memberof xccdf_group /// @memberof xccdf_group
struct oscap_reference_iterator *xccdf_group_get_dc_statuses(const struct x
ccdf_group *group);
/// @memberof xccdf_group
struct oscap_reference_iterator *xccdf_group_get_references(const struct xc cdf_group *group); struct oscap_reference_iterator *xccdf_group_get_references(const struct xc cdf_group *group);
/// @memberof xccdf_group /// @memberof xccdf_group
xccdf_status_type_t xccdf_group_get_status_current(const struct xccdf_group *group); xccdf_status_type_t xccdf_group_get_status_current(const struct xccdf_group *group);
/// @memberof xccdf_group /// @memberof xccdf_group
struct oscap_string_iterator *xccdf_group_get_conflicts(const struct xccdf_ group* group); struct oscap_string_iterator *xccdf_group_get_conflicts(const struct xccdf_ group* group);
/// @memberof xccdf_group /// @memberof xccdf_group
struct oscap_stringlist_iterator *xccdf_group_get_requires(const struct xcc df_group* group); struct oscap_stringlist_iterator *xccdf_group_get_requires(const struct xcc df_group* group);
/// @memberof xccdf_group /// @memberof xccdf_group
struct oscap_string_iterator *xccdf_group_get_metadata(const struct xccdf_g roup *group); struct oscap_string_iterator *xccdf_group_get_metadata(const struct xccdf_g roup *group);
skipping to change at line 2152 skipping to change at line 2180
bool xccdf_value_get_abstract(const struct xccdf_value *value); bool xccdf_value_get_abstract(const struct xccdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_get_prohibit_changes(const struct xccdf_value *value); bool xccdf_value_get_prohibit_changes(const struct xccdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_get_hidden(const struct xccdf_value *value); bool xccdf_value_get_hidden(const struct xccdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_get_interactive(const struct xccdf_value *value); bool xccdf_value_get_interactive(const struct xccdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
struct xccdf_status_iterator *xccdf_value_get_statuses(const struct xccdf_v alue *value); struct xccdf_status_iterator *xccdf_value_get_statuses(const struct xccdf_v alue *value);
/// @memberof xccdf_value /// @memberof xccdf_value
struct oscap_reference_iterator *xccdf_value_get_dc_statuses(const struct x
ccdf_value *value);
/// @memberof xccdf_value
struct oscap_reference_iterator *xccdf_value_get_references(const struct xc cdf_value *value); struct oscap_reference_iterator *xccdf_value_get_references(const struct xc cdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
xccdf_status_type_t xccdf_value_get_status_current(const struct xccdf_value *value); xccdf_status_type_t xccdf_value_get_status_current(const struct xccdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
xccdf_value_type_t xccdf_value_get_type(const struct xccdf_value *value); xccdf_value_type_t xccdf_value_get_type(const struct xccdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
xccdf_interface_hint_t xccdf_value_get_interface_hint(const struct xccdf_va lue *value); xccdf_interface_hint_t xccdf_value_get_interface_hint(const struct xccdf_va lue *value);
/// @memberof xccdf_value /// @memberof xccdf_value
xccdf_operator_t xccdf_value_get_oper(const struct xccdf_value *value); xccdf_operator_t xccdf_value_get_oper(const struct xccdf_value *value);
/// @memberof xccdf_value /// @memberof xccdf_value
skipping to change at line 2941 skipping to change at line 2971
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_description(struct xccdf_benchmark *item, struct o scap_text *newval); bool xccdf_benchmark_add_description(struct xccdf_benchmark *item, struct o scap_text *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_platform(struct xccdf_benchmark *item, const char *newval); bool xccdf_benchmark_add_platform(struct xccdf_benchmark *item, const char *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_reference(struct xccdf_benchmark *item, struct osc ap_reference *newval); bool xccdf_benchmark_add_reference(struct xccdf_benchmark *item, struct osc ap_reference *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_status(struct xccdf_benchmark *item, struct xccdf_ status *newval); bool xccdf_benchmark_add_status(struct xccdf_benchmark *item, struct xccdf_ status *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_dc_status(struct xccdf_benchmark *item, struct osc
ap_reference *newval);
/// @memberof xccdf_benchmark
bool xccdf_benchmark_add_title(struct xccdf_benchmark *item, struct oscap_t ext *newval); bool xccdf_benchmark_add_title(struct xccdf_benchmark *item, struct oscap_t ext *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_front_matter(struct xccdf_benchmark *item, struct oscap_text *newval); bool xccdf_benchmark_add_front_matter(struct xccdf_benchmark *item, struct oscap_text *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
//bool xccdf_benchmark_add_item(struct xccdf_benchmark *item, struct xccdf_ item *newval); //bool xccdf_benchmark_add_item(struct xccdf_benchmark *item, struct xccdf_ item *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_model(struct xccdf_benchmark *item, struct xccdf_m odel *newval); bool xccdf_benchmark_add_model(struct xccdf_benchmark *item, struct xccdf_m odel *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
bool xccdf_benchmark_add_notice(struct xccdf_benchmark *item, struct xccdf_ notice *newval); bool xccdf_benchmark_add_notice(struct xccdf_benchmark *item, struct xccdf_ notice *newval);
/// @memberof xccdf_benchmark /// @memberof xccdf_benchmark
skipping to change at line 2983 skipping to change at line 3015
/// @memberof xccdf_profile /// @memberof xccdf_profile
bool xccdf_profile_add_description(struct xccdf_profile *item, struct oscap _text *newval); bool xccdf_profile_add_description(struct xccdf_profile *item, struct oscap _text *newval);
/// @memberof xccdf_profile /// @memberof xccdf_profile
bool xccdf_profile_add_platform(struct xccdf_profile *item, const char *new val); bool xccdf_profile_add_platform(struct xccdf_profile *item, const char *new val);
/// @memberof xccdf_profile /// @memberof xccdf_profile
bool xccdf_profile_add_reference(struct xccdf_profile *item, struct oscap_r eference *newval); bool xccdf_profile_add_reference(struct xccdf_profile *item, struct oscap_r eference *newval);
/// @memberof xccdf_profile /// @memberof xccdf_profile
bool xccdf_profile_add_status(struct xccdf_profile *item, struct xccdf_stat us *newval); bool xccdf_profile_add_status(struct xccdf_profile *item, struct xccdf_stat us *newval);
/// @memberof xccdf_profile /// @memberof xccdf_profile
bool xccdf_profile_add_dc_status(struct xccdf_profile *item, struct oscap_r
eference *newval);
/// @memberof xccdf_profile
bool xccdf_profile_add_title(struct xccdf_profile *item, struct oscap_text *newval); bool xccdf_profile_add_title(struct xccdf_profile *item, struct oscap_text *newval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_description(struct xccdf_rule *item, struct oscap_text *newval); bool xccdf_rule_add_description(struct xccdf_rule *item, struct oscap_text *newval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_platform(struct xccdf_rule *item, const char *newval); bool xccdf_rule_add_platform(struct xccdf_rule *item, const char *newval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_question(struct xccdf_rule *item, struct oscap_text *ne wval); bool xccdf_rule_add_question(struct xccdf_rule *item, struct oscap_text *ne wval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_rationale(struct xccdf_rule *item, struct oscap_text *n ewval); bool xccdf_rule_add_rationale(struct xccdf_rule *item, struct oscap_text *n ewval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_reference(struct xccdf_rule *item, struct oscap_referen ce *newval); bool xccdf_rule_add_reference(struct xccdf_rule *item, struct oscap_referen ce *newval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_status(struct xccdf_rule *item, struct xccdf_status *ne wval); bool xccdf_rule_add_status(struct xccdf_rule *item, struct xccdf_status *ne wval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_dc_status(struct xccdf_rule *item, struct oscap_referen
ce *newval);
/// @memberof xccdf_rule
bool xccdf_rule_add_title(struct xccdf_rule *item, struct oscap_text *newva l); bool xccdf_rule_add_title(struct xccdf_rule *item, struct oscap_text *newva l);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_warning(struct xccdf_rule *item, struct xccdf_warning * newval); bool xccdf_rule_add_warning(struct xccdf_rule *item, struct xccdf_warning * newval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_ident(struct xccdf_rule *item, struct xccdf_ident *newv al); bool xccdf_rule_add_ident(struct xccdf_rule *item, struct xccdf_ident *newv al);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_check(struct xccdf_rule *item, struct xccdf_check *newv al); bool xccdf_rule_add_check(struct xccdf_rule *item, struct xccdf_check *newv al);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_profile_note(struct xccdf_rule *item, struct xccdf_prof ile_note *newval); bool xccdf_rule_add_profile_note(struct xccdf_rule *item, struct xccdf_prof ile_note *newval);
/// @memberof xccdf_rule /// @memberof xccdf_rule
skipping to change at line 3025 skipping to change at line 3061
bool xccdf_group_add_platform(struct xccdf_group *item, const char *newval) ; bool xccdf_group_add_platform(struct xccdf_group *item, const char *newval) ;
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_question(struct xccdf_group *item, struct oscap_text * newval); bool xccdf_group_add_question(struct xccdf_group *item, struct oscap_text * newval);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_rationale(struct xccdf_group *item, struct oscap_text *newval); bool xccdf_group_add_rationale(struct xccdf_group *item, struct oscap_text *newval);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_reference(struct xccdf_group *item, struct oscap_refer ence *newval); bool xccdf_group_add_reference(struct xccdf_group *item, struct oscap_refer ence *newval);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_status(struct xccdf_group *item, struct xccdf_status * newval); bool xccdf_group_add_status(struct xccdf_group *item, struct xccdf_status * newval);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_dc_status(struct xccdf_group *item, struct oscap_refer
ence *newval);
/// @memberof xccdf_group
bool xccdf_group_add_title(struct xccdf_group *item, struct oscap_text *new val); bool xccdf_group_add_title(struct xccdf_group *item, struct oscap_text *new val);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_warning(struct xccdf_group *item, struct xccdf_warning *newval); bool xccdf_group_add_warning(struct xccdf_group *item, struct xccdf_warning *newval);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_rule(struct xccdf_group *group, struct xccdf_rule *ite m); bool xccdf_group_add_rule(struct xccdf_group *group, struct xccdf_rule *ite m);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_group(struct xccdf_group *group, struct xccdf_group *i tem); bool xccdf_group_add_group(struct xccdf_group *group, struct xccdf_group *i tem);
/// @memberof xccdf_group /// @memberof xccdf_group
bool xccdf_group_add_value(struct xccdf_group *group, struct xccdf_value *i tem); bool xccdf_group_add_value(struct xccdf_group *group, struct xccdf_value *i tem);
/// @memberof xccdf_group /// @memberof xccdf_group
skipping to change at line 3046 skipping to change at line 3084
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_add_description(struct xccdf_value *item, struct oscap_tex t *newval); bool xccdf_value_add_description(struct xccdf_value *item, struct oscap_tex t *newval);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_add_question(struct xccdf_value *item, struct oscap_text * newval); bool xccdf_value_add_question(struct xccdf_value *item, struct oscap_text * newval);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_add_reference(struct xccdf_value *item, struct oscap_refer ence *newval); bool xccdf_value_add_reference(struct xccdf_value *item, struct oscap_refer ence *newval);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_add_status(struct xccdf_value *item, struct xccdf_status * newval); bool xccdf_value_add_status(struct xccdf_value *item, struct xccdf_status * newval);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_add_dc_status(struct xccdf_value *item, struct oscap_refer
ence *newval);
/// @memberof xccdf_value
bool xccdf_value_add_title(struct xccdf_value *item, struct oscap_text *new val); bool xccdf_value_add_title(struct xccdf_value *item, struct oscap_text *new val);
/// @memberof xccdf_value /// @memberof xccdf_value
bool xccdf_value_add_warning(struct xccdf_value *item, struct xccdf_warning *newval); bool xccdf_value_add_warning(struct xccdf_value *item, struct xccdf_warning *newval);
/// @memberof xccdf_check /// @memberof xccdf_check
bool xccdf_check_add_import(struct xccdf_check *obj, struct xccdf_check_imp ort *item); bool xccdf_check_add_import(struct xccdf_check *obj, struct xccdf_check_imp ort *item);
/// @memberof xccdf_check /// @memberof xccdf_check
bool xccdf_check_add_export(struct xccdf_check *obj, struct xccdf_check_exp ort *item); bool xccdf_check_add_export(struct xccdf_check *obj, struct xccdf_check_exp ort *item);
/// @memberof xccdf_check /// @memberof xccdf_check
bool xccdf_check_add_content_ref(struct xccdf_check *obj, struct xccdf_chec k_content_ref *item); bool xccdf_check_add_content_ref(struct xccdf_check *obj, struct xccdf_chec k_content_ref *item);
skipping to change at line 3107 skipping to change at line 3147
bool xccdf_item_add_description(struct xccdf_item *item, struct oscap_text *newval); bool xccdf_item_add_description(struct xccdf_item *item, struct oscap_text *newval);
/// @memberof xccdf_item /// @memberof xccdf_item
bool xccdf_item_add_platform(struct xccdf_item *item, const char *newval); bool xccdf_item_add_platform(struct xccdf_item *item, const char *newval);
/// @memberof xccdf_item /// @memberof xccdf_item
bool xccdf_item_add_question(struct xccdf_item *item, struct oscap_text *ne wval); bool xccdf_item_add_question(struct xccdf_item *item, struct oscap_text *ne wval);
/// @memberof xccdf_item /// @memberof xccdf_item
bool xccdf_item_add_rationale(struct xccdf_item *item, struct oscap_text *n ewval); bool xccdf_item_add_rationale(struct xccdf_item *item, struct oscap_text *n ewval);
/// @memberof xccdf_item /// @memberof xccdf_item
bool xccdf_item_add_reference(struct xccdf_item *item, struct oscap_referen ce *newval); bool xccdf_item_add_reference(struct xccdf_item *item, struct oscap_referen ce *newval);
/// @memberof xccdf_item /// @memberof xccdf_item
bool xccdf_item_add_dc_status(struct xccdf_item *item, struct oscap_referen
ce *newval);
/// @memberof xccdf_item
bool xccdf_item_add_status(struct xccdf_item *item, struct xccdf_status *ne wval); bool xccdf_item_add_status(struct xccdf_item *item, struct xccdf_status *ne wval);
/// @memberof xccdf_item /// @memberof xccdf_item
bool xccdf_item_add_title(struct xccdf_item *item, struct oscap_text *newva l); bool xccdf_item_add_title(struct xccdf_item *item, struct oscap_text *newva l);
/// @memberof xccdf_item /// @memberof xccdf_item
bool xccdf_item_add_warning(struct xccdf_item *item, struct xccdf_warning * newval); bool xccdf_item_add_warning(struct xccdf_item *item, struct xccdf_warning * newval);
/// @memberof xccdf_refine_rule /// @memberof xccdf_refine_rule
bool xccdf_refine_rule_add_remark(struct xccdf_refine_rule *obj, struct osc ap_text *item); bool xccdf_refine_rule_add_remark(struct xccdf_refine_rule *obj, struct osc ap_text *item);
/// @memberof xccdf_rule /// @memberof xccdf_rule
bool xccdf_rule_add_requires(struct xccdf_rule *rule, struct oscap_stringli st *requires); bool xccdf_rule_add_requires(struct xccdf_rule *rule, struct oscap_stringli st *requires);
 End of changes. 16 change blocks. 
3 lines changed or deleted 59 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/