diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2009-08-26 15:14:32 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2009-08-26 15:14:32 +0000 |
| commit | 7231771856e6750e52e3b1bcf496439f82721dbe (patch) | |
| tree | 7d8011df9334ef423beeae93af3ba908a2007937 | |
| parent | b7632414116603a04e8472a77cf4e9bf0f2e29a0 (diff) | |
| download | lasso-7231771856e6750e52e3b1bcf496439f82721dbe.tar.gz lasso-7231771856e6750e52e3b1bcf496439f82721dbe.tar.xz lasso-7231771856e6750e52e3b1bcf496439f82721dbe.zip | |
All: Rework include files handling, separated ID-WSF code from SAML2/ID-FF code
* nearly all C files: change includes for relative paths.
* lasso/id-wsf/id_wsf.h, lasso/id-wsf-2.0/id_wsf_2.h: add top level
public include files for ID-WSF 1.0 and ID-WSF 2.0.
* lasso/id-ff/server.*, lasso/id-ff/session.*, lasso/id-ff/identity.*:
remove most of the code related to ID-WSF and push into
lasso/id-wsf/id_ff_extensions.* and lasso/id-wsf-2.0/identity.c,
lasso/id-wsf-2.0/server.c, lasso/id-wsf-2.0/session.c.
* lasso/id-wsf-2.0/saml2_login.c,
lasso/id-wsf-2.0/saml2_login_private.h: same change but for ID-WSF
2.0 support in SAML2 SSO profile.
491 files changed, 2160 insertions, 1713 deletions
diff --git a/lasso/errors.c b/lasso/errors.c index daa850c7..d6e7a899 100644 --- a/lasso/errors.c +++ b/lasso/errors.c @@ -23,8 +23,8 @@ */ #include <glib/gstrfuncs.h> -#include <lasso/errors.h> -#include <lasso/xml/xml.h> +#include "errors.h" +#include "xml/xml.h" /* WARNING!!!: This is a generated file do not modify it, add new error message * a comments inside errors.h */ diff --git a/lasso/errors.c.in b/lasso/errors.c.in index ed3c1c22..25c09f6c 100644 --- a/lasso/errors.c.in +++ b/lasso/errors.c.in @@ -23,8 +23,8 @@ */ #include <glib/gstrfuncs.h> -#include <lasso/errors.h> -#include <lasso/xml/xml.h> +#include "errors.h" +#include "xml/xml.h" /* WARNING!!!: This is a generated file do not modify it, add new error message * a comments inside errors.h */ diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c index b22cc210..56ffe08d 100644 --- a/lasso/id-ff/defederation.c +++ b/lasso/id-ff/defederation.c @@ -29,13 +29,13 @@ **/ #include "../xml/private.h" -#include <lasso/id-ff/defederation.h> +#include "defederation.h" -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/sessionprivate.h> -#include <lasso/id-ff/identityprivate.h> -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/serverprivate.h> +#include "providerprivate.h" +#include "sessionprivate.h" +#include "identityprivate.h" +#include "profileprivate.h" +#include "serverprivate.h" #include "../xml/private.h" #include "../utils.h" diff --git a/lasso/id-ff/defederation.h b/lasso/id-ff/defederation.h index 360650d8..da9d255d 100644 --- a/lasso/id-ff/defederation.h +++ b/lasso/id-ff/defederation.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> -#include <lasso/xml/lib_federation_termination_notification.h> +#include "profile.h" +#include "../xml/lib_federation_termination_notification.h" #define LASSO_TYPE_DEFEDERATION (lasso_defederation_get_type()) #define LASSO_DEFEDERATION(obj) \ diff --git a/lasso/id-ff/federation.c b/lasso/id-ff/federation.c index 7e34cbd2..aeec836d 100644 --- a/lasso/id-ff/federation.c +++ b/lasso/id-ff/federation.c @@ -29,10 +29,10 @@ **/ #include "../xml/private.h" -#include <lasso/id-ff/federation.h> -#include <lasso/id-ff/provider.h> +#include "federation.h" +#include "provider.h" -#include <lasso/xml/saml-2.0/saml2_name_id.h> +#include "../xml/saml-2.0/saml2_name_id.h" struct _LassoFederationPrivate { diff --git a/lasso/id-ff/federation.h b/lasso/id-ff/federation.h index b0c83959..bd372218 100644 --- a/lasso/id-ff/federation.h +++ b/lasso/id-ff/federation.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/saml_name_identifier.h> +#include "../xml/xml.h" +#include "../xml/saml_name_identifier.h" #define LASSO_TYPE_FEDERATION (lasso_federation_get_type()) #define LASSO_FEDERATION(obj) \ diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c index 12c03285..06078e4d 100644 --- a/lasso/id-ff/identity.c +++ b/lasso/id-ff/identity.c @@ -31,24 +31,13 @@ #include "../xml/private.h" #include <config.h> #include "../utils.h" -#include <lasso/id-ff/identity.h> +#include "identity.h" #ifdef LASSO_WSF_ENABLED -#include <lasso/id-wsf/identity.h> -#include <lasso/id-wsf-2.0/identity.h> +#include "../id-wsf/id_ff_extensions.h" #endif -#include <lasso/id-ff/identityprivate.h> - -struct _LassoIdentityPrivate -{ - gboolean dispose_has_run; -#ifdef LASSO_WSF_ENABLED - guint last_entry_id; - GHashTable *resource_offerings_map; /* of LassoDiscoResourceOffering */ - GList *svcMDID; /* of char* */ -#endif -}; +#include "identityprivate.h" /*****************************************************************************/ /* public methods */ @@ -136,152 +125,6 @@ lasso_identity_destroy(LassoIdentity *identity) lasso_node_destroy(LASSO_NODE(identity)); } -#ifdef LASSO_WSF_ENABLED -/** - * lasso_identity_add_resource_offering: - * @identity: a #LassoIdentity object - * @offering: a #LassoDiscoResourceOffering object to add - * - * Add a new offering to the identity object to be retrieved later by - * lasso_identity_get_offerings() or lasso_identity_get_resource_offering(). - * It also allocate an entryId identifier for the offering, look into - * offering->entryID to get it after this call. - * - * Return value: Always 0, there should not be any error (if memory is not exhausted). - */ -gint -lasso_identity_add_resource_offering(LassoIdentity *identity, - LassoDiscoResourceOffering *offering) -{ - char entry_id_s[20]; - - g_return_val_if_fail(LASSO_IS_IDENTITY(identity), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - g_return_val_if_fail(LASSO_IS_DISCO_RESOURCE_OFFERING(offering), - LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - - do { - g_snprintf(entry_id_s, 18, "%d", identity->private_data->last_entry_id); - identity->private_data->last_entry_id++; - } while (g_hash_table_lookup(identity->private_data->resource_offerings_map, entry_id_s)); - lasso_assign_string(offering->entryID, entry_id_s); - g_hash_table_insert(identity->private_data->resource_offerings_map, - g_strdup(offering->entryID), g_object_ref(offering)); - identity->is_dirty = TRUE; - - return 0; -} - -/** - * lasso_identity_remove_resource_offering: - * @identity: a #LassoIdentity - * @entryID: the resource offering entry ID - * - * Remove resource offering about identity with @entryID - * - * Return value: TRUE on success; FALSE if the offering was not found. - **/ -gboolean -lasso_identity_remove_resource_offering(LassoIdentity *identity, const char *entryID) -{ - g_return_val_if_fail(LASSO_IS_IDENTITY(identity), FALSE); - g_return_val_if_fail(entryID != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - - if (g_hash_table_remove(identity->private_data->resource_offerings_map, entryID)) { - identity->is_dirty = TRUE; - return TRUE; - } else { - return FALSE; - } -} - - -/* Context type for the callback add_matching_resource_offering_to_list */ -struct HelperStruct { - GList *list; - const char *service_type; -}; - -/* - * Helper function for lasso_identity_get_offerings, match them with a service - * type string */ -static -void add_matching_resource_offering_to_list(G_GNUC_UNUSED char *name, LassoDiscoResourceOffering *offering, - struct HelperStruct *ctx) -{ - if (ctx->service_type == NULL || - ( offering->ServiceInstance != NULL && - offering->ServiceInstance->ServiceType != NULL && - strcmp(offering->ServiceInstance->ServiceType, ctx->service_type) == 0)) { - lasso_list_add_gobject(ctx->list, offering); - } -} - -/** - * lasso_identity_get_offerings: - * @identity: a #LassoIdentity - * @service_type: a char* string representing the type of service we are looking for - * - * Returns a list of #LassoDiscoResourceOffering associated to this service type. - * - * Return value: a newly allocated list of #LassoDiscoResourceOffering - */ -GList* -lasso_identity_get_offerings(LassoIdentity *identity, const char *service_type) -{ - struct HelperStruct ctx = { NULL, service_type }; - - g_return_val_if_fail(LASSO_IS_IDENTITY(identity), NULL); - - g_hash_table_foreach(identity->private_data->resource_offerings_map, - (GHFunc)add_matching_resource_offering_to_list, &ctx); - - return ctx.list; -} - -/** - * lasso_identity_resource_offering: - * @identity: a #LassoIdentity - * @entryID: the entryID of the researched #LassoDiscoResourceOffering - * - * Lookup a #LassoDiscoResourceOffering corresponding to entryID, entryID is - * usually allocated by lasso_identity_add_resource_offering() inside - * offering->entryID. - * - * Return value: a #LassoDiscoResourceOffering, your must ref it if you intend - * to keep it around. - */ -LassoDiscoResourceOffering* -lasso_identity_get_resource_offering(LassoIdentity *identity, const char *entryID) -{ - g_return_val_if_fail(LASSO_IS_IDENTITY(identity), NULL); - g_return_val_if_fail(entryID != NULL, NULL); - - return g_hash_table_lookup(identity->private_data->resource_offerings_map, entryID); -} - -gint -lasso_identity_add_svc_md_id(LassoIdentity *identity, gchar *svcMDID) -{ - g_return_val_if_fail(LASSO_IS_IDENTITY(identity), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - g_return_val_if_fail(svcMDID != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - - identity->private_data->svcMDID = g_list_append( - identity->private_data->svcMDID, g_strdup(svcMDID)); - identity->is_dirty = TRUE; - - return 0; -} - -GList* -lasso_identity_get_svc_md_ids(LassoIdentity *identity) -{ - g_return_val_if_fail(LASSO_IS_IDENTITY(identity), NULL); - - return identity->private_data->svcMDID; -} - -#endif - /*****************************************************************************/ /* private methods */ diff --git a/lasso/id-ff/identity.h b/lasso/id-ff/identity.h index 82396c05..9987e162 100644 --- a/lasso/id-ff/identity.h +++ b/lasso/id-ff/identity.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/id-ff/federation.h> +#include "../xml/xml.h" +#include "federation.h" #define LASSO_TYPE_IDENTITY (lasso_identity_get_type()) #define LASSO_IDENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDENTITY, LassoIdentity)) diff --git a/lasso/id-ff/identityprivate.h b/lasso/id-ff/identityprivate.h index 67086a50..01d0cbf2 100644 --- a/lasso/id-ff/identityprivate.h +++ b/lasso/id-ff/identityprivate.h @@ -29,6 +29,18 @@ extern "C" { #endif /* __cplusplus */ +#include "config.h" + +struct _LassoIdentityPrivate +{ + gboolean dispose_has_run; +#ifdef LASSO_WSF_ENABLED + guint last_entry_id; + GHashTable *resource_offerings_map; /* of LassoDiscoResourceOffering */ + GList *svcMDID; /* of char* */ +#endif +}; + gint lasso_identity_add_federation(LassoIdentity *identity, LassoFederation *federation); gint lasso_identity_remove_federation(LassoIdentity *identity, const char *providerID); diff --git a/lasso/id-ff/lecp.c b/lasso/id-ff/lecp.c index 3660897a..0466a4f3 100644 --- a/lasso/id-ff/lecp.c +++ b/lasso/id-ff/lecp.c @@ -32,8 +32,8 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <lasso/id-ff/lecp.h> -#include <lasso/id-ff/profileprivate.h> +#include "lecp.h" +#include "profileprivate.h" #include "../utils.h" #include "../utils.h" diff --git a/lasso/id-ff/lecp.h b/lasso/id-ff/lecp.h index e9139d43..d99466ac 100644 --- a/lasso/id-ff/lecp.h +++ b/lasso/id-ff/lecp.h @@ -29,12 +29,12 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml/xml.h" -#include <lasso/xml/lib_authn_request_envelope.h> -#include <lasso/xml/lib_authn_response_envelope.h> +#include "../xml/lib_authn_request_envelope.h" +#include "../xml/lib_authn_response_envelope.h" -#include <lasso/id-ff/login.h> +#include "login.h" #define LASSO_TYPE_LECP (lasso_lecp_get_type()) #define LASSO_LECP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LECP, LassoLecp)) diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c index c679cd55..2ef92d06 100644 --- a/lasso/id-ff/login.c +++ b/lasso/id-ff/login.c @@ -143,39 +143,38 @@ * </example> */ -#include "../xml/private.h" #include <xmlsec/base64.h> #include <config.h> -#include <lasso/xml/lib_authentication_statement.h> -#include <lasso/xml/lib_subject.h> -#include <lasso/xml/saml_advice.h> -#include <lasso/xml/saml_attribute.h> -#include <lasso/xml/saml_attribute_value.h> -#include <lasso/xml/saml_audience_restriction_condition.h> -#include <lasso/xml/saml_conditions.h> -#include <lasso/xml/samlp_response.h> -#include <lasso/xml/saml-2.0/saml2_encrypted_element.h> +#include "lasso_config.h" +#include "../utils.h" +#include "../debug.h" +#include "login.h" +#include "provider.h" +#include "../xml/private.h" +#include "../xml/lib_authentication_statement.h" +#include "../xml/lib_subject.h" +#include "../xml/saml_advice.h" +#include "../xml/saml_attribute.h" +#include "../xml/saml_attribute_value.h" +#include "../xml/saml_audience_restriction_condition.h" +#include "../xml/saml_conditions.h" +#include "../xml/samlp_response.h" +#include "../xml/saml-2.0/saml2_encrypted_element.h" + + +#include "profileprivate.h" +#include "providerprivate.h" +#include "serverprivate.h" +#include "sessionprivate.h" +#include "identityprivate.h" +#include "loginprivate.h" +#include "../saml-2.0/loginprivate.h" #ifdef LASSO_WSF_ENABLED -#include <lasso/xml/disco_description.h> -#include <lasso/xml/disco_resource_offering.h> -#include <lasso/xml/disco_service_instance.h> +#include "../id-wsf/id_ff_extensions_private.h" #endif -#include <lasso/id-ff/login.h> -#include <lasso/id-ff/provider.h> - -#include "./profileprivate.h" -#include "./providerprivate.h" -#include "./serverprivate.h" -#include "./sessionprivate.h" -#include "./identityprivate.h" -#include "./loginprivate.h" -#include "../saml-2.0/loginprivate.h" -#include "../utils.h" -#include "../debug.h" - static void lasso_login_build_assertion_artifact(LassoLogin *login); @@ -184,52 +183,6 @@ static void lasso_login_build_assertion_artifact(LassoLogin *login); /*****************************************************************************/ -#ifdef LASSO_WSF_ENABLED -/** - * lasso_login_assertion_add_discovery: - * @login: a #LassoLogin - * @assertion: - * - * Adds AttributeStatement and ResourceOffering attributes to assertion if - * there is a discovery service. - **/ -static void -lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *assertion) -{ - LassoProfile *profile = LASSO_PROFILE(login); - LassoDiscoResourceOffering *resourceOffering; - LassoDiscoServiceInstance *serviceInstance, *newServiceInstance; - LassoSamlAttributeStatement *attributeStatement; - LassoSamlAttribute *attribute; - LassoSamlAttributeValue *attributeValue; - - serviceInstance = lasso_server_get_service(profile->server, LASSO_DISCO_HREF); - if (LASSO_IS_DISCO_SERVICE_INSTANCE(serviceInstance) && - login->private_data->resourceId) { - newServiceInstance = lasso_disco_service_instance_copy(serviceInstance); - - resourceOffering = lasso_disco_resource_offering_new(newServiceInstance); - lasso_release_gobject(newServiceInstance); - lasso_assign_gobject(resourceOffering->ResourceID, login->private_data->resourceId); - - attributeValue = lasso_saml_attribute_value_new(); - lasso_list_add_new_gobject(attributeValue->any, resourceOffering); - - attribute = lasso_saml_attribute_new(); - lasso_assign_string(attribute->attributeName, "DiscoveryResourceOffering"); - lasso_assign_string(attribute->attributeNameSpace, LASSO_DISCO_HREF); - lasso_list_add_new_gobject(attribute->AttributeValue, attributeValue); - - attributeStatement = lasso_saml_attribute_statement_new(); - lasso_list_add_new_gobject(attributeStatement->Attribute, attribute); - - lasso_assign_new_gobject(assertion->AttributeStatement, attributeStatement); - - /* FIXME: Add CredentialsRef and saml:Advice Assertions */ - } -} -#endif - /** * lasso_login_build_assertion: @@ -2018,57 +1971,6 @@ lasso_login_process_response_msg(LassoLogin *login, gchar *response_msg) } -#ifdef LASSO_WSF_ENABLED -/** - * lasso_login_set_encryptedResourceId: - * @login: a #LassoLogin - * @encryptedResourceId: - * - * ... - * - * Return value: 0 on success; or a negative value otherwise. - **/ -int -lasso_login_set_encryptedResourceId(LassoLogin *login, - LassoDiscoEncryptedResourceID *encryptedResourceId) -{ - g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - g_return_val_if_fail(LASSO_IS_DISCO_ENCRYPTED_RESOURCE_ID(encryptedResourceId), - LASSO_PARAM_ERROR_INVALID_VALUE); - - lasso_assign_gobject(login->private_data->encryptedResourceId, encryptedResourceId); - - return 0; -} -#endif - - -#ifdef LASSO_WSF_ENABLED -/** - * lasso_login_set_resourceId: - * @login: a #LassoLogin - * @content: - * - * ... - * - * Return value: 0 on success; or a negative value otherwise. - **/ -int -lasso_login_set_resourceId(LassoLogin *login, const char *content) -{ - g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - g_return_val_if_fail(content != NULL, LASSO_PARAM_ERROR_INVALID_VALUE); - - lasso_assign_new_gobject(login->private_data->resourceId, lasso_disco_resource_id_new(content)); - return 0; -} -#else -int -lasso_login_set_resourceId(G_GNUC_UNUSED LassoLogin *login, G_GNUC_UNUSED const char *content) -{ - return LASSO_ERROR_UNIMPLEMENTED; -} -#endif /*****************************************************************************/ /* private methods */ diff --git a/lasso/id-ff/login.h b/lasso/id-ff/login.h index 8aa858eb..24c777d4 100644 --- a/lasso/id-ff/login.h +++ b/lasso/id-ff/login.h @@ -30,21 +30,13 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/lasso_config.h> -#ifdef LASSO_WSF_ENABLED -#include <lasso/xml/disco_encrypted_resource_id.h> -#else -typedef void LassoDiscoEncryptedResourceID; -typedef void LassoDiscoResourceID; -#endif +#include "../xml/lib_authn_request.h" +#include "../xml/lib_authn_response.h" +#include "../xml/samlp_request.h" +#include "../xml/samlp_response.h" -#include <lasso/xml/lib_authn_request.h> -#include <lasso/xml/lib_authn_response.h> -#include <lasso/xml/samlp_request.h> -#include <lasso/xml/samlp_response.h> - -#include <lasso/id-ff/profile.h> +#include "profile.h" #define LASSO_TYPE_LOGIN (lasso_login_get_type()) #define LASSO_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LOGIN, LassoLogin)) @@ -146,11 +138,6 @@ LASSO_EXPORT gint lasso_login_process_authn_response_msg(LassoLogin *login, LASSO_EXPORT gint lasso_login_process_request_msg(LassoLogin *login, gchar *request_msg); LASSO_EXPORT gint lasso_login_process_response_msg(LassoLogin *login, gchar *response_msg); -LASSO_EXPORT int lasso_login_set_encryptedResourceId( - LassoLogin *login, LassoDiscoEncryptedResourceID *encryptedResourceId); - -LASSO_EXPORT int lasso_login_set_resourceId(LassoLogin *login, const char *content); - LASSO_EXPORT int lasso_login_validate_request_msg(LassoLogin *login, gboolean authentication_result, gboolean is_consent_obtained); diff --git a/lasso/id-ff/loginprivate.h b/lasso/id-ff/loginprivate.h index d19e5a8a..0169ee22 100644 --- a/lasso/id-ff/loginprivate.h +++ b/lasso/id-ff/loginprivate.h @@ -30,17 +30,14 @@ extern "C" { #endif /* __cplusplus */ -#include <config.h> -#include <lasso/xml/saml-2.0/saml2_assertion.h> +#include "config.h" +#include "../xml/saml-2.0/saml2_assertion.h" #ifdef LASSO_WSF_ENABLED -#include <lasso/xml/disco_description.h> -#include <lasso/xml/disco_resource_offering.h> -#include <lasso/xml/disco_service_instance.h> +#include "../xml/disco_resource_id.h" +#include "../xml/disco_encrypted_resource_id.h" #endif - - struct _LassoLoginPrivate { char *soap_request_msg; diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c index 4730a949..8fcb7aea 100644 --- a/lasso/id-ff/logout.c +++ b/lasso/id-ff/logout.c @@ -29,16 +29,16 @@ */ #include "../xml/private.h" -#include <lasso/xml/lib_authentication_statement.h> +#include "../xml/lib_authentication_statement.h" -#include <lasso/id-ff/logout.h> -#include <lasso/id-ff/logoutprivate.h> +#include "logout.h" +#include "logoutprivate.h" -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/sessionprivate.h> +#include "profileprivate.h" +#include "providerprivate.h" +#include "sessionprivate.h" -#include <lasso/saml-2.0/logoutprivate.h> +#include "../saml-2.0/logoutprivate.h" #include "../utils.h" static void check_soap_support(gchar *key, LassoProvider *provider, LassoProfile *profile); diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h index 4e368718..8d8859e0 100644 --- a/lasso/id-ff/logout.h +++ b/lasso/id-ff/logout.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> -#include <lasso/xml/lib_logout_request.h> -#include <lasso/xml/lib_logout_response.h> +#include "profile.h" +#include "../xml/lib_logout_request.h" +#include "../xml/lib_logout_response.h" #define LASSO_TYPE_LOGOUT (lasso_logout_get_type()) #define LASSO_LOGOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LOGOUT, LassoLogout)) diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c index 6136c333..a423c6a3 100644 --- a/lasso/id-ff/name_identifier_mapping.c +++ b/lasso/id-ff/name_identifier_mapping.c @@ -29,10 +29,10 @@ **/ #include "../xml/private.h" -#include <lasso/id-ff/name_identifier_mapping.h> +#include "name_identifier_mapping.h" -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/providerprivate.h> +#include "profileprivate.h" +#include "providerprivate.h" /*****************************************************************************/ /* public methods */ diff --git a/lasso/id-ff/name_identifier_mapping.h b/lasso/id-ff/name_identifier_mapping.h index 99f09a12..0cf973ba 100644 --- a/lasso/id-ff/name_identifier_mapping.h +++ b/lasso/id-ff/name_identifier_mapping.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> +#include "profile.h" -#include <lasso/xml/lib_name_identifier_mapping_request.h> -#include <lasso/xml/lib_name_identifier_mapping_response.h> +#include "../xml/lib_name_identifier_mapping_request.h" +#include "../xml/lib_name_identifier_mapping_response.h" #define LASSO_TYPE_NAME_IDENTIFIER_MAPPING (lasso_name_identifier_mapping_get_type()) #define LASSO_NAME_IDENTIFIER_MAPPING(obj) \ diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c index 0d51d371..47f97aea 100644 --- a/lasso/id-ff/name_registration.c +++ b/lasso/id-ff/name_registration.c @@ -29,9 +29,9 @@ **/ #include "../xml/private.h" -#include <lasso/id-ff/name_registration.h> -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/providerprivate.h> +#include "name_registration.h" +#include "profileprivate.h" +#include "providerprivate.h" #include "../utils.h" /*****************************************************************************/ diff --git a/lasso/id-ff/name_registration.h b/lasso/id-ff/name_registration.h index 6ab24b04..c84722e0 100644 --- a/lasso/id-ff/name_registration.h +++ b/lasso/id-ff/name_registration.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> +#include "profile.h" -#include <lasso/xml/lib_register_name_identifier_request.h> -#include <lasso/xml/lib_register_name_identifier_response.h> +#include "../xml/lib_register_name_identifier_request.h" +#include "../xml/lib_register_name_identifier_response.h" #define LASSO_TYPE_NAME_REGISTRATION (lasso_name_registration_get_type()) #define LASSO_NAME_REGISTRATION(obj) \ diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c index a1eccb26..afa62518 100644 --- a/lasso/id-ff/profile.c +++ b/lasso/id-ff/profile.c @@ -32,17 +32,17 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <lasso/xml/samlp_response.h> -#include <lasso/xml/samlp_request.h> -#include <lasso/xml/lib_authn_response.h> -#include <lasso/xml/lib_status_response.h> - -#include <lasso/id-ff/profile.h> -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/providerprivate.h> +#include "../xml/samlp_response.h" +#include "../xml/samlp_request.h" +#include "../xml/lib_authn_response.h" +#include "../xml/lib_status_response.h" + +#include "profile.h" +#include "profileprivate.h" +#include "providerprivate.h" #include "./sessionprivate.h" -#include <lasso/saml-2.0/profileprivate.h> +#include "../saml-2.0/profileprivate.h" #include "../utils.h" #include "../debug.h" diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h index 1a327cda..26f30dff 100644 --- a/lasso/id-ff/profile.h +++ b/lasso/id-ff/profile.h @@ -30,12 +30,12 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/identity.h> -#include <lasso/id-ff/server.h> -#include <lasso/id-ff/session.h> +#include "identity.h" +#include "server.h" +#include "session.h" -#include <lasso/xml/samlp_request_abstract.h> -#include <lasso/xml/samlp_response_abstract.h> +#include "../xml/samlp_request_abstract.h" +#include "../xml/samlp_response_abstract.h" #define LASSO_TYPE_PROFILE (lasso_profile_get_type()) #define LASSO_PROFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_PROFILE, LassoProfile)) diff --git a/lasso/id-ff/profileprivate.h b/lasso/id-ff/profileprivate.h index 3f87137c..b72b2c1f 100644 --- a/lasso/id-ff/profileprivate.h +++ b/lasso/id-ff/profileprivate.h @@ -30,9 +30,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> +#include "profile.h" -#include <lasso/xml/soap_envelope.h> +#include "../xml/soap_envelope.h" struct _LassoProfilePrivate { diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c index 64aeab90..d41ab0e0 100644 --- a/lasso/id-ff/provider.c +++ b/lasso/id-ff/provider.c @@ -39,10 +39,10 @@ #include <xmlsec/xmltree.h> #include <xmlsec/templates.h> -#include <lasso/id-ff/provider.h> -#include <lasso/id-ff/providerprivate.h> +#include "provider.h" +#include "providerprivate.h" -#include <lasso/saml-2.0/providerprivate.h> +#include "../saml-2.0/providerprivate.h" #include <unistd.h> #include "../utils.h" #include "../debug.h" diff --git a/lasso/id-ff/provider.h b/lasso/id-ff/provider.h index 80841924..bf61d2e6 100644 --- a/lasso/id-ff/provider.h +++ b/lasso/id-ff/provider.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/xml_enc.h> +#include "../xml/xml.h" +#include "../xml/xml_enc.h" #define LASSO_TYPE_PROVIDER (lasso_provider_get_type()) #define LASSO_PROVIDER(obj) \ diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c index d309d956..d3e129a0 100644 --- a/lasso/id-ff/server.c +++ b/lasso/id-ff/server.c @@ -34,20 +34,16 @@ #include <xmlsec/base64.h> #include <config.h> -#include <lasso/id-ff/server.h> - -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/serverprivate.h> - -#include <lasso/saml-2.0/serverprivate.h> - -#ifdef LASSO_WSF_ENABLED -#include <lasso/id-wsf-2.0/server.h> -#include <lasso/xml/id-wsf-2.0/disco_service_context.h> -#endif - +#include "server.h" +#include "providerprivate.h" +#include "serverprivate.h" +#include "../saml-2.0/serverprivate.h" #include "../utils.h" #include "../debug.h" +#ifdef LASSO_WSF_ENABLED +#include "../id-wsf/id_ff_extensions_private.h" +#include "../id-wsf-2.0/serverprivate.h" +#endif /*****************************************************************************/ /* public methods */ @@ -127,136 +123,6 @@ lasso_server_add_provider_from_buffer(LassoServer *server, LassoProviderRole rol public_key, ca_cert_chain, lasso_provider_new_from_buffer); } -#ifdef LASSO_WSF_ENABLED -/** - * lasso_server_add_service: - * @server: a #LassoServer - * @service: a #LassoNode object implementing representing a service endpoint. - * - * Add a service to the registry of service of this #LassoServer object. - * - * Return value: 0 on success; a negative value if an error occured. - **/ -gint -lasso_server_add_service(LassoServer *server, LassoNode *service) -{ - g_return_val_if_fail(LASSO_IS_SERVER(server), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - g_return_val_if_fail(service != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - - if (LASSO_IS_DISCO_SERVICE_INSTANCE(service)) { - g_hash_table_insert(server->services, - g_strdup(LASSO_DISCO_SERVICE_INSTANCE(service)->ServiceType), - g_object_ref(service)); - } else if (LASSO_IS_IDWSF2_DISCO_SVC_METADATA(service)) { - return lasso_server_add_svc_metadata(server, - LASSO_IDWSF2_DISCO_SVC_METADATA(service)); - } else { - return LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ; - } - return 0; -} -#else -gint -lasso_server_add_service(G_GNUC_UNUSED LassoServer *server, G_GNUC_UNUSED LassoNode *service) -{ - return LASSO_ERROR_UNIMPLEMENTED; -} -#endif - - -/** - * lasso_server_add_service_from_dump: - * @server: a #LassoServer - * @dump: the XML dump of a #LassoNode representing a service endpoint. - * - * An utility function that parse a #LassoNode dump an try to add it as a - * service using lasso_server_add_service. - * - * Return value: 0 if succesfull, LASSO_PARAM_ERROR_BAD_TYPE_OF_NULL_OBJECT if - * said dump is not a #LassoNode or is not of the righ type, - * LASSO_PARAM_ERROR_INVALID_VALUE if dump is NULL. - **/ -gint -lasso_server_add_service_from_dump(LassoServer *server, const gchar *dump) -{ - LassoNode *node; - gint return_code; - - g_return_val_if_fail(dump != NULL, LASSO_PARAM_ERROR_INVALID_VALUE); - - node = lasso_node_new_from_dump(dump); - - return_code = lasso_server_add_service(server, node); - - g_object_unref(node); - - return return_code; -} - -#ifdef LASSO_WSF_ENABLED -gint -lasso_server_add_svc_metadata(LassoServer *server, LassoIdWsf2DiscoSvcMetadata *metadata) -{ - - g_return_val_if_fail(LASSO_IS_SERVER(server), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - g_return_val_if_fail(LASSO_IS_IDWSF2_DISCO_SVC_METADATA(metadata), - LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - - server->private_data->svc_metadatas = g_list_append( - server->private_data->svc_metadatas, g_object_ref(metadata)); - - return 0; -} - -const GList * -lasso_server_get_svc_metadatas(LassoServer *server) -{ - g_return_val_if_fail(LASSO_IS_SERVER(server), NULL); - - return server->private_data->svc_metadatas; -} - -/* XXX: return value must be freed by caller */ -GList * -lasso_server_get_svc_metadatas_with_id_and_type(LassoServer *server, GList *svcMDIDs, - const gchar *service_type) -{ - gchar *svcMDID; - LassoIdWsf2DiscoSvcMetadata *md; - GList *result = NULL; - GList *i; - GList *j; - - g_return_val_if_fail(LASSO_IS_SERVER(server), NULL); - g_return_val_if_fail(service_type != NULL, NULL); - - for (i = g_list_first(server->private_data->svc_metadatas); i != NULL; i = g_list_next(i)) { - md = LASSO_IDWSF2_DISCO_SVC_METADATA(i->data); - /* FIXME: this assumes there is one and only one service - * context, and service type, this should be fixed to iterate - * properly on the GList */ - if (md->ServiceContext == NULL || strcmp((char*)(LASSO_IDWSF2_DISCO_SERVICE_CONTEXT( - md->ServiceContext->data)->ServiceType)->data, service_type) != 0) { - continue; - } - if (svcMDIDs == NULL) { - /* If no svcMDID is given, return all the metadatas with given */ - /* service type */ - result = g_list_append(result, g_object_ref(md)); - } else { - for (j = g_list_first(svcMDIDs); j != NULL; j = g_list_next(j)) { - svcMDID = (gchar *)(j->data); - if (strcmp(svcMDID, md->svcMDID) == 0) { - result = g_list_append(result, g_object_ref(md)); - } - } - } - } - - return result; -} -#endif - /** * lasso_server_destroy: @@ -354,19 +220,6 @@ add_provider_childnode(G_GNUC_UNUSED gchar *key, LassoProvider *value, xmlNode * xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); } -#ifdef LASSO_WSF_ENABLED -static void -add_service_childnode(G_GNUC_UNUSED gchar *key, LassoNode *value, xmlNode *xmlnode) -{ - xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); -} - -static void -add_childnode_from_list(LassoNode *value, xmlNode *xmlnode) -{ - xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); -} -#endif static xmlNode* get_xmlNode(LassoNode *node, gboolean lasso_dump) @@ -389,21 +242,8 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump) } #ifdef LASSO_WSF_ENABLED - /* Services */ - if (g_hash_table_size(server->services)) { - xmlNode *t; - t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"Services", NULL); - g_hash_table_foreach(server->services, - (GHFunc)add_service_childnode, t); - } - - /* Service Metadatas (SvcMD) */ - if (server->private_data->svc_metadatas != NULL) { - xmlNode *t; - t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"SvcMDs", NULL); - g_list_foreach(server->private_data->svc_metadatas, - (GFunc)add_childnode_from_list, t); - } + lasso_server_dump_id_wsf_services(server, xmlnode); + lasso_server_dump_id_wsf20_svcmds(server, xmlnode); #endif xmlCleanNs(xmlnode); @@ -464,36 +304,8 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode) } #ifdef LASSO_WSF_ENABLED - /* Services */ - if (strcmp((char*)t->name, "Services") == 0) { - while (t2) { - LassoDiscoServiceInstance *s; - if (t2->type != XML_ELEMENT_NODE) { - t2 = t2->next; - continue; - } - s = g_object_new(LASSO_TYPE_DISCO_SERVICE_INSTANCE, NULL); - LASSO_NODE_GET_CLASS(s)->init_from_xml(LASSO_NODE(s), t2); - g_hash_table_insert(server->services, g_strdup(s->ServiceType), s); - t2 = t2->next; - } - } - - /* Service Metadatas (SvcMD) */ - if (strcmp((char*)t->name, "SvcMDs") == 0) { - while (t2) { - LassoIdWsf2DiscoSvcMetadata *svcMD; - if (t2->type != XML_ELEMENT_NODE) { - t2 = t2->next; - continue; - } - svcMD = lasso_idwsf2_disco_svc_metadata_new(); - LASSO_NODE_GET_CLASS(svcMD)->init_from_xml(LASSO_NODE(svcMD), t2); - server->private_data->svc_metadatas = g_list_append( - server->private_data->svc_metadatas, svcMD); - t2 = t2->next; - } - } + lasso_server_init_id_wsf_services(server, t); + lasso_server_init_id_wsf20_svcmds(server, t); #endif t = t->next; @@ -549,24 +361,6 @@ lasso_server_get_provider(LassoServer *server, const gchar *providerID) } -/** - * lasso_server_get_service: - * @server: a #LassoServer - * @serviceType: - * - * ... - * - * Return value: the #LassoDiscoServiceInstance, NULL if it was not found. - * The #LassoDiscoServiceInstance is owned by Lasso and should not be - * freed. - **/ -LassoDiscoServiceInstance* -lasso_server_get_service(LassoServer *server, const gchar *serviceType) -{ - return g_hash_table_lookup(server->services, serviceType); -} - - static gboolean get_providerID_with_hash(gchar *key, G_GNUC_UNUSED gpointer value, char **providerID) { diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h index 863e7894..7e5071d6 100644 --- a/lasso/id-ff/server.h +++ b/lasso/id-ff/server.h @@ -29,16 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/lasso_config.h> - -#ifdef LASSO_WSF_ENABLED -#include <lasso/xml/disco_service_instance.h> -#else -typedef void LassoDiscoServiceInstance; -#endif - -#include <lasso/id-ff/provider.h> - +#include "provider.h" #define LASSO_TYPE_SERVER (lasso_server_get_type()) #define LASSO_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SERVER, LassoServer)) @@ -95,9 +86,6 @@ LASSO_EXPORT gint lasso_server_add_provider_from_buffer (LassoServer *server, LassoProviderRole role, const gchar *metadata, const gchar *public_key, const gchar *ca_cert_chain); -LASSO_EXPORT gint lasso_server_add_service(LassoServer *server, LassoNode *service); -LASSO_EXPORT gint lasso_server_add_service_from_dump(LassoServer *server, const gchar *dump); - LASSO_EXPORT void lasso_server_destroy(LassoServer *server); LASSO_EXPORT gchar* lasso_server_dump(LassoServer *server); @@ -105,9 +93,6 @@ LASSO_EXPORT gchar* lasso_server_dump(LassoServer *server); LASSO_EXPORT LassoProvider* lasso_server_get_provider(LassoServer *server, const gchar *providerID); -LASSO_EXPORT LassoDiscoServiceInstance* lasso_server_get_service(LassoServer *server, - const gchar *serviceType); - LASSO_EXPORT int lasso_server_set_encryption_private_key(LassoServer *server, const gchar *filename); diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c index 0455b306..441214c9 100644 --- a/lasso/id-ff/session.c +++ b/lasso/id-ff/session.c @@ -29,26 +29,21 @@ **/ #include "../xml/private.h" -#include <lasso/id-ff/session.h> -#include <lasso/id-ff/sessionprivate.h> -#include <lasso/xml/saml_assertion.h> -#include <lasso/xml/saml-2.0/saml2_assertion.h> +#include "session.h" +#include "sessionprivate.h" +#include "../xml/saml_assertion.h" +#include "../xml/saml-2.0/saml2_assertion.h" #include "../utils.h" -#ifdef LASSO_WSF_ENABLED -#include <lasso/id-wsf-2.0/session.h> -#include <lasso/xml/misc_text_node.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h> -#include <lasso/xml/id-wsf-2.0/disco_service_type.h> -#include <lasso/xml/id-wsf-2.0/disco_security_context.h> -#include <lasso/xml/id-wsf-2.0/sec_token.h> -#endif - #include <libxml/parser.h> #include <libxml/tree.h> #include <xmlsec/xmltree.h> #include <xmlsec/base64.h> +#ifdef LASSO_WSF_ENABLED +#include "../id-wsf-2.0/sessionprivate.h" +#endif + /*****************************************************************************/ /* public methods */ /*****************************************************************************/ @@ -422,80 +417,6 @@ lasso_session_remove_status(LassoSession *session, const gchar *providerID) return LASSO_PROFILE_ERROR_MISSING_STATUS_CODE; } -#ifdef LASSO_WSF_ENABLED -gint -lasso_session_add_endpoint_reference(LassoSession *session, LassoWsAddrEndpointReference *epr) -{ - GList *i; - - g_return_val_if_fail(LASSO_IS_SESSION(session), LASSO_PARAM_ERROR_INVALID_VALUE); - g_return_val_if_fail(LASSO_IS_WSA_ENDPOINT_REFERENCE(epr), LASSO_PARAM_ERROR_INVALID_VALUE); - - for (i = g_list_first(epr->Metadata->any); i != NULL; i = g_list_next(i)) { - if (LASSO_IS_IDWSF2_DISCO_SERVICE_TYPE(i->data)) { - g_hash_table_insert(session->private_data->eprs, - g_strdup(LASSO_IDWSF2_DISCO_SERVICE_TYPE(i->data)->content), - g_object_ref(epr)); - lasso_private_data(session)->is_dirty = TRUE; - break; - } - } - - return 0; -} - -LassoWsAddrEndpointReference* -lasso_session_get_endpoint_reference(LassoSession *session, const gchar *service_type) -{ - LassoWsAddrEndpointReference* epr; - - g_return_val_if_fail(LASSO_IS_SESSION(session), NULL); - g_return_val_if_fail(service_type != NULL, NULL); - - epr = g_hash_table_lookup(session->private_data->eprs, service_type); - if (LASSO_IS_WSA_ENDPOINT_REFERENCE(epr)) { - return LASSO_WSA_ENDPOINT_REFERENCE(epr); - } else { - return NULL; - } -} - -LassoSaml2Assertion* -lasso_session_get_assertion_identity_token(LassoSession *session, const gchar *service_type) -{ - LassoWsAddrEndpointReference* epr; - GList *metadata_item; - GList *i; - LassoIdWsf2DiscoSecurityContext *security_context; - LassoIdWsf2SecToken *sec_token; - LassoSaml2Assertion *assertion = NULL; - - if (LASSO_IS_SESSION(session) == FALSE) { - return NULL; - } - - epr = lasso_session_get_endpoint_reference(session, service_type); - if (epr == NULL || epr->Metadata == NULL) { - return NULL; - } - - metadata_item = epr->Metadata->any; - for (i = g_list_first(metadata_item); i != NULL; i = g_list_next(i)) { - if (LASSO_IS_IDWSF2_DISCO_SECURITY_CONTEXT(i->data)) { - security_context = LASSO_IDWSF2_DISCO_SECURITY_CONTEXT(i->data); - if (security_context->Token != NULL) { - sec_token = security_context->Token->data; - if (LASSO_IS_SAML2_ASSERTION(sec_token->any)) { - lasso_assign_new_gobject(assertion, sec_token->any); - break; - } - } - } - } - - return assertion; -} -#endif /*****************************************************************************/ /* private methods */ @@ -574,26 +495,12 @@ add_status_childnode(gchar *key, LassoSamlpStatus *value, DumpContext *context) xmlAddChild(t, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); } -#ifdef LASSO_WSF_ENABLED -static void -add_childnode_from_hashtable(G_GNUC_UNUSED gchar *key, LassoNode *value, DumpContext *context) -{ - xmlNode *xmlnode; - - xmlnode = context->parent; - xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); -} -#endif - static xmlNode* get_xmlNode(LassoNode *node, G_GNUC_UNUSED gboolean lasso_dump) { xmlNode *xmlnode; LassoSession *session = LASSO_SESSION(node); DumpContext context; -#ifdef LASSO_WSF_ENABLED - xmlNode *t; -#endif xmlnode = xmlNewNode(NULL, (xmlChar*)"Session"); context.parent = xmlnode; @@ -613,14 +520,7 @@ get_xmlNode(LassoNode *node, G_GNUC_UNUSED gboolean lasso_dump) } #ifdef LASSO_WSF_ENABLED - /* Endpoint References */ - if (session->private_data->eprs != NULL - && g_hash_table_size(session->private_data->eprs)) { - t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"EndpointReferences", NULL); - context.parent = t; - g_hash_table_foreach(session->private_data->eprs, - (GHFunc)add_childnode_from_hashtable, &context); - } + lasso_session_id_wsf2_dump_eprs(session, xmlnode); #endif return xmlnode; @@ -658,9 +558,6 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode) LassoSession *session = LASSO_SESSION(node); xmlNode *t; xmlNode *n; -#ifdef LASSO_WSF_ENABLED - xmlNode *t2; -#endif t = xmlnode->children; while (t) { @@ -715,23 +612,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode) } #ifdef LASSO_WSF_ENABLED - /* Endpoint References */ - if (strcmp((char*)t->name, "EndpointReferences") == 0) { - t2 = t->children; - while (t2) { - LassoWsAddrEndpointReference *epr; - if (t2->type != XML_ELEMENT_NODE) { - t2 = t2->next; - continue; - } - epr = LASSO_WSA_ENDPOINT_REFERENCE( - lasso_wsa_endpoint_reference_new()); - LASSO_NODE_GET_CLASS(epr)->init_from_xml(LASSO_NODE(epr), t2); - lasso_session_add_endpoint_reference(session, epr); - g_object_unref(epr); - t2 = t2->next; - } - } + lasso_session_id_wsf2_init_eprs(session, t); #endif t = t->next; @@ -894,6 +775,7 @@ lasso_session_new_from_dump(const gchar *dump) session = lasso_session_new(); init_from_xml(LASSO_NODE(session), rootElement); lasso_release_doc(doc); + lasso_private_data(session)->is_dirty = FALSE; return session; } diff --git a/lasso/id-ff/session.h b/lasso/id-ff/session.h index b355dd90..667d1ca5 100644 --- a/lasso/id-ff/session.h +++ b/lasso/id-ff/session.h @@ -29,8 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/lasso_config.h> -#include <lasso/xml/xml.h> +#include "../xml/xml.h" #ifndef OFTYPE #define OFTYPE(x) diff --git a/lasso/id-ff/sessionprivate.h b/lasso/id-ff/sessionprivate.h index 80a15583..3bc22c4d 100644 --- a/lasso/id-ff/sessionprivate.h +++ b/lasso/id-ff/sessionprivate.h @@ -29,10 +29,11 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/lib_assertion.h> -#include <lasso/xml/samlp_status.h> -#include <lasso/id-ff/session.h> -#include <lasso/xml/xml.h> +#include "../xml/lib_assertion.h" +#include "../xml/samlp_status.h" +#include "session.h" +#include "../xml/xml.h" +#include "lasso/lasso_config.h" struct _LassoSessionPrivate { diff --git a/lasso/id-wsf-2.0/Makefile.am b/lasso/id-wsf-2.0/Makefile.am index 004ccfb8..3a752598 100644 --- a/lasso/id-wsf-2.0/Makefile.am +++ b/lasso/id-wsf-2.0/Makefile.am @@ -9,12 +9,22 @@ INCLUDES = \ noinst_LTLIBRARIES = liblasso-id-wsf2.la +lasso_private_h_sources = \ + serverprivate.h \ + sessionprivate.h \ + saml2_login_private.h + liblasso_id_wsf2_la_SOURCES = \ + server.c \ + session.c \ + identity.c \ discovery.c \ data_service.c \ - profile.c + profile.c \ + saml2_login.c liblassoinclude_HEADERS = \ + id_wsf_2.h discovery.h \ data_service.h \ profile.h \ @@ -22,3 +32,4 @@ liblassoinclude_HEADERS = \ server.h \ session.h +EXTRADIST = $(lasso_private_h_sources) diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c index f42e09a2..0364d6a7 100644 --- a/lasso/id-wsf-2.0/data_service.c +++ b/lasso/id-wsf-2.0/data_service.c @@ -34,20 +34,20 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <lasso/id-wsf-2.0/discovery.h> -#include <lasso/id-wsf-2.0/data_service.h> - -#include <lasso/xml/id-wsf-2.0/disco_service_type.h> -#include <lasso/xml/id-wsf-2.0/dstref_query.h> -#include <lasso/xml/id-wsf-2.0/dstref_query_response.h> -#include <lasso/xml/id-wsf-2.0/dstref_data.h> -#include <lasso/xml/id-wsf-2.0/util_status.h> -#include <lasso/xml/id-wsf-2.0/sb2_redirect_request.h> -#include <lasso/xml/id-wsf-2.0/dstref_modify.h> -#include <lasso/xml/id-wsf-2.0/dstref_modify_item.h> -#include <lasso/xml/id-wsf-2.0/dstref_modify_response.h> - -#include <lasso/xml/soap_fault.h> +#include "discovery.h" +#include "data_service.h" + +#include "../xml/id-wsf-2.0/disco_service_type.h" +#include "../xml/id-wsf-2.0/dstref_query.h" +#include "../xml/id-wsf-2.0/dstref_query_response.h" +#include "../xml/id-wsf-2.0/dstref_data.h" +#include "../xml/id-wsf-2.0/util_status.h" +#include "../xml/id-wsf-2.0/sb2_redirect_request.h" +#include "../xml/id-wsf-2.0/dstref_modify.h" +#include "../xml/id-wsf-2.0/dstref_modify_item.h" +#include "../xml/id-wsf-2.0/dstref_modify_response.h" + +#include "../xml/soap_fault.h" #include "../utils.h" #include "./private.h" diff --git a/lasso/id-wsf-2.0/data_service.h b/lasso/id-wsf-2.0/data_service.h index 6b7413c2..5f4fd919 100644 --- a/lasso/id-wsf-2.0/data_service.h +++ b/lasso/id-wsf-2.0/data_service.h @@ -30,10 +30,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-wsf-2.0/profile.h> -#include <lasso/xml/xml.h> -#include <lasso/xml/id-wsf-2.0/dstref_query_item.h> -#include <lasso/xml/ws/wsa_endpoint_reference.h> +#include "profile.h" +#include "../xml/xml.h" +#include "../xml/id-wsf-2.0/dstref_query_item.h" +#include "../xml/ws/wsa_endpoint_reference.h" #define LASSO_TYPE_IDWSF2_DATA_SERVICE (lasso_idwsf2_data_service_get_type()) diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c index 8cf1ec4c..2ebb651d 100644 --- a/lasso/id-wsf-2.0/discovery.c +++ b/lasso/id-wsf-2.0/discovery.c @@ -38,38 +38,38 @@ #include <xmlsec/xmltree.h> -#include <lasso/xml/saml_attribute_value.h> -#include <lasso/xml/xml_enc.h> - -#include <lasso/xml/saml-2.0/saml2_assertion.h> -#include <lasso/xml/saml-2.0/samlp2_name_id_policy.h> - -#include <lasso/xml/id-wsf-2.0/disco_query.h> -#include <lasso/xml/id-wsf-2.0/disco_requested_service.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_md_register.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h> -#include <lasso/xml/id-wsf-2.0/disco_abstract.h> -#include <lasso/xml/id-wsf-2.0/disco_provider_id.h> -#include <lasso/xml/id-wsf-2.0/disco_service_type.h> -#include <lasso/xml/id-wsf-2.0/disco_security_context.h> -#include <lasso/xml/id-wsf-2.0/disco_service_context.h> -#include <lasso/xml/id-wsf-2.0/disco_endpoint_context.h> -#include <lasso/xml/id-wsf-2.0/sec_token.h> - -#include <lasso/xml/ws/wsa_endpoint_reference.h> - -#include <lasso/id-ff/server.h> -#include <lasso/id-ff/provider.h> -#include <lasso/id-ff/providerprivate.h> - -#include <lasso/id-wsf-2.0/discovery.h> -#include <lasso/id-wsf-2.0/profile.h> -#include <lasso/id-wsf-2.0/identity.h> -#include <lasso/id-wsf-2.0/server.h> -#include <lasso/id-wsf-2.0/session.h> +#include "../xml/saml_attribute_value.h" +#include "../xml/xml_enc.h" + +#include "../xml/saml-2.0/saml2_assertion.h" +#include "../xml/saml-2.0/samlp2_name_id_policy.h" + +#include "../xml/id-wsf-2.0/disco_query.h" +#include "../xml/id-wsf-2.0/disco_requested_service.h" +#include "../xml/id-wsf-2.0/disco_svc_md_register.h" +#include "../xml/id-wsf-2.0/disco_svc_md_register_response.h" +#include "../xml/id-wsf-2.0/disco_svc_md_association_add.h" +#include "../xml/id-wsf-2.0/disco_svc_md_association_add_response.h" +#include "../xml/id-wsf-2.0/disco_svc_md_association_add_response.h" +#include "../xml/id-wsf-2.0/disco_abstract.h" +#include "../xml/id-wsf-2.0/disco_provider_id.h" +#include "../xml/id-wsf-2.0/disco_service_type.h" +#include "../xml/id-wsf-2.0/disco_security_context.h" +#include "../xml/id-wsf-2.0/disco_service_context.h" +#include "../xml/id-wsf-2.0/disco_endpoint_context.h" +#include "../xml/id-wsf-2.0/sec_token.h" + +#include "../xml/ws/wsa_endpoint_reference.h" + +#include "../id-ff/server.h" +#include "../id-ff/provider.h" +#include "../id-ff/providerprivate.h" + +#include "discovery.h" +#include "profile.h" +#include "identity.h" +#include "server.h" +#include "session.h" #include "../utils.h" struct _LassoIdWsf2DiscoveryPrivate diff --git a/lasso/id-wsf-2.0/discovery.h b/lasso/id-wsf-2.0/discovery.h index da80ae2d..ab062dd2 100644 --- a/lasso/id-wsf-2.0/discovery.h +++ b/lasso/id-wsf-2.0/discovery.h @@ -30,12 +30,12 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-wsf-2.0/profile.h> -#include <lasso/id-wsf-2.0/data_service.h> +#include "profile.h" +#include "data_service.h" -#include <lasso/xml/id-wsf-2.0/disco_query.h> -#include <lasso/xml/id-wsf-2.0/disco_query_response.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h> +#include "../xml/id-wsf-2.0/disco_query.h" +#include "../xml/id-wsf-2.0/disco_query_response.h" +#include "../xml/id-wsf-2.0/disco_svc_metadata.h" #define LASSO_TYPE_IDWSF2_DISCOVERY (lasso_idwsf2_discovery_get_type()) #define LASSO_IDWSF2_DISCOVERY(obj) \ diff --git a/lasso/id-wsf-2.0/id_wsf_2.h b/lasso/id-wsf-2.0/id_wsf_2.h new file mode 100644 index 00000000..23bca633 --- /dev/null +++ b/lasso/id-wsf-2.0/id_wsf_2.h @@ -0,0 +1,35 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __LASSO_IDWSF2_ID_WSF_2_H__ +#define __LASSO_IDWSF2_ID_WSF_2_H__ + +#include "session.h" +#include "identity.h" +#include "discovery.h" +#include "data_service.h" +#include "server.h" + + +#endif /* __LASSO_IDWSF2_ID_WSF_2_H__ */ diff --git a/lasso/id-wsf-2.0/identity.c b/lasso/id-wsf-2.0/identity.c new file mode 100644 index 00000000..7d84a442 --- /dev/null +++ b/lasso/id-wsf-2.0/identity.c @@ -0,0 +1,48 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "identity.h" +#include "../utils.h" +#include "../id-ff/identity.h" +#include "../id-ff/identityprivate.h" + +gint +lasso_identity_add_svc_md_id(LassoIdentity *identity, gchar *svcMDID) +{ + g_return_val_if_fail(LASSO_IS_IDENTITY(identity), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + g_return_val_if_fail(svcMDID != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + + lasso_list_add_string(identity->private_data->svcMDID, svcMDID); + identity->is_dirty = TRUE; + + return 0; +} + +GList* +lasso_identity_get_svc_md_ids(LassoIdentity *identity) +{ + g_return_val_if_fail(LASSO_IS_IDENTITY(identity), NULL); + + return identity->private_data->svcMDID; +} diff --git a/lasso/id-wsf-2.0/identity.h b/lasso/id-wsf-2.0/identity.h index 9752b380..888d5f05 100644 --- a/lasso/id-wsf-2.0/identity.h +++ b/lasso/id-wsf-2.0/identity.h @@ -29,6 +29,10 @@ extern "C" { #endif /* __cplusplus */ +#include "../id-ff/identity.h" +#include "../export.h" +#include <glib.h> + LASSO_EXPORT gint lasso_identity_add_svc_md_id(LassoIdentity *identity, gchar *svcMDID); LASSO_EXPORT GList* lasso_identity_get_svc_md_ids(LassoIdentity *identity); diff --git a/lasso/id-wsf-2.0/profile.c b/lasso/id-wsf-2.0/profile.c index 61d88c18..a368472b 100644 --- a/lasso/id-wsf-2.0/profile.c +++ b/lasso/id-wsf-2.0/profile.c @@ -31,22 +31,22 @@ #include <xmlsec/templates.h> #include <xmlsec/crypto.h> -#include <lasso/id-ff/server.h> -#include <lasso/id-ff/serverprivate.h> -#include <lasso/id-ff/providerprivate.h> +#include "../id-ff/server.h" +#include "../id-ff/serverprivate.h" +#include "../id-ff/providerprivate.h" -#include <lasso/id-wsf-2.0/profile.h> -#include <lasso/id-wsf-2.0/session.h> +#include "profile.h" +#include "session.h" -#include <lasso/xml/soap_fault.h> -#include <lasso/xml/soap_binding_correlation.h> -#include <lasso/xml/soap_binding_provider.h> -#include <lasso/xml/soap_binding_processing_context.h> -#include <lasso/xml/xml_enc.h> +#include "../xml/soap_fault.h" +#include "../xml/soap_binding_correlation.h" +#include "../xml/soap_binding_provider.h" +#include "../xml/soap_binding_processing_context.h" +#include "../xml/xml_enc.h" -#include <lasso/xml/ws/wsse_security_header.h> +#include "../xml/ws/wsse_security_header.h" -#include <lasso/xml/saml-2.0/saml2_assertion.h> +#include "../xml/saml-2.0/saml2_assertion.h" #include "../utils.h" /*****************************************************************************/ diff --git a/lasso/id-wsf-2.0/profile.h b/lasso/id-wsf-2.0/profile.h index 442c5a7d..7f171167 100644 --- a/lasso/id-wsf-2.0/profile.h +++ b/lasso/id-wsf-2.0/profile.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> -#include <lasso/xml/soap_envelope.h> +#include "../id-ff/profile.h" +#include "../xml/soap_envelope.h" #define LASSO_TYPE_IDWSF2_PROFILE (lasso_idwsf2_profile_get_type()) #define LASSO_IDWSF2_PROFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/id-wsf-2.0/saml2_login.c b/lasso/id-wsf-2.0/saml2_login.c new file mode 100644 index 00000000..cc471fa4 --- /dev/null +++ b/lasso/id-wsf-2.0/saml2_login.c @@ -0,0 +1,206 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "saml2_login_private.h" +#include "identity.h" +#include "server.h" +#include "session.h" +#include "../id-ff/login.h" +#include "../xml/saml-2.0/saml2_assertion.h" +#include "../xml/ws/wsa_endpoint_reference.h" +#include "../xml/id-wsf-2.0/disco_svc_metadata.h" +#include "../xml/id-wsf-2.0/disco_abstract.h" +#include "../xml/id-wsf-2.0/disco_provider_id.h" +#include "../xml/id-wsf-2.0/disco_service_type.h" +#include "../xml/id-wsf-2.0/disco_service_context.h" +#include "../xml/id-wsf-2.0/disco_security_context.h" +#include "../xml/id-wsf-2.0/sec_token.h" +#include "../xml/saml-2.0/saml2_attribute.h" +#include "../xml/saml-2.0/saml2_attribute_statement.h" +#include "../xml/saml-2.0/saml2_attribute_value.h" +#include "../xml/saml-2.0/samlp2_response.h" + +void +lasso_saml20_login_assertion_add_discovery(LassoLogin *login, LassoSaml2Assertion *assertion) +{ + GList *svcMDIDs; + GList *svcMDs; + LassoIdWsf2DiscoSvcMetadata *svcMD; + LassoWsAddrEndpointReference *epr; + LassoWsAddrMetadata *metadata; + LassoSaml2AttributeStatement *attributeStatement; + LassoSaml2Attribute *attribute; + LassoSaml2AttributeValue *attributeValue; + LassoIdWsf2DiscoSecurityContext *security_context; + LassoIdWsf2SecToken *sec_token; + LassoSaml2Assertion *assertion_identity_token; + LassoIdWsf2DiscoServiceContext *service_context; + LassoIdWsf2DiscoEndpointContext *endpoint_context; + + /* Get metadatas ids to which the user is associated */ + svcMDIDs = lasso_identity_get_svc_md_ids(LASSO_PROFILE(login)->identity); + /* Get the metadatas of type discovery to which the user is associated */ + svcMDs = lasso_server_get_svc_metadatas_with_id_and_type(LASSO_PROFILE(login)->server, + svcMDIDs, LASSO_IDWSF2_DISCO_HREF); + if (svcMDs == NULL) { + /* If the user hasn't been associated to any discovery metadatas, */ + /* get a default one */ + svcMDs = lasso_server_get_svc_metadatas_with_id_and_type( + LASSO_PROFILE(login)->server, NULL, LASSO_IDWSF2_DISCO_HREF); + if (svcMDs != NULL && LASSO_IS_IDWSF2_DISCO_SVC_METADATA(svcMDs->data)) { + /* Then associate the user to these metadatas for later use */ + lasso_identity_add_svc_md_id(LASSO_PROFILE(login)->identity, + LASSO_IDWSF2_DISCO_SVC_METADATA(svcMDs->data)->svcMDID); + } else { + return; + } + } + + /* FIXME : foreach on the whole list and build on epr for each svcMD */ + svcMD = svcMDs->data; + + /* Check the metadatas contain the infos needed to build an EPR */ + if (svcMD == NULL || svcMD->ServiceContext == NULL || svcMD->ServiceContext->data == NULL) { + g_list_foreach(svcMDs, (GFunc)lasso_node_destroy, NULL); + g_list_free(svcMDs); + return; + } + + /* Build EndpointReference */ + + epr = lasso_wsa_endpoint_reference_new(); + service_context = svcMD->ServiceContext->data; + endpoint_context = service_context->EndpointContext->data; + + epr->Address = lasso_wsa_attributed_uri_new_with_string( + (gchar*)endpoint_context->Address->data); + + metadata = lasso_wsa_metadata_new(); + + /* Abstract */ + metadata->any = g_list_append(metadata->any, + lasso_idwsf2_disco_abstract_new_with_string(svcMD->Abstract)); + /* ProviderID */ + metadata->any = g_list_append(metadata->any, + lasso_idwsf2_disco_provider_id_new_with_string(svcMD->ProviderID)); + /* ServiceType */ + metadata->any = g_list_append(metadata->any, + lasso_idwsf2_disco_service_type_new_with_string( + (char*)service_context->ServiceType->data)); + /* Framework */ + if (endpoint_context->Framework != NULL) { + metadata->any = g_list_append(metadata->any, + g_object_ref(endpoint_context->Framework->data)); + } + + /* Identity token */ + assertion_identity_token = LASSO_SAML2_ASSERTION(lasso_saml2_assertion_new()); + assertion_identity_token->Subject = g_object_ref(assertion->Subject); + + sec_token = lasso_idwsf2_sec_token_new(); + sec_token->any = LASSO_NODE(assertion_identity_token); + + security_context = lasso_idwsf2_disco_security_context_new(); + security_context->SecurityMechID = g_list_append( + security_context->SecurityMechID, g_strdup(LASSO_SECURITY_MECH_TLS_BEARER)); + security_context->Token = g_list_append(security_context->Token, sec_token); + + metadata->any = g_list_append(metadata->any, security_context); + + /* End of metadata construction */ + epr->Metadata = metadata; + + /* Add the EPR to the assertion as a SAML attribute */ + attributeValue = lasso_saml2_attribute_value_new(); + attributeValue->any = g_list_append(attributeValue->any, epr); + + attribute = LASSO_SAML2_ATTRIBUTE(lasso_saml2_attribute_new()); + attribute->Name = g_strdup(LASSO_SAML2_ATTRIBUTE_NAME_EPR); + attribute->NameFormat = g_strdup(LASSO_SAML2_ATTRIBUTE_NAME_FORMAT_URI); + attribute->AttributeValue = g_list_append(attribute->AttributeValue, attributeValue); + + attributeStatement = LASSO_SAML2_ATTRIBUTE_STATEMENT(lasso_saml2_attribute_statement_new()); + attributeStatement->Attribute = g_list_append(attributeStatement->Attribute, attribute); + + assertion->AttributeStatement = g_list_append(assertion->AttributeStatement, + attributeStatement); + + /* Free resources */ + g_list_foreach(svcMDs, (GFunc)lasso_node_destroy, NULL); + g_list_free(svcMDs); +} + +gint +lasso_saml20_login_copy_assertion_epr(LassoLogin *login) +{ + LassoProfile *profile = LASSO_PROFILE(login); + LassoSession *session = profile->session; + LassoSaml2Assertion *assertion; + LassoSaml2AttributeStatement *attribute_statement; + LassoSaml2Attribute *attribute; + LassoSaml2AttributeValue *attribute_value; + LassoWsAddrEndpointReference *epr; + GList *i; + + g_return_val_if_fail(LASSO_IS_SESSION(session), LASSO_PROFILE_ERROR_SESSION_NOT_FOUND); + + assertion = LASSO_SAML2_ASSERTION( + LASSO_SAMLP2_RESPONSE(profile->response)->Assertion->data); + + for (i = g_list_first(assertion->AttributeStatement); i; i = g_list_next(i)) { + GList *j; + attribute_statement = LASSO_SAML2_ATTRIBUTE_STATEMENT(i->data); + if (attribute_statement == NULL) { + continue; + } + + for (j = g_list_first(attribute_statement->Attribute); j; j = g_list_next(j)) { + GList *k; + attribute = LASSO_SAML2_ATTRIBUTE(j->data); + if (attribute == NULL || attribute->Name == NULL) { + continue; + } + if (strcmp(attribute->Name, LASSO_SAML2_ATTRIBUTE_NAME_EPR) != 0) { + continue; + } + for (k = g_list_first(attribute->AttributeValue); k; k = g_list_next(k)) { + GList *l; + attribute_value = LASSO_SAML2_ATTRIBUTE_VALUE(k->data); + if (attribute_value == NULL) { + continue; + } + for (l = g_list_first(attribute_value->any); + l; l = g_list_next(l)) { + if (LASSO_IS_WSA_ENDPOINT_REFERENCE(l->data)) { + epr = LASSO_WSA_ENDPOINT_REFERENCE(l->data); + lasso_session_add_endpoint_reference(session, epr); + return 0; + } + } + } + } + } + + return 0; +} diff --git a/lasso/id-wsf-2.0/saml2_login_private.h b/lasso/id-wsf-2.0/saml2_login_private.h new file mode 100644 index 00000000..30cc098d --- /dev/null +++ b/lasso/id-wsf-2.0/saml2_login_private.h @@ -0,0 +1,43 @@ +/* $Id: server.h 2945 2006-11-19 20:07:46Z dlaniel $ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __LASSO_IDWSF2_SAML2_LOGIN_PRIVATE_H__ +#define __LASSO_IDWSF2_SAML2_LOGIN_PRIVATE_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include "../id-ff/login.h" +#include "../xml/saml-2.0/saml2_assertion.h" + +void lasso_saml20_login_assertion_add_discovery(LassoLogin *login, LassoSaml2Assertion *assertion); + +gint lasso_saml20_login_copy_assertion_epr(LassoLogin *login); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __LASSO_IDWSF2_SAML2_LOGIN_PRIVATE_H__ */ diff --git a/lasso/id-wsf-2.0/server.c b/lasso/id-wsf-2.0/server.c new file mode 100644 index 00000000..ce460041 --- /dev/null +++ b/lasso/id-wsf-2.0/server.c @@ -0,0 +1,132 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "server.h" +#include "../id-ff/server.h" +#include "../id-ff/serverprivate.h" +#include "../xml/id-wsf-2.0/disco_svc_metadata.h" +#include "../xml/id-wsf-2.0/disco_service_context.h" +#include <libxml/tree.h> + +gint +lasso_server_add_svc_metadata(LassoServer *server, LassoIdWsf2DiscoSvcMetadata *metadata) +{ + + g_return_val_if_fail(LASSO_IS_SERVER(server), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + g_return_val_if_fail(LASSO_IS_IDWSF2_DISCO_SVC_METADATA(metadata), + LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + + server->private_data->svc_metadatas = g_list_append( + server->private_data->svc_metadatas, g_object_ref(metadata)); + + return 0; +} + + +const GList * +lasso_server_get_svc_metadatas(LassoServer *server) +{ + g_return_val_if_fail(LASSO_IS_SERVER(server), NULL); + + return server->private_data->svc_metadatas; +} + + +GList * +lasso_server_get_svc_metadatas_with_id_and_type(LassoServer *server, GList *svcMDIDs, + const gchar *service_type) +{ + gchar *svcMDID; + LassoIdWsf2DiscoSvcMetadata *md; + GList *result = NULL; + GList *i; + GList *j; + + g_return_val_if_fail(LASSO_IS_SERVER(server), NULL); + g_return_val_if_fail(service_type != NULL, NULL); + + for (i = g_list_first(server->private_data->svc_metadatas); i != NULL; i = g_list_next(i)) { + md = LASSO_IDWSF2_DISCO_SVC_METADATA(i->data); + /* FIXME: this assumes there is one and only one service + * context, and service type, this should be fixed to iterate + * properly on the GList */ + if (md->ServiceContext == NULL || strcmp((char*)(LASSO_IDWSF2_DISCO_SERVICE_CONTEXT( + md->ServiceContext->data)->ServiceType)->data, service_type) != 0) { + continue; + } + if (svcMDIDs == NULL) { + /* If no svcMDID is given, return all the metadatas with given */ + /* service type */ + result = g_list_append(result, g_object_ref(md)); + } else { + for (j = g_list_first(svcMDIDs); j != NULL; j = g_list_next(j)) { + svcMDID = (gchar *)(j->data); + if (strcmp(svcMDID, md->svcMDID) == 0) { + result = g_list_append(result, g_object_ref(md)); + } + } + } + } + + return result; +} + +void +lasso_server_init_id_wsf20_svcmds(LassoServer *server, xmlNode *t) +{ + xmlNode *t2 = t->children; + + if (strcmp((char*)t->name, "SvcMDs") == 0) { + while (t2) { + LassoIdWsf2DiscoSvcMetadata *svcMD; + if (t2->type != XML_ELEMENT_NODE) { + t2 = t2->next; + continue; + } + svcMD = lasso_idwsf2_disco_svc_metadata_new(); + LASSO_NODE_GET_CLASS(svcMD)->init_from_xml(LASSO_NODE(svcMD), t2); + server->private_data->svc_metadatas = g_list_append( + server->private_data->svc_metadatas, svcMD); + t2 = t2->next; + } + } +} + +static void +add_childnode_from_list(LassoNode *value, xmlNode *xmlnode) +{ + xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); +} + +void +lasso_server_dump_id_wsf20_svcmds(LassoServer *server, xmlNode *xmlnode) +{ + /* Service Metadatas (SvcMD) */ + if (server->private_data->svc_metadatas != NULL) { + xmlNode *t; + t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"SvcMDs", NULL); + g_list_foreach(server->private_data->svc_metadatas, + (GFunc)add_childnode_from_list, t); + } +} diff --git a/lasso/id-wsf-2.0/server.h b/lasso/id-wsf-2.0/server.h index 7d24ebb6..8c60ae00 100644 --- a/lasso/id-wsf-2.0/server.h +++ b/lasso/id-wsf-2.0/server.h @@ -25,13 +25,14 @@ #ifndef __LASSO_IDWSF2_SERVER_H__ #define __LASSO_IDWSF2_SERVER_H__ -#include <lasso/utils.h> +#include "../utils.h" #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h> +#include "../id-ff/server.h" +#include "../xml/id-wsf-2.0/disco_svc_metadata.h" LASSO_EXPORT gint lasso_server_add_svc_metadata(LassoServer *server, LassoIdWsf2DiscoSvcMetadata *metadata); @@ -42,6 +43,8 @@ LASSO_EXPORT const GList OFTYPE(LassoIdWsf2DiscoSvcMetadata) *lasso_server_get_s LASSO_EXPORT GList *lasso_server_get_svc_metadatas_with_id_and_type(LassoServer *server, GList *svcMDIDs, const gchar *service_type); +void lasso_server_init_id_wsf20_services(LassoServer *server, xmlNode *t); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/lasso/id-wsf-2.0/serverprivate.h b/lasso/id-wsf-2.0/serverprivate.h new file mode 100644 index 00000000..6b287ae4 --- /dev/null +++ b/lasso/id-wsf-2.0/serverprivate.h @@ -0,0 +1,45 @@ +/* $Id: server.h 2945 2006-11-19 20:07:46Z dlaniel $ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __LASSO_IDWSF2_SERVERPRIVATE_H__ +#define __LASSO_IDWSF2_SERVERPRIVATE_H__ + +#include "../utils.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include "../id-ff/server.h" +#include <libxml/tree.h> + +void lasso_server_init_id_wsf20_svcmds(LassoServer *server, xmlNode *t); + +void lasso_server_dump_id_wsf20_svcmds(LassoServer *server, xmlNode *xmlnode); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __LASSO_IDWSF2_SERVERPRIVATE_H__ */ diff --git a/lasso/id-wsf-2.0/session.c b/lasso/id-wsf-2.0/session.c new file mode 100644 index 00000000..4fb5b301 --- /dev/null +++ b/lasso/id-wsf-2.0/session.c @@ -0,0 +1,182 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * SECTION:idwsf2-session-extension + */ +#include "session.h" +#include "../utils.h" +#include "../id-ff/session.h" +#include "../id-ff/sessionprivate.h" +#include "../xml/misc_text_node.h" +#include "../xml/ws/wsa_endpoint_reference.h" +#include "../xml/saml-2.0/saml2_assertion.h" +#include "../xml/id-wsf-2.0/disco_svc_metadata.h" +#include "../xml/id-wsf-2.0/disco_service_type.h" +#include "../xml/id-wsf-2.0/disco_security_context.h" +#include "../xml/id-wsf-2.0/sec_token.h" + + +typedef struct _DumpContext { + xmlNode *parent; +} DumpContext; + +/** + * lasso_session_add_endpoint_reference: + * @session: a #LassoSession object + * @epr: a #LassoWsAddrEndpointReference object + * + * Add an endpoint reference to a session object. + * + * Return value: 0 if successfull, an error code otherwise. + */ +gint +lasso_session_add_endpoint_reference(LassoSession *session, LassoWsAddrEndpointReference *epr) +{ + GList *i; + + g_return_val_if_fail(LASSO_IS_SESSION(session), LASSO_PARAM_ERROR_INVALID_VALUE); + g_return_val_if_fail(LASSO_IS_WSA_ENDPOINT_REFERENCE(epr), LASSO_PARAM_ERROR_INVALID_VALUE); + + for (i = g_list_first(epr->Metadata->any); i != NULL; i = g_list_next(i)) { + if (LASSO_IS_IDWSF2_DISCO_SERVICE_TYPE(i->data)) { + g_hash_table_insert(session->private_data->eprs, + g_strdup(LASSO_IDWSF2_DISCO_SERVICE_TYPE(i->data)->content), + g_object_ref(epr)); + lasso_private_data(session)->is_dirty = TRUE; + break; + } + } + + return 0; +} + +LassoWsAddrEndpointReference* +lasso_session_get_endpoint_reference(LassoSession *session, const gchar *service_type) +{ + LassoWsAddrEndpointReference* epr; + + g_return_val_if_fail(LASSO_IS_SESSION(session), NULL); + g_return_val_if_fail(service_type != NULL, NULL); + + epr = g_hash_table_lookup(session->private_data->eprs, service_type); + if (LASSO_IS_WSA_ENDPOINT_REFERENCE(epr)) { + return LASSO_WSA_ENDPOINT_REFERENCE(epr); + } else { + return NULL; + } +} + +/** + * lasso_session_get_assertion_identity_token: + * @session: a #LassoSession object + * @service_type: a char* string describing the targeted service + * + * Return a security token to contact a specified service. + * + * Return value: 0 if successfull, an error otherwise. + */ +LassoSaml2Assertion* +lasso_session_get_assertion_identity_token(LassoSession *session, const gchar *service_type) +{ + LassoWsAddrEndpointReference* epr; + GList *metadata_item; + GList *i; + LassoIdWsf2DiscoSecurityContext *security_context; + LassoIdWsf2SecToken *sec_token; + LassoSaml2Assertion *assertion = NULL; + + if (LASSO_IS_SESSION(session) == FALSE) { + return NULL; + } + + epr = lasso_session_get_endpoint_reference(session, service_type); + if (epr == NULL || epr->Metadata == NULL) { + return NULL; + } + + metadata_item = epr->Metadata->any; + for (i = g_list_first(metadata_item); i != NULL; i = g_list_next(i)) { + if (LASSO_IS_IDWSF2_DISCO_SECURITY_CONTEXT(i->data)) { + security_context = LASSO_IDWSF2_DISCO_SECURITY_CONTEXT(i->data); + if (security_context->Token != NULL) { + sec_token = security_context->Token->data; + if (LASSO_IS_SAML2_ASSERTION(sec_token->any)) { + lasso_assign_new_gobject(assertion, sec_token->any); + break; + } + } + } + } + + return assertion; +} + +void +lasso_session_id_wsf2_init_eprs(LassoSession *session, xmlNode *t) +{ + xmlNode *t2; + + /* Endpoint References */ + if (strcmp((char*)t->name, "EndpointReferences") == 0) { + t2 = t->children; + while (t2) { + LassoWsAddrEndpointReference *epr; + if (t2->type != XML_ELEMENT_NODE) { + t2 = t2->next; + continue; + } + epr = LASSO_WSA_ENDPOINT_REFERENCE( + lasso_wsa_endpoint_reference_new()); + LASSO_NODE_GET_CLASS(epr)->init_from_xml(LASSO_NODE(epr), t2); + lasso_session_add_endpoint_reference(session, epr); + g_object_unref(epr); + t2 = t2->next; + } + } +} + +static void +add_childnode_from_hashtable(G_GNUC_UNUSED gchar *key, LassoNode *value, DumpContext *context) +{ + xmlNode *xmlnode; + + xmlnode = context->parent; + xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); +} + +void +lasso_session_id_wsf2_dump_eprs(LassoSession *session, xmlNode *xmlnode) { + xmlNode *t; + DumpContext context; + + /* Endpoint References */ + if (session->private_data->eprs != NULL + && g_hash_table_size(session->private_data->eprs)) { + t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"EndpointReferences", NULL); + context.parent = t; + g_hash_table_foreach(session->private_data->eprs, + (GHFunc)add_childnode_from_hashtable, &context); + } +} diff --git a/lasso/id-wsf-2.0/session.h b/lasso/id-wsf-2.0/session.h index 1ff9f385..c7b359ee 100644 --- a/lasso/id-wsf-2.0/session.h +++ b/lasso/id-wsf-2.0/session.h @@ -1,4 +1,4 @@ -/* $Id: session.h 2633 2005-09-05 10:00:07Z dlaniel $ +/* $Id$ * * Lasso - A free implementation of the Liberty Alliance specifications. * @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml-2.0/saml2_assertion.h> - -#include <lasso/xml/ws/wsa_endpoint_reference.h> +#include "../id-ff/session.h" +#include "../xml/saml-2.0/saml2_assertion.h" +#include "../xml/ws/wsa_endpoint_reference.h" LASSO_EXPORT gint lasso_session_add_endpoint_reference(LassoSession *session, LassoWsAddrEndpointReference *epr); diff --git a/lasso/id-wsf-2.0/sessionprivate.h b/lasso/id-wsf-2.0/sessionprivate.h new file mode 100644 index 00000000..951368b5 --- /dev/null +++ b/lasso/id-wsf-2.0/sessionprivate.h @@ -0,0 +1,44 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __LASSO_IDWSF2_SERVERPRIVATE_H__ +#define __LASSO_IDWSF2_SERVERPRIVATE_H__ + +#include "../utils.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include "../id-ff/session.h" +#include <libxml/tree.h> + +void lasso_session_id_wsf2_init_eprs(LassoSession *session, xmlNode *t); +void lasso_session_id_wsf2_dump_eprs(LassoSession *session, xmlNode *xmlnode); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __LASSO_IDWSF2_SERVERPRIVATE_H__ */ diff --git a/lasso/id-wsf/Makefile.am b/lasso/id-wsf/Makefile.am index b8a1b742..74361773 100644 --- a/lasso/id-wsf/Makefile.am +++ b/lasso/id-wsf/Makefile.am @@ -8,7 +8,8 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"lasso\" lasso_private_h_sources = \ - wsf_profile_private.h + wsf_profile_private.h \ + id_ff_extensions_private.h if WSF_ENABLED noinst_LTLIBRARIES = liblasso-id-wsf.la @@ -19,17 +20,19 @@ WSF_C_FILES = \ personal_profile_service.c \ data_service.c \ wsf_profile.c \ - utils.c + utils.c \ + id_ff_extensions.c WSF_H_FILES = \ + id_wsf.h \ authentication.h \ discovery.h \ - identity.h \ interaction_profile_service.h \ personal_profile_service.h \ data_service.h \ wsf_profile.h \ - utils.h + utils.h \ + id_ff_extensions.h endif liblasso_id_wsf_la_SOURCES = $(WSF_C_FILES) diff --git a/lasso/id-wsf/authentication.c b/lasso/id-wsf/authentication.c index dc8721f3..77e6b04d 100644 --- a/lasso/id-wsf/authentication.c +++ b/lasso/id-wsf/authentication.c @@ -23,10 +23,10 @@ */ #include "../xml/private.h" -#include <lasso/id-wsf/authentication.h> -#include <lasso/xml/sa_sasl_request.h> -#include <lasso/xml/sa_sasl_response.h> -#include <lasso/xml/soap_binding_correlation.h> +#include "authentication.h" +#include "../xml/sa_sasl_request.h" +#include "../xml/sa_sasl_response.h" +#include "../xml/soap_binding_correlation.h" #include <xmlsec/base64.h> /* SASL client callbacks (for secret, login, password, ... ) */ diff --git a/lasso/id-wsf/authentication.h b/lasso/id-wsf/authentication.h index 0aa86f23..88a5e745 100644 --- a/lasso/id-wsf/authentication.h +++ b/lasso/id-wsf/authentication.h @@ -32,8 +32,8 @@ extern "C" { #include <sasl/sasl.h> -#include <lasso/id-wsf/wsf_profile.h> -#include <lasso/xml/disco_description.h> +#include "wsf_profile.h" +#include "../xml/disco_description.h" #define LASSO_TYPE_AUTHENTICATION (lasso_authentication_get_type()) #define LASSO_AUTHENTICATION(obj) \ diff --git a/lasso/id-wsf/data_service.c b/lasso/id-wsf/data_service.c index b25b1af9..c54089b5 100644 --- a/lasso/id-wsf/data_service.c +++ b/lasso/id-wsf/data_service.c @@ -61,15 +61,15 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <lasso/id-wsf/discovery.h> -#include <lasso/id-wsf/data_service.h> -#include <lasso/xml/dst_query.h> -#include <lasso/xml/dst_query_response.h> -#include <lasso/xml/dst_modify.h> -#include <lasso/xml/dst_modify_response.h> -#include <lasso/xml/soap_binding_correlation.h> -#include <lasso/xml/soap_fault.h> -#include <lasso/xml/is_redirect_request.h> +#include "discovery.h" +#include "data_service.h" +#include "../xml/dst_query.h" +#include "../xml/dst_query_response.h" +#include "../xml/dst_modify.h" +#include "../xml/dst_modify_response.h" +#include "../xml/soap_binding_correlation.h" +#include "../xml/soap_fault.h" +#include "../xml/is_redirect_request.h" #include <xmlsec/xmltree.h> #include <xmlsec/xmldsig.h> diff --git a/lasso/id-wsf/data_service.h b/lasso/id-wsf/data_service.h index 4097ca1d..2ccf7d30 100644 --- a/lasso/id-wsf/data_service.h +++ b/lasso/id-wsf/data_service.h @@ -30,15 +30,15 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-wsf/wsf_profile.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/disco_encrypted_resource_id.h> -#include <lasso/xml/dst_data.h> -#include <lasso/xml/dst_modification.h> -#include <lasso/xml/dst_query_item.h> -#include <lasso/xml/disco_resource_offering.h> -#include <lasso/xml/xml.h> -#include <lasso/xml/saml_assertion.h> +#include "wsf_profile.h" +#include "../xml/disco_resource_id.h" +#include "../xml/disco_encrypted_resource_id.h" +#include "../xml/dst_data.h" +#include "../xml/dst_modification.h" +#include "../xml/dst_query_item.h" +#include "../xml/disco_resource_offering.h" +#include "../xml/xml.h" +#include "../xml/saml_assertion.h" #define LASSO_TYPE_DATA_SERVICE (lasso_data_service_get_type()) #define LASSO_DATA_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/id-wsf/id_ff_extensions.c b/lasso/id-wsf/id_ff_extensions.c new file mode 100644 index 00000000..83ed40fe --- /dev/null +++ b/lasso/id-wsf/id_ff_extensions.c @@ -0,0 +1,371 @@ +/* $Id$ + * + * + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "id_ff_extensions.h" +#include "id_ff_extensions_private.h" +#include "../xml/disco_description.h" +#include "../xml/disco_resource_offering.h" +#include "../xml/disco_service_instance.h" +#include "../xml/id-wsf-2.0/disco_service_context.h" +#include "../id-ff/profile.h" +#include "../id-ff/server.h" +#include "../id-ff/loginprivate.h" +#include "../id-ff/serverprivate.h" +#include "../id-ff/identityprivate.h" +#include "../xml/saml_attribute.h" +#include "../xml/saml_attribute_value.h" +#include "../xml/saml_attribute_statement.h" +#include "../id-wsf-2.0/server.h" + +/** + * lasso_login_assertion_add_discovery: + * @login: a #LassoLogin + * @assertion: + * + * Adds AttributeStatement and ResourceOffering attributes to assertion if + * there is a discovery service. + **/ +void +lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *assertion) +{ + LassoProfile *profile = LASSO_PROFILE(login); + LassoDiscoResourceOffering *resourceOffering; + LassoDiscoServiceInstance *serviceInstance, *newServiceInstance; + LassoSamlAttributeStatement *attributeStatement; + LassoSamlAttribute *attribute; + LassoSamlAttributeValue *attributeValue; + + serviceInstance = lasso_server_get_service(profile->server, LASSO_DISCO_HREF); + if (LASSO_IS_DISCO_SERVICE_INSTANCE(serviceInstance) && + login->private_data->resourceId) { + newServiceInstance = lasso_disco_service_instance_copy(serviceInstance); + + resourceOffering = lasso_disco_resource_offering_new(newServiceInstance); + lasso_release_gobject(newServiceInstance); + lasso_assign_gobject(resourceOffering->ResourceID, login->private_data->resourceId); + + attributeValue = lasso_saml_attribute_value_new(); + lasso_list_add_new_gobject(attributeValue->any, resourceOffering); + + attribute = lasso_saml_attribute_new(); + lasso_assign_string(attribute->attributeName, "DiscoveryResourceOffering"); + lasso_assign_string(attribute->attributeNameSpace, LASSO_DISCO_HREF); + lasso_list_add_new_gobject(attribute->AttributeValue, attributeValue); + + attributeStatement = lasso_saml_attribute_statement_new(); + lasso_list_add_new_gobject(attributeStatement->Attribute, attribute); + + lasso_assign_new_gobject(assertion->AttributeStatement, attributeStatement); + + /* FIXME: Add CredentialsRef and saml:Advice Assertions */ + } +} + + +/** + * lasso_login_set_encryptedResourceId: + * @login: a #LassoLogin + * @encryptedResourceId: + * + * ... + * + * Return value: 0 on success; or a negative value otherwise. + **/ +int +lasso_login_set_encryptedResourceId(LassoLogin *login, + LassoDiscoEncryptedResourceID *encryptedResourceId) +{ + g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + g_return_val_if_fail(LASSO_IS_DISCO_ENCRYPTED_RESOURCE_ID(encryptedResourceId), + LASSO_PARAM_ERROR_INVALID_VALUE); + + lasso_assign_gobject(login->private_data->encryptedResourceId, encryptedResourceId); + + return 0; +} + + +/** + * lasso_login_set_resourceId: + * @login: a #LassoLogin + * @content: + * + * ... + * + * Return value: 0 on success; or a negative value otherwise. + **/ +int +lasso_login_set_resourceId(LassoLogin *login, const char *content) +{ + g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + g_return_val_if_fail(content != NULL, LASSO_PARAM_ERROR_INVALID_VALUE); + + lasso_assign_new_gobject(login->private_data->resourceId, lasso_disco_resource_id_new(content)); + return 0; +} + + +/** + * lasso_server_add_service: + * @server: a #LassoServer + * @service: a #LassoNode object implementing representing a service endpoint. + * + * Add a service to the registry of service of this #LassoServer object. + * + * Return value: 0 on success; a negative value if an error occured. + **/ +gint +lasso_server_add_service(LassoServer *server, LassoNode *service) +{ + g_return_val_if_fail(LASSO_IS_SERVER(server), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + g_return_val_if_fail(service != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + + if (LASSO_IS_DISCO_SERVICE_INSTANCE(service)) { + g_hash_table_insert(server->services, + g_strdup(LASSO_DISCO_SERVICE_INSTANCE(service)->ServiceType), + g_object_ref(service)); + } else if (LASSO_IS_IDWSF2_DISCO_SVC_METADATA(service)) { + return lasso_server_add_svc_metadata(server, + LASSO_IDWSF2_DISCO_SVC_METADATA(service)); + } else { + return LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ; + } + return 0; +} + + +static void +add_service_childnode(G_GNUC_UNUSED gchar *key, LassoNode *value, xmlNode *xmlnode) +{ + xmlAddChild(xmlnode, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE)); +} + + +void +lasso_server_dump_id_wsf_services(LassoServer *server, xmlNode *xmlnode) +{ + if (g_hash_table_size(server->services)) { + xmlNode *t; + t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"Services", NULL); + g_hash_table_foreach(server->services, + (GHFunc)add_service_childnode, t); + } +} + + +void +lasso_server_init_id_wsf_services(LassoServer *server, xmlNode *t) { + xmlNode *t2 = t->children; + /* Services */ + if (strcmp((char*)t->name, "Services") == 0) { + while (t2) { + LassoDiscoServiceInstance *s; + if (t2->type != XML_ELEMENT_NODE) { + t2 = t2->next; + continue; + } + s = g_object_new(LASSO_TYPE_DISCO_SERVICE_INSTANCE, NULL); + LASSO_NODE_GET_CLASS(s)->init_from_xml(LASSO_NODE(s), t2); + g_hash_table_insert(server->services, g_strdup(s->ServiceType), s); + t2 = t2->next; + } + } +} + + +/** + * lasso_identity_add_resource_offering: + * @identity: a #LassoIdentity object + * @offering: a #LassoDiscoResourceOffering object to add + * + * Add a new offering to the identity object to be retrieved later by + * lasso_identity_get_offerings() or lasso_identity_get_resource_offering(). + * It also allocate an entryId identifier for the offering, look into + * offering->entryID to get it after this call. + * + * Return value: Always 0, there should not be any error (if memory is not exhausted). + */ +gint +lasso_identity_add_resource_offering(LassoIdentity *identity, + LassoDiscoResourceOffering *offering) +{ + char entry_id_s[20]; + + g_return_val_if_fail(LASSO_IS_IDENTITY(identity), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + g_return_val_if_fail(LASSO_IS_DISCO_RESOURCE_OFFERING(offering), + LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + + do { + g_snprintf(entry_id_s, 18, "%d", identity->private_data->last_entry_id); + identity->private_data->last_entry_id++; + } while (g_hash_table_lookup(identity->private_data->resource_offerings_map, entry_id_s)); + lasso_assign_string(offering->entryID, entry_id_s); + g_hash_table_insert(identity->private_data->resource_offerings_map, + g_strdup(offering->entryID), g_object_ref(offering)); + identity->is_dirty = TRUE; + + return 0; +} + + +/** + * lasso_identity_remove_resource_offering: + * @identity: a #LassoIdentity + * @entryID: the resource offering entry ID + * + * Remove resource offering about identity with @entryID + * + * Return value: TRUE on success; FALSE if the offering was not found. + **/ +gboolean +lasso_identity_remove_resource_offering(LassoIdentity *identity, const char *entryID) +{ + g_return_val_if_fail(LASSO_IS_IDENTITY(identity), FALSE); + g_return_val_if_fail(entryID != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); + + if (g_hash_table_remove(identity->private_data->resource_offerings_map, entryID)) { + identity->is_dirty = TRUE; + return TRUE; + } else { + return FALSE; + } +} + + +/* Context type for the callback add_matching_resource_offering_to_list */ +struct HelperStruct { + GList *list; + const char *service_type; +}; + + +/* + * Helper function for lasso_identity_get_offerings, match them with a service + * type string */ +static +void add_matching_resource_offering_to_list(G_GNUC_UNUSED char *name, LassoDiscoResourceOffering *offering, + struct HelperStruct *ctx) +{ + if (ctx->service_type == NULL || + ( offering->ServiceInstance != NULL && + offering->ServiceInstance->ServiceType != NULL && + strcmp(offering->ServiceInstance->ServiceType, ctx->service_type) == 0)) { + lasso_list_add_gobject(ctx->list, offering); + } +} + + +/** + * lasso_identity_get_offerings: + * @identity: a #LassoIdentity + * @service_type: a char* string representing the type of service we are looking for + * + * Returns a list of #LassoDiscoResourceOffering associated to this service type. + * + * Return value: a newly allocated list of #LassoDiscoResourceOffering + */ +GList* +lasso_identity_get_offerings(LassoIdentity *identity, const char *service_type) +{ + struct HelperStruct ctx = { NULL, service_type }; + + g_return_val_if_fail(LASSO_IS_IDENTITY(identity), NULL); + + g_hash_table_foreach(identity->private_data->resource_offerings_map, + (GHFunc)add_matching_resource_offering_to_list, &ctx); + + return ctx.list; +} + + +/** + * lasso_identity_resource_offering: + * @identity: a #LassoIdentity + * @entryID: the entryID of the researched #LassoDiscoResourceOffering + * + * Lookup a #LassoDiscoResourceOffering corresponding to entryID, entryID is + * usually allocated by lasso_identity_add_resource_offering() inside + * offering->entryID. + * + * Return value: a #LassoDiscoResourceOffering, your must ref it if you intend + * to keep it around. + */ +LassoDiscoResourceOffering* +lasso_identity_get_resource_offering(LassoIdentity *identity, const char *entryID) +{ + g_return_val_if_fail(LASSO_IS_IDENTITY(identity), NULL); + g_return_val_if_fail(entryID != NULL, NULL); + + return g_hash_table_lookup(identity->private_data->resource_offerings_map, entryID); +} + + +/** + * lasso_server_add_service_from_dump: + * @server: a #LassoServer + * @dump: the XML dump of a #LassoNode representing a service endpoint. + * + * An utility function that parse a #LassoNode dump an try to add it as a + * service using lasso_server_add_service. + * + * Return value: 0 if succesfull, LASSO_PARAM_ERROR_BAD_TYPE_OF_NULL_OBJECT if + * said dump is not a #LassoNode or is not of the righ type, + * LASSO_PARAM_ERROR_INVALID_VALUE if dump is NULL. + **/ +gint +lasso_server_add_service_from_dump(LassoServer *server, const gchar *dump) +{ + LassoNode *node; + gint return_code; + + g_return_val_if_fail(dump != NULL, LASSO_PARAM_ERROR_INVALID_VALUE); + + node = lasso_node_new_from_dump(dump); + + return_code = lasso_server_add_service(server, node); + + g_object_unref(node); + + return return_code; +} + + +/** + * lasso_server_get_service: + * @server: a #LassoServer + * @serviceType: + * + * ... + * + * Return value: the #LassoDiscoServiceInstance, NULL if it was not found. + * The #LassoDiscoServiceInstance is owned by Lasso and should not be + * freed. + **/ +LassoDiscoServiceInstance* +lasso_server_get_service(LassoServer *server, const gchar *serviceType) +{ + return g_hash_table_lookup(server->services, serviceType); +} diff --git a/lasso/id-wsf/identity.h b/lasso/id-wsf/id_ff_extensions.h index bc30f1c6..031a74ca 100644 --- a/lasso/id-wsf/identity.h +++ b/lasso/id-wsf/id_ff_extensions.h @@ -22,14 +22,30 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __LASSO_WSF_IDENTITY_H__ -#define __LASSO_WSF_IDENTITY_H__ +#ifndef __LASSO_WSF_ID_FF_EXTENSIONS_H__ +#define __LASSO_WSF_ID_FF_EXTENSIONS_H__ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/disco_resource_offering.h> +#include "../id-ff/login.h" +#include "../id-ff/server.h" +#include "../xml/disco_encrypted_resource_id.h" +#include "../xml/disco_service_instance.h" +#include "../xml/disco_resource_offering.h" + +LASSO_EXPORT int lasso_login_set_encryptedResourceId( + LassoLogin *login, LassoDiscoEncryptedResourceID *encryptedResourceId); + +LASSO_EXPORT int lasso_login_set_resourceId(LassoLogin *login, const char *content); + +LASSO_EXPORT LassoDiscoServiceInstance* lasso_server_get_service(LassoServer *server, + const gchar *serviceType); + +LASSO_EXPORT gint lasso_server_add_service(LassoServer *server, LassoNode *service); + +LASSO_EXPORT gint lasso_server_add_service_from_dump(LassoServer *server, const gchar *dump); LASSO_EXPORT gint lasso_identity_add_resource_offering(LassoIdentity *identity, LassoDiscoResourceOffering *offering); @@ -44,4 +60,4 @@ LASSO_EXPORT LassoDiscoResourceOffering* lasso_identity_get_resource_offering( } #endif /* __cplusplus */ -#endif /* __LASSO_WSF_IDENTITY_H__ */ +#endif /* __LASSO_WSF_ID_FF_EXTENSIONS_H__ */ diff --git a/lasso/id-wsf/id_ff_extensions_private.h b/lasso/id-wsf/id_ff_extensions_private.h new file mode 100644 index 00000000..e076300b --- /dev/null +++ b/lasso/id-wsf/id_ff_extensions_private.h @@ -0,0 +1,47 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __LASSO_WSF_ID_FF_EXTENSIONS_H__ +#define __LASSO_WSF_ID_FF_EXTENSIONS_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include "../id-ff/login.h" +#include "../xml/saml_assertion.h" + +void lasso_login_assertion_add_discovery(LassoLogin *login, LassoSamlAssertion *assertion); + +void lasso_server_dump_id_wsf_services(LassoServer *server, xmlNode *xmlnode); + +void lasso_server_init_id_wsf_services(LassoServer *server, xmlNode *t); + +gint lasso_server_add_service(LassoServer *server, LassoNode *service); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __LASSO_WSF_ID_FF_EXTENSIONS_H__ */ diff --git a/lasso/id-wsf/id_wsf.h b/lasso/id-wsf/id_wsf.h new file mode 100644 index 00000000..284257a9 --- /dev/null +++ b/lasso/id-wsf/id_wsf.h @@ -0,0 +1,38 @@ +/* $Id$ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004-2007 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __LASSO_IDSWF_H__ +#define __LASSO_IDSWF_H__ + +#include "authentication.h" +#include "data_service.h" +#include "discovery.h" +#include "id_ff_extensions.h" +#include "id_wsf.h" +#include "interaction_profile_service.h" +#include "personal_profile_service.h" +#include "utils.h" +#include "wsf_profile.h" + +#endif /* __LASSO_IDSWF_H__ */ diff --git a/lasso/id-wsf/interaction_profile_service.h b/lasso/id-wsf/interaction_profile_service.h index 064b54ee..ed947367 100644 --- a/lasso/id-wsf/interaction_profile_service.h +++ b/lasso/id-wsf/interaction_profile_service.h @@ -30,9 +30,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/is_interaction_request.h> -#include <lasso/xml/is_interaction_response.h> -#include <lasso/id-wsf/wsf_profile.h> +#include "../xml/is_interaction_request.h" +#include "../xml/is_interaction_response.h" +#include "wsf_profile.h" #define LASSO_TYPE_INTERACTION_PROFILE_SERVICE (lasso_interaction_profile_service_get_type()) #define LASSO_INTERACTION_PROFILE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/id-wsf/personal_profile_service.h b/lasso/id-wsf/personal_profile_service.h index 0a90ac48..4f00133f 100644 --- a/lasso/id-wsf/personal_profile_service.h +++ b/lasso/id-wsf/personal_profile_service.h @@ -30,13 +30,13 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-wsf/data_service.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/disco_encrypted_resource_id.h> -#include <lasso/xml/dst_data.h> -#include <lasso/xml/dst_modification.h> -#include <lasso/xml/dst_query_item.h> -#include <lasso/xml/disco_resource_offering.h> +#include "data_service.h" +#include "../xml/disco_resource_id.h" +#include "../xml/disco_encrypted_resource_id.h" +#include "../xml/dst_data.h" +#include "../xml/dst_modification.h" +#include "../xml/dst_query_item.h" +#include "../xml/disco_resource_offering.h" #define LASSO_TYPE_PERSONAL_PROFILE_SERVICE (lasso_personal_profile_service_get_type()) #define LASSO_PERSONAL_PROFILE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/id-wsf/utils.c b/lasso/id-wsf/utils.c index df687942..4d89a2bf 100644 --- a/lasso/id-wsf/utils.c +++ b/lasso/id-wsf/utils.c @@ -36,7 +36,7 @@ #include <glib.h> #include <string.h> -#include <lasso/xml/strings.h> +#include "../xml/strings.h" /** * lasso_security_mech_id_is_null_authentication: diff --git a/lasso/id-wsf/wsf_profile.h b/lasso/id-wsf/wsf_profile.h index a71f05bf..6cfef407 100644 --- a/lasso/id-wsf/wsf_profile.h +++ b/lasso/id-wsf/wsf_profile.h @@ -30,16 +30,16 @@ extern "C" { #endif /* __cplusplus */ -#include <../id-ff/server.h> -#include <../id-ff/identity.h> -#include <../id-ff/session.h> -#include <../xml/soap_envelope.h> -#include <../xml/soap_binding_provider.h> -#include <../xml/soap_fault.h> -#include <../xml/saml_assertion.h> -#include <../xml/disco_description.h> -#include <../xml/disco_resource_offering.h> -#include <../xml/disco_description.h> +#include "../id-ff/server.h" +#include "../id-ff/identity.h" +#include "../id-ff/session.h" +#include "../xml/soap_envelope.h" +#include "../xml/soap_binding_provider.h" +#include "../xml/soap_fault.h" +#include "../xml/saml_assertion.h" +#include "../xml/disco_description.h" +#include "../xml/disco_resource_offering.h" +#include "../xml/disco_description.h" #define LASSO_TYPE_WSF_PROFILE (lasso_wsf_profile_get_type()) #define LASSO_WSF_PROFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ @@ -105,8 +105,8 @@ LASSO_EXPORT gint lasso_wsf_profile_build_soap_response_msg(LassoWsfProfile *pro LASSO_EXPORT gint lasso_wsf_profile_init_soap_request(LassoWsfProfile *profile, LassoNode *request); -LASSO_EXPORT gint lasso_wsf_profile_init_soap_response(LassoWsfProfile *profile, LassoNode - *response); +LASSO_EXPORT gint lasso_wsf_profile_init_soap_response(LassoWsfProfile *profile, + LassoNode *response); LASSO_EXPORT gint lasso_wsf_profile_process_soap_request_msg(LassoWsfProfile *profile, const gchar *message, const gchar *security_mech_id); diff --git a/lasso/lasso.c b/lasso/lasso.c index 27c63288..cc845589 100644 --- a/lasso/lasso.c +++ b/lasso/lasso.c @@ -28,7 +28,6 @@ * **/ -#include "xml/private.h" #include <stdlib.h> /* getenv */ #include <string.h> /* strcmp */ #include <xmlsec/xmlsec.h> @@ -36,9 +35,11 @@ #include <libxslt/xslt.h> #include <config.h> #include "lasso.h" +#include "lasso_config.h" #include "debug.h" -#include "./backward_comp.h" -#include "./registry-private.h" +#include "backward_comp.h" +#include "registry-private.h" +#include "xml/private.h" /* Set to true, it forces lasso_provider_verify_signature and lasso_query_verify_signature to always * return TRUE. */ diff --git a/lasso/lasso.h b/lasso/lasso.h index 9b8ac81a..07cb94b6 100644 --- a/lasso/lasso.h +++ b/lasso/lasso.h @@ -36,16 +36,16 @@ extern "C" { #include <glib.h> #include <glib-object.h> -#include <lasso/export.h> +#include "export.h" -#include <lasso/id-ff/defederation.h> -#include <lasso/id-ff/lecp.h> -#include <lasso/id-ff/login.h> -#include <lasso/id-ff/logout.h> -#include <lasso/id-ff/name_identifier_mapping.h> -#include <lasso/id-ff/name_registration.h> -#include <lasso/saml-2.0/name_id_management.h> -#include <lasso/saml-2.0/ecp.h> +#include "id-ff/defederation.h" +#include "id-ff/lecp.h" +#include "id-ff/login.h" +#include "id-ff/logout.h" +#include "id-ff/name_identifier_mapping.h" +#include "id-ff/name_registration.h" +#include "saml-2.0/name_id_management.h" +#include "saml-2.0/ecp.h" LASSO_EXPORT int lasso_init(void); LASSO_EXPORT int lasso_shutdown(void); diff --git a/lasso/registry.h b/lasso/registry.h index dbb73d15..03aa79e9 100644 --- a/lasso/registry.h +++ b/lasso/registry.h @@ -27,7 +27,7 @@ #define __REGISTRY_H__ #include <glib.h> -#include <lasso/lasso.h> +#include "lasso.h" #ifdef __cplusplus extern "C" { diff --git a/lasso/saml-2.0/assertion_query.c b/lasso/saml-2.0/assertion_query.c index ef0137de..dc31a51d 100644 --- a/lasso/saml-2.0/assertion_query.c +++ b/lasso/saml-2.0/assertion_query.c @@ -23,20 +23,20 @@ */ #include "../xml/private.h" -#include <lasso/saml-2.0/assertion_query.h> -#include <lasso/saml-2.0/providerprivate.h> -#include <lasso/saml-2.0/profileprivate.h> -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/identityprivate.h> -#include <lasso/id-ff/serverprivate.h> -#include <lasso/xml/xml_enc.h> -#include <lasso/xml/saml-2.0/samlp2_assertion_id_request.h> -#include <lasso/xml/saml-2.0/samlp2_authn_query.h> -#include <lasso/xml/saml-2.0/samlp2_attribute_query.h> -#include <lasso/xml/saml-2.0/samlp2_authz_decision_query.h> -#include <lasso/xml/saml-2.0/samlp2_response.h> -#include <lasso/xml/saml-2.0/samlp2_subject_query_abstract.h> +#include "assertion_query.h" +#include "providerprivate.h" +#include "profileprivate.h" +#include "../id-ff/providerprivate.h" +#include "../id-ff/profileprivate.h" +#include "../id-ff/identityprivate.h" +#include "../id-ff/serverprivate.h" +#include "../xml/xml_enc.h" +#include "../xml/saml-2.0/samlp2_assertion_id_request.h" +#include "../xml/saml-2.0/samlp2_authn_query.h" +#include "../xml/saml-2.0/samlp2_attribute_query.h" +#include "../xml/saml-2.0/samlp2_authz_decision_query.h" +#include "../xml/saml-2.0/samlp2_response.h" +#include "../xml/saml-2.0/samlp2_subject_query_abstract.h" #include "../utils.h" diff --git a/lasso/saml-2.0/assertion_query.h b/lasso/saml-2.0/assertion_query.h index 83da75e1..d8aeb4a5 100644 --- a/lasso/saml-2.0/assertion_query.h +++ b/lasso/saml-2.0/assertion_query.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> -#include <lasso/xml/saml-2.0/samlp2_manage_name_id_request.h> -#include <lasso/xml/saml-2.0/samlp2_manage_name_id_response.h> +#include "../id-ff/profile.h" +#include "../xml/saml-2.0/samlp2_manage_name_id_request.h" +#include "../xml/saml-2.0/samlp2_manage_name_id_response.h" #define LASSO_TYPE_ASSERTION_QUERY (lasso_assertion_query_get_type()) #define LASSO_ASSERTION_QUERY(obj) \ diff --git a/lasso/saml-2.0/ecp.c b/lasso/saml-2.0/ecp.c index 1bb72d65..87112534 100644 --- a/lasso/saml-2.0/ecp.c +++ b/lasso/saml-2.0/ecp.c @@ -32,15 +32,15 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <lasso/saml-2.0/providerprivate.h> -#include <lasso/saml-2.0/profileprivate.h> -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/identityprivate.h> -#include <lasso/id-ff/serverprivate.h> +#include "providerprivate.h" +#include "profileprivate.h" +#include "../id-ff/providerprivate.h" +#include "../id-ff/identityprivate.h" +#include "../id-ff/serverprivate.h" -#include <lasso/saml-2.0/ecpprivate.h> +#include "ecpprivate.h" -#include <lasso/saml-2.0/ecp.h> +#include "ecp.h" #include "../utils.h" /*****************************************************************************/ diff --git a/lasso/saml-2.0/ecp.h b/lasso/saml-2.0/ecp.h index 5623d02d..94a8fbeb 100644 --- a/lasso/saml-2.0/ecp.h +++ b/lasso/saml-2.0/ecp.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml/xml.h" -#include <lasso/id-ff/profile.h> +#include "../id-ff/profile.h" #define LASSO_TYPE_ECP (lasso_ecp_get_type()) #define LASSO_ECP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_ECP, LassoEcp)) diff --git a/lasso/saml-2.0/federation.c b/lasso/saml-2.0/federation.c index 3b6462a3..a1a6de8b 100644 --- a/lasso/saml-2.0/federation.c +++ b/lasso/saml-2.0/federation.c @@ -24,10 +24,10 @@ #include "../xml/private.h" -#include <lasso/id-ff/federation.h> +#include "../id-ff/federation.h" #include "federationprivate.h" -#include <lasso/xml/saml-2.0/saml2_name_id.h> +#include "../xml/saml-2.0/saml2_name_id.h" static LassoNode* diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c index b361e6ec..a4ee5b15 100644 --- a/lasso/saml-2.0/login.c +++ b/lasso/saml-2.0/login.c @@ -26,43 +26,33 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <lasso/saml-2.0/providerprivate.h> -#include <lasso/saml-2.0/loginprivate.h> -#include <lasso/saml-2.0/profileprivate.h> -#include <lasso/saml-2.0/federationprivate.h> - -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/serverprivate.h> -#include <lasso/id-ff/login.h> -#include <lasso/id-ff/identityprivate.h> -#include <lasso/id-ff/sessionprivate.h> -#include <lasso/id-ff/loginprivate.h> - -#include <lasso/xml/xml_enc.h> - -#include <lasso/xml/saml-2.0/samlp2_authn_request.h> -#include <lasso/xml/saml-2.0/samlp2_response.h> -#include <lasso/xml/saml-2.0/saml2_assertion.h> -#include <lasso/xml/saml-2.0/saml2_audience_restriction.h> -#include <lasso/xml/saml-2.0/saml2_authn_statement.h> -#include <lasso/xml/saml-2.0/saml2_encrypted_element.h> -#include <lasso/xml/saml-2.0/saml2_attribute.h> -#include <lasso/xml/saml-2.0/saml2_attribute_statement.h> -#include <lasso/xml/saml-2.0/saml2_attribute_value.h> -#include <lasso/xml/saml-2.0/saml2_name_id.h> +#include "providerprivate.h" +#include "loginprivate.h" +#include "profileprivate.h" +#include "federationprivate.h" + +#include "../id-ff/providerprivate.h" +#include "../id-ff/serverprivate.h" +#include "../id-ff/login.h" +#include "../id-ff/identityprivate.h" +#include "../id-ff/sessionprivate.h" +#include "../id-ff/loginprivate.h" + +#include "../xml/xml_enc.h" + +#include "../xml/saml-2.0/samlp2_authn_request.h" +#include "../xml/saml-2.0/samlp2_response.h" +#include "../xml/saml-2.0/saml2_assertion.h" +#include "../xml/saml-2.0/saml2_audience_restriction.h" +#include "../xml/saml-2.0/saml2_authn_statement.h" +#include "../xml/saml-2.0/saml2_encrypted_element.h" +#include "../xml/saml-2.0/saml2_attribute.h" +#include "../xml/saml-2.0/saml2_attribute_statement.h" +#include "../xml/saml-2.0/saml2_attribute_value.h" +#include "../xml/saml-2.0/saml2_name_id.h" #ifdef LASSO_WSF_ENABLED -#include <lasso/id-wsf-2.0/identity.h> -#include <lasso/id-wsf-2.0/server.h> -#include <lasso/id-wsf-2.0/session.h> -#include <lasso/xml/ws/wsa_endpoint_reference.h> -#include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h> -#include <lasso/xml/id-wsf-2.0/disco_abstract.h> -#include <lasso/xml/id-wsf-2.0/disco_provider_id.h> -#include <lasso/xml/id-wsf-2.0/disco_service_type.h> -#include <lasso/xml/id-wsf-2.0/disco_service_context.h> -#include <lasso/xml/id-wsf-2.0/disco_security_context.h> -#include <lasso/xml/id-wsf-2.0/sec_token.h> +#include "../id-wsf-2.0/saml2_login_private.h" #endif #include "../utils.h" @@ -612,123 +602,6 @@ lasso_saml20_login_process_federation(LassoLogin *login, gboolean is_consent_obt } -#ifdef LASSO_WSF_ENABLED -static void -lasso_saml20_login_assertion_add_discovery(LassoLogin *login, LassoSaml2Assertion *assertion) -{ - GList *svcMDIDs; - GList *svcMDs; - LassoIdWsf2DiscoSvcMetadata *svcMD; - LassoWsAddrEndpointReference *epr; - LassoWsAddrMetadata *metadata; - LassoSaml2AttributeStatement *attributeStatement; - LassoSaml2Attribute *attribute; - LassoSaml2AttributeValue *attributeValue; - LassoIdWsf2DiscoSecurityContext *security_context; - LassoIdWsf2SecToken *sec_token; - LassoSaml2Assertion *assertion_identity_token; - LassoIdWsf2DiscoServiceContext *service_context; - LassoIdWsf2DiscoEndpointContext *endpoint_context; - - /* Get metadatas ids to which the user is associated */ - svcMDIDs = lasso_identity_get_svc_md_ids(LASSO_PROFILE(login)->identity); - /* Get the metadatas of type discovery to which the user is associated */ - svcMDs = lasso_server_get_svc_metadatas_with_id_and_type(LASSO_PROFILE(login)->server, - svcMDIDs, LASSO_IDWSF2_DISCO_HREF); - if (svcMDs == NULL) { - /* If the user hasn't been associated to any discovery metadatas, */ - /* get a default one */ - svcMDs = lasso_server_get_svc_metadatas_with_id_and_type( - LASSO_PROFILE(login)->server, NULL, LASSO_IDWSF2_DISCO_HREF); - if (svcMDs != NULL && LASSO_IS_IDWSF2_DISCO_SVC_METADATA(svcMDs->data)) { - /* Then associate the user to these metadatas for later use */ - lasso_identity_add_svc_md_id(LASSO_PROFILE(login)->identity, - LASSO_IDWSF2_DISCO_SVC_METADATA(svcMDs->data)->svcMDID); - } else { - return; - } - } - - /* FIXME : foreach on the whole list and build on epr for each svcMD */ - svcMD = svcMDs->data; - - /* Check the metadatas contain the infos needed to build an EPR */ - if (svcMD == NULL || svcMD->ServiceContext == NULL || svcMD->ServiceContext->data == NULL) { - g_list_foreach(svcMDs, (GFunc)lasso_node_destroy, NULL); - g_list_free(svcMDs); - return; - } - - /* Build EndpointReference */ - - epr = lasso_wsa_endpoint_reference_new(); - service_context = svcMD->ServiceContext->data; - endpoint_context = service_context->EndpointContext->data; - - epr->Address = lasso_wsa_attributed_uri_new_with_string( - (gchar*)endpoint_context->Address->data); - - metadata = lasso_wsa_metadata_new(); - - /* Abstract */ - metadata->any = g_list_append(metadata->any, - lasso_idwsf2_disco_abstract_new_with_string(svcMD->Abstract)); - /* ProviderID */ - metadata->any = g_list_append(metadata->any, - lasso_idwsf2_disco_provider_id_new_with_string(svcMD->ProviderID)); - /* ServiceType */ - metadata->any = g_list_append(metadata->any, - lasso_idwsf2_disco_service_type_new_with_string( - (char*)service_context->ServiceType->data)); - /* Framework */ - if (endpoint_context->Framework != NULL) { - metadata->any = g_list_append(metadata->any, - g_object_ref(endpoint_context->Framework->data)); - } - - /* Identity token */ - assertion_identity_token = LASSO_SAML2_ASSERTION(lasso_saml2_assertion_new()); - assertion_identity_token->Subject = g_object_ref(assertion->Subject); - - sec_token = lasso_idwsf2_sec_token_new(); - sec_token->any = LASSO_NODE(assertion_identity_token); - - security_context = lasso_idwsf2_disco_security_context_new(); - security_context->SecurityMechID = g_list_append( - security_context->SecurityMechID, g_strdup(LASSO_SECURITY_MECH_TLS_BEARER)); - security_context->Token = g_list_append(security_context->Token, sec_token); - - metadata->any = g_list_append(metadata->any, security_context); - - /* End of metadata construction */ - epr->Metadata = metadata; - - /* Add the EPR to the assertion as a SAML attribute */ - attributeValue = lasso_saml2_attribute_value_new(); - attributeValue->any = g_list_append(attributeValue->any, epr); - - attribute = LASSO_SAML2_ATTRIBUTE(lasso_saml2_attribute_new()); - attribute->Name = g_strdup(LASSO_SAML2_ATTRIBUTE_NAME_EPR); - attribute->NameFormat = g_strdup(LASSO_SAML2_ATTRIBUTE_NAME_FORMAT_URI); - attribute->AttributeValue = g_list_append(attribute->AttributeValue, attributeValue); - - attributeStatement = LASSO_SAML2_ATTRIBUTE_STATEMENT(lasso_saml2_attribute_statement_new()); - attributeStatement->Attribute = g_list_append(attributeStatement->Attribute, attribute); - - assertion->AttributeStatement = g_list_append(assertion->AttributeStatement, - attributeStatement); - - /* Free resources */ - g_list_foreach(svcMDs, (GFunc)lasso_node_destroy, NULL); - g_list_free(svcMDs); -} -#else -static void -lasso_saml20_login_assertion_add_discovery(G_GNUC_UNUSED LassoLogin *login, G_GNUC_UNUSED LassoSaml2Assertion *assertion) -{ -} -#endif - int lasso_saml20_login_build_assertion(LassoLogin *login, const char *authenticationMethod, @@ -889,7 +762,9 @@ lasso_saml20_login_build_assertion(LassoLogin *login, provider->private_data->encryption_sym_key_type; } +#ifdef LASSO_WSF_ENABLED lasso_saml20_login_assertion_add_discovery(login, assertion); +#endif /* store assertion in session object */ if (profile->session == NULL) { @@ -1348,67 +1223,6 @@ cleanup: return rc; } -#ifdef LASSO_WSF_ENABLED -static gint -lasso_saml20_login_copy_assertion_epr(LassoLogin *login) -{ - LassoProfile *profile = LASSO_PROFILE(login); - LassoSession *session = profile->session; - LassoSaml2Assertion *assertion; - LassoSaml2AttributeStatement *attribute_statement; - LassoSaml2Attribute *attribute; - LassoSaml2AttributeValue *attribute_value; - LassoWsAddrEndpointReference *epr; - GList *i; - - g_return_val_if_fail(LASSO_IS_SESSION(session), LASSO_PROFILE_ERROR_SESSION_NOT_FOUND); - - assertion = LASSO_SAML2_ASSERTION( - LASSO_SAMLP2_RESPONSE(profile->response)->Assertion->data); - - for (i = g_list_first(assertion->AttributeStatement); i; i = g_list_next(i)) { - GList *j; - attribute_statement = LASSO_SAML2_ATTRIBUTE_STATEMENT(i->data); - if (attribute_statement == NULL) { - continue; - } - - for (j = g_list_first(attribute_statement->Attribute); j; j = g_list_next(j)) { - GList *k; - attribute = LASSO_SAML2_ATTRIBUTE(j->data); - if (attribute == NULL || attribute->Name == NULL) { - continue; - } - if (strcmp(attribute->Name, LASSO_SAML2_ATTRIBUTE_NAME_EPR) != 0) { - continue; - } - for (k = g_list_first(attribute->AttributeValue); k; k = g_list_next(k)) { - GList *l; - attribute_value = LASSO_SAML2_ATTRIBUTE_VALUE(k->data); - if (attribute_value == NULL) { - continue; - } - for (l = g_list_first(attribute_value->any); - l; l = g_list_next(l)) { - if (LASSO_IS_WSA_ENDPOINT_REFERENCE(l->data)) { - epr = LASSO_WSA_ENDPOINT_REFERENCE(l->data); - lasso_session_add_endpoint_reference(session, epr); - return 0; - } - } - } - } - } - - return 0; -} -#else -static gint -lasso_saml20_login_copy_assertion_epr(G_GNUC_UNUSED LassoLogin *login) -{ - return LASSO_ERROR_UNIMPLEMENTED; -} -#endif gint lasso_saml20_login_accept_sso(LassoLogin *login) @@ -1467,7 +1281,9 @@ lasso_saml20_login_accept_sso(LassoLogin *login) lasso_identity_add_federation(LASSO_PROFILE(login)->identity, federation); } +#ifdef LASSO_WSF_ENABLED lasso_saml20_login_copy_assertion_epr(login); +#endif return 0; } diff --git a/lasso/saml-2.0/loginprivate.h b/lasso/saml-2.0/loginprivate.h index 80ddb3c7..0e3f9a7d 100644 --- a/lasso/saml-2.0/loginprivate.h +++ b/lasso/saml-2.0/loginprivate.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/login.h> +#include "../id-ff/login.h" gint lasso_saml20_login_init_authn_request(LassoLogin *login, LassoHttpMethod http_method); gint lasso_saml20_login_build_authn_request_msg(LassoLogin *login, LassoProvider *remote_provider); diff --git a/lasso/saml-2.0/logout.c b/lasso/saml-2.0/logout.c index 774d35d4..1a791023 100644 --- a/lasso/saml-2.0/logout.c +++ b/lasso/saml-2.0/logout.c @@ -23,24 +23,24 @@ */ #include "../xml/private.h" -#include <lasso/saml-2.0/providerprivate.h> -#include <lasso/saml-2.0/logoutprivate.h> -#include <lasso/saml-2.0/profileprivate.h> -#include <lasso/saml-2.0/federationprivate.h> - -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/logout.h> -#include <lasso/id-ff/logoutprivate.h> -#include <lasso/id-ff/identityprivate.h> -#include <lasso/id-ff/sessionprivate.h> -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/serverprivate.h> - -#include <lasso/xml/xml_enc.h> - -#include <lasso/xml/saml-2.0/samlp2_logout_request.h> -#include <lasso/xml/saml-2.0/samlp2_logout_response.h> -#include <lasso/xml/saml-2.0/saml2_assertion.h> +#include "providerprivate.h" +#include "logoutprivate.h" +#include "profileprivate.h" +#include "federationprivate.h" + +#include "../id-ff/providerprivate.h" +#include "../id-ff/logout.h" +#include "../id-ff/logoutprivate.h" +#include "../id-ff/identityprivate.h" +#include "../id-ff/sessionprivate.h" +#include "../id-ff/profileprivate.h" +#include "../id-ff/serverprivate.h" + +#include "../xml/xml_enc.h" + +#include "../xml/saml-2.0/samlp2_logout_request.h" +#include "../xml/saml-2.0/samlp2_logout_response.h" +#include "../xml/saml-2.0/saml2_assertion.h" #include "../utils.h" static void check_soap_support(gchar *key, LassoProvider *provider, LassoProfile *profile); diff --git a/lasso/saml-2.0/logoutprivate.h b/lasso/saml-2.0/logoutprivate.h index 1052f2bd..b3452abb 100644 --- a/lasso/saml-2.0/logoutprivate.h +++ b/lasso/saml-2.0/logoutprivate.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/logout.h> +#include "../id-ff/logout.h" int lasso_saml20_logout_init_request(LassoLogout *logout, LassoProvider *remote_provider, LassoHttpMethod http_method); diff --git a/lasso/saml-2.0/name_id_management.c b/lasso/saml-2.0/name_id_management.c index 1636e940..c204ea50 100644 --- a/lasso/saml-2.0/name_id_management.c +++ b/lasso/saml-2.0/name_id_management.c @@ -23,17 +23,17 @@ */ #include "../xml/private.h" -#include <../saml-2.0/name_id_management.h> -#include <../saml-2.0/providerprivate.h> -#include <../saml-2.0/profileprivate.h> -#include <../saml-2.0/serverprivate.h> -#include <../id-ff/providerprivate.h> -#include <../id-ff/profileprivate.h> -#include <../id-ff/identityprivate.h> -#include <../id-ff/serverprivate.h> -#include <../xml/xml_enc.h> +#include "name_id_management.h" +#include "providerprivate.h" +#include "profileprivate.h" +#include "serverprivate.h" +#include "../id-ff/providerprivate.h" +#include "../id-ff/profileprivate.h" +#include "../id-ff/identityprivate.h" +#include "../id-ff/serverprivate.h" +#include "../xml/xml_enc.h" #include "../utils.h" -#include <../xml/saml-2.0/samlp2_manage_name_id_request.h> +#include "../xml/saml-2.0/samlp2_manage_name_id_request.h" /** * SECTION:name_id_management diff --git a/lasso/saml-2.0/name_id_management.h b/lasso/saml-2.0/name_id_management.h index 358a6b01..ae4575e2 100644 --- a/lasso/saml-2.0/name_id_management.h +++ b/lasso/saml-2.0/name_id_management.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> -#include <lasso/xml/saml-2.0/samlp2_manage_name_id_request.h> -#include <lasso/xml/saml-2.0/samlp2_manage_name_id_response.h> +#include "../id-ff/profile.h" +#include "../xml/saml-2.0/samlp2_manage_name_id_request.h" +#include "../xml/saml-2.0/samlp2_manage_name_id_response.h" #define LASSO_TYPE_NAME_ID_MANAGEMENT (lasso_name_id_management_get_type()) #define LASSO_NAME_ID_MANAGEMENT(obj) \ diff --git a/lasso/saml-2.0/profile.c b/lasso/saml-2.0/profile.c index 580cd115..f0e23b9c 100644 --- a/lasso/saml-2.0/profile.c +++ b/lasso/saml-2.0/profile.c @@ -26,24 +26,24 @@ #include <xmlsec/base64.h> #include "../utils.h" -#include <lasso/saml-2.0/providerprivate.h> -#include <lasso/saml-2.0/profileprivate.h> -#include <lasso/saml-2.0/profile.h> - -#include <lasso/id-ff/providerprivate.h> -#include <lasso/id-ff/profile.h> -#include <lasso/id-ff/profileprivate.h> -#include <lasso/id-ff/serverprivate.h> +#include "providerprivate.h" +#include "profileprivate.h" +#include "profile.h" + +#include "../id-ff/providerprivate.h" +#include "../id-ff/profile.h" +#include "../id-ff/profileprivate.h" +#include "../id-ff/serverprivate.h" #include <../id-ff/sessionprivate.h> -#include <lasso/xml/private.h> -#include <lasso/xml/saml-2.0/samlp2_request_abstract.h> -#include <lasso/xml/saml-2.0/samlp2_artifact_resolve.h> -#include <lasso/xml/saml-2.0/samlp2_artifact_response.h> -#include <lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h> -#include <lasso/xml/saml-2.0/samlp2_status_response.h> -#include <lasso/xml/saml-2.0/samlp2_response.h> -#include <lasso/xml/saml-2.0/saml2_assertion.h> +#include "../xml/private.h" +#include "../xml/saml-2.0/samlp2_request_abstract.h" +#include "../xml/saml-2.0/samlp2_artifact_resolve.h" +#include "../xml/saml-2.0/samlp2_artifact_response.h" +#include "../xml/saml-2.0/samlp2_name_id_mapping_response.h" +#include "../xml/saml-2.0/samlp2_status_response.h" +#include "../xml/saml-2.0/samlp2_response.h" +#include "../xml/saml-2.0/saml2_assertion.h" #include "../utils.h" #include "../debug.h" diff --git a/lasso/saml-2.0/profileprivate.h b/lasso/saml-2.0/profileprivate.h index 011e5474..5b1d4937 100644 --- a/lasso/saml-2.0/profileprivate.h +++ b/lasso/saml-2.0/profileprivate.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-ff/profile.h> -#include <lasso/xml/saml-2.0/saml2_name_id.h> -#include <lasso/xml/saml-2.0/saml2_encrypted_element.h> +#include "../id-ff/profile.h" +#include "../xml/saml-2.0/saml2_name_id.h" +#include "../xml/saml-2.0/saml2_encrypted_element.h" #include "../xml/saml-2.0/samlp2_status_response.h" #include "../xml/saml-2.0/samlp2_request_abstract.h" #include "../id-ff/provider.h" diff --git a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c index fc9e04a0..2775316c 100644 --- a/lasso/saml-2.0/provider.c +++ b/lasso/saml-2.0/provider.c @@ -25,8 +25,8 @@ #include "../xml/private.h" #include <xmlsec/base64.h> -#include <lasso/saml-2.0/providerprivate.h> -#include <lasso/id-ff/providerprivate.h> +#include "providerprivate.h" +#include "../id-ff/providerprivate.h" #include "../utils.h" const char *profile_names[] = { diff --git a/lasso/saml-2.0/providerprivate.h b/lasso/saml-2.0/providerprivate.h index 6a25d553..6f8d8367 100644 --- a/lasso/saml-2.0/providerprivate.h +++ b/lasso/saml-2.0/providerprivate.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/id-ff/provider.h> +#include "../xml/xml.h" +#include "../id-ff/provider.h" gboolean lasso_saml20_provider_load_metadata(LassoProvider *provider, xmlNode *root_node); diff --git a/lasso/saml-2.0/server.c b/lasso/saml-2.0/server.c index e3095b02..41763fc8 100644 --- a/lasso/saml-2.0/server.c +++ b/lasso/saml-2.0/server.c @@ -23,9 +23,9 @@ */ #include "../xml/private.h" -#include <lasso/saml-2.0/serverprivate.h> -#include <lasso/id-ff/serverprivate.h> -#include <lasso/id-ff/providerprivate.h> +#include "serverprivate.h" +#include "../id-ff/serverprivate.h" +#include "../id-ff/providerprivate.h" int diff --git a/lasso/saml-2.0/serverprivate.h b/lasso/saml-2.0/serverprivate.h index aea2f20a..335a45dc 100644 --- a/lasso/saml-2.0/serverprivate.h +++ b/lasso/saml-2.0/serverprivate.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/id-ff/server.h> +#include "../xml/xml.h" +#include "../id-ff/server.h" int lasso_saml20_server_load_affiliation(LassoServer *server, xmlNode *node); diff --git a/lasso/xml/disco_authenticate_requester.c b/lasso/xml/disco_authenticate_requester.c index fc00ae8f..f55ed40e 100644 --- a/lasso/xml/disco_authenticate_requester.c +++ b/lasso/xml/disco_authenticate_requester.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_authenticate_requester.h> +#include "disco_authenticate_requester.h" /** * SECTION:disco_authenticate_requester diff --git a/lasso/xml/disco_authenticate_requester.h b/lasso/xml/disco_authenticate_requester.h index c708d6d2..58fb2b93 100644 --- a/lasso/xml/disco_authenticate_requester.h +++ b/lasso/xml/disco_authenticate_requester.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_AUTHENTICATE_REQUESTER (lasso_disco_authenticate_requester_get_type()) #define LASSO_DISCO_AUTHENTICATE_REQUESTER(obj) \ diff --git a/lasso/xml/disco_authenticate_session_context.c b/lasso/xml/disco_authenticate_session_context.c index ca9e3cee..622d2a8a 100644 --- a/lasso/xml/disco_authenticate_session_context.c +++ b/lasso/xml/disco_authenticate_session_context.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_authenticate_session_context.h> +#include "disco_authenticate_session_context.h" /** * SECTION:disco_authenticate_session_context diff --git a/lasso/xml/disco_authenticate_session_context.h b/lasso/xml/disco_authenticate_session_context.h index 88e135e8..90518591 100644 --- a/lasso/xml/disco_authenticate_session_context.h +++ b/lasso/xml/disco_authenticate_session_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_AUTHENTICATE_SESSION_CONTEXT \ (lasso_disco_authenticate_session_context_get_type()) diff --git a/lasso/xml/disco_authorize_requester.c b/lasso/xml/disco_authorize_requester.c index e855fe67..ca169add 100644 --- a/lasso/xml/disco_authorize_requester.c +++ b/lasso/xml/disco_authorize_requester.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_authorize_requester.h> +#include "disco_authorize_requester.h" /** * SECTION:disco_authorize_requester diff --git a/lasso/xml/disco_authorize_requester.h b/lasso/xml/disco_authorize_requester.h index 8e6122b1..c03d1174 100644 --- a/lasso/xml/disco_authorize_requester.h +++ b/lasso/xml/disco_authorize_requester.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_AUTHORIZE_REQUESTER (lasso_disco_authorize_requester_get_type()) #define LASSO_DISCO_AUTHORIZE_REQUESTER(obj) \ diff --git a/lasso/xml/disco_credentials.c b/lasso/xml/disco_credentials.c index b8888900..952a7a01 100644 --- a/lasso/xml/disco_credentials.c +++ b/lasso/xml/disco_credentials.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_credentials.h> +#include "disco_credentials.h" /** * SECTION:disco_credentials diff --git a/lasso/xml/disco_credentials.h b/lasso/xml/disco_credentials.h index 2985efe9..d18d9c10 100644 --- a/lasso/xml/disco_credentials.h +++ b/lasso/xml/disco_credentials.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_CREDENTIALS (lasso_disco_credentials_get_type()) #define LASSO_DISCO_CREDENTIALS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/disco_description.c b/lasso/xml/disco_description.c index 913a73a8..1624030f 100644 --- a/lasso/xml/disco_description.c +++ b/lasso/xml/disco_description.c @@ -23,9 +23,9 @@ */ #include "private.h" -#include <lasso/xml/disco_description.h> -#include <lasso/id-wsf/utils.h> -#include <lasso/utils.h> +#include "disco_description.h" +#include "../id-wsf/utils.h" +#include "..//utils.h" /** * SECTION:disco_description diff --git a/lasso/xml/disco_description.h b/lasso/xml/disco_description.h index cc8dcaac..87c37f28 100644 --- a/lasso/xml/disco_description.h +++ b/lasso/xml/disco_description.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_DESCRIPTION (lasso_disco_description_get_type()) #define LASSO_DISCO_DESCRIPTION(obj) \ diff --git a/lasso/xml/disco_encrypt_resource_id.c b/lasso/xml/disco_encrypt_resource_id.c index 01790a2b..273e8e5b 100644 --- a/lasso/xml/disco_encrypt_resource_id.c +++ b/lasso/xml/disco_encrypt_resource_id.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_encrypt_resource_id.h> +#include "disco_encrypt_resource_id.h" /** * SECTION:disco_encrypt_resource_id diff --git a/lasso/xml/disco_encrypt_resource_id.h b/lasso/xml/disco_encrypt_resource_id.h index 01c48672..047d4a40 100644 --- a/lasso/xml/disco_encrypt_resource_id.h +++ b/lasso/xml/disco_encrypt_resource_id.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_ENCRYPT_RESOURCE_ID (lasso_disco_encrypt_resource_id_get_type()) #define LASSO_DISCO_ENCRYPT_RESOURCE_ID(obj) \ diff --git a/lasso/xml/disco_encrypted_resource_id.c b/lasso/xml/disco_encrypted_resource_id.c index a0b0615f..e0f2f271 100644 --- a/lasso/xml/disco_encrypted_resource_id.c +++ b/lasso/xml/disco_encrypted_resource_id.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_encrypted_resource_id.h> +#include "disco_encrypted_resource_id.h" /** * SECTION:disco_encrypted_resource_id diff --git a/lasso/xml/disco_encrypted_resource_id.h b/lasso/xml/disco_encrypted_resource_id.h index 2a6b674c..a01d39c5 100644 --- a/lasso/xml/disco_encrypted_resource_id.h +++ b/lasso/xml/disco_encrypted_resource_id.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_ENCRYPTED_RESOURCE_ID (lasso_disco_encrypted_resource_id_get_type()) #define LASSO_DISCO_ENCRYPTED_RESOURCE_ID(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/disco_generate_bearer_token.c b/lasso/xml/disco_generate_bearer_token.c index 24d0ee5a..5b28306c 100644 --- a/lasso/xml/disco_generate_bearer_token.c +++ b/lasso/xml/disco_generate_bearer_token.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_generate_bearer_token.h> +#include "disco_generate_bearer_token.h" /** * SECTION:disco_generate_bearer_token diff --git a/lasso/xml/disco_generate_bearer_token.h b/lasso/xml/disco_generate_bearer_token.h index b0af7421..07ec37f2 100644 --- a/lasso/xml/disco_generate_bearer_token.h +++ b/lasso/xml/disco_generate_bearer_token.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_GENERATE_BEARER_TOKEN (lasso_disco_generate_bearer_token_get_type()) #define LASSO_DISCO_GENERATE_BEARER_TOKEN(obj) \ diff --git a/lasso/xml/disco_insert_entry.c b/lasso/xml/disco_insert_entry.c index 5ace91a0..b237d9ea 100644 --- a/lasso/xml/disco_insert_entry.c +++ b/lasso/xml/disco_insert_entry.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_insert_entry.h> +#include "disco_insert_entry.h" #include "../utils.h" /** diff --git a/lasso/xml/disco_insert_entry.h b/lasso/xml/disco_insert_entry.h index cee73096..5d386775 100644 --- a/lasso/xml/disco_insert_entry.h +++ b/lasso/xml/disco_insert_entry.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/disco_resource_offering.h> +#include "xml.h" +#include "disco_resource_offering.h" #define LASSO_TYPE_DISCO_INSERT_ENTRY (lasso_disco_insert_entry_get_type()) #define LASSO_DISCO_INSERT_ENTRY(obj) \ diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c index ca8aac5b..8988ad80 100644 --- a/lasso/xml/disco_modify.c +++ b/lasso/xml/disco_modify.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_modify.h> +#include "disco_modify.h" /** * SECTION:disco_modify diff --git a/lasso/xml/disco_modify.h b/lasso/xml/disco_modify.h index e99dba3c..b2496011 100644 --- a/lasso/xml/disco_modify.h +++ b/lasso/xml/disco_modify.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/disco_encrypted_resource_id.h> +#include "xml.h" +#include "disco_resource_id.h" +#include "disco_encrypted_resource_id.h" #define LASSO_TYPE_DISCO_MODIFY (lasso_disco_modify_get_type()) #define LASSO_DISCO_MODIFY(obj) \ diff --git a/lasso/xml/disco_modify_response.c b/lasso/xml/disco_modify_response.c index c974d338..b6be1531 100644 --- a/lasso/xml/disco_modify_response.c +++ b/lasso/xml/disco_modify_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_modify_response.h> +#include "disco_modify_response.h" /** * SECTION:disco_modify_response diff --git a/lasso/xml/disco_modify_response.h b/lasso/xml/disco_modify_response.h index a061ff5f..c45d5c8e 100644 --- a/lasso/xml/disco_modify_response.h +++ b/lasso/xml/disco_modify_response.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/utility_status.h> +#include "xml.h" +#include "utility_status.h" #define LASSO_TYPE_DISCO_MODIFY_RESPONSE (lasso_disco_modify_response_get_type()) #define LASSO_DISCO_MODIFY_RESPONSE(obj) \ diff --git a/lasso/xml/disco_options.c b/lasso/xml/disco_options.c index 0287bc1b..f90ae528 100644 --- a/lasso/xml/disco_options.c +++ b/lasso/xml/disco_options.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_options.h> +#include "disco_options.h" /** * SECTION:disco_options diff --git a/lasso/xml/disco_options.h b/lasso/xml/disco_options.h index 6aa28218..2b9d212a 100644 --- a/lasso/xml/disco_options.h +++ b/lasso/xml/disco_options.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_OPTIONS (lasso_disco_options_get_type()) #define LASSO_DISCO_OPTIONS(obj) \ diff --git a/lasso/xml/disco_query.c b/lasso/xml/disco_query.c index ff36cfd9..213226a7 100644 --- a/lasso/xml/disco_query.c +++ b/lasso/xml/disco_query.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_query.h> +#include "disco_query.h" /** * SECTION:disco_query diff --git a/lasso/xml/disco_query.h b/lasso/xml/disco_query.h index 846babbe..4c0ea38a 100644 --- a/lasso/xml/disco_query.h +++ b/lasso/xml/disco_query.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/disco_encrypted_resource_id.h> -#include <lasso/xml/disco_requested_service_type.h> +#include "xml.h" +#include "disco_resource_id.h" +#include "disco_encrypted_resource_id.h" +#include "disco_requested_service_type.h" #define LASSO_TYPE_DISCO_QUERY (lasso_disco_query_get_type()) #define LASSO_DISCO_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/disco_query_response.c b/lasso/xml/disco_query_response.c index 6a73f945..bc96293c 100644 --- a/lasso/xml/disco_query_response.c +++ b/lasso/xml/disco_query_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_query_response.h> +#include "disco_query_response.h" /** * SECTION:disco_query_response diff --git a/lasso/xml/disco_query_response.h b/lasso/xml/disco_query_response.h index 4bfe60eb..103b8708 100644 --- a/lasso/xml/disco_query_response.h +++ b/lasso/xml/disco_query_response.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/disco_credentials.h> -#include <lasso/xml/utility_status.h> +#include "xml.h" +#include "disco_credentials.h" +#include "utility_status.h" #define LASSO_TYPE_DISCO_QUERY_RESPONSE (lasso_disco_query_response_get_type()) #define LASSO_DISCO_QUERY_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/disco_remove_entry.c b/lasso/xml/disco_remove_entry.c index 53eb810f..204d764b 100644 --- a/lasso/xml/disco_remove_entry.c +++ b/lasso/xml/disco_remove_entry.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_remove_entry.h> +#include "disco_remove_entry.h" /** * SECTION:disco_remove_entry diff --git a/lasso/xml/disco_remove_entry.h b/lasso/xml/disco_remove_entry.h index d9d707a5..8798fecb 100644 --- a/lasso/xml/disco_remove_entry.h +++ b/lasso/xml/disco_remove_entry.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_REMOVE_ENTRY (lasso_disco_remove_entry_get_type()) #define LASSO_DISCO_REMOVE_ENTRY(obj) \ diff --git a/lasso/xml/disco_requested_service_type.c b/lasso/xml/disco_requested_service_type.c index d67388bb..a3d49756 100644 --- a/lasso/xml/disco_requested_service_type.c +++ b/lasso/xml/disco_requested_service_type.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_requested_service_type.h> +#include "disco_requested_service_type.h" /** * SECTION:disco_requested_service_type diff --git a/lasso/xml/disco_requested_service_type.h b/lasso/xml/disco_requested_service_type.h index 5d951ea7..63a9d675 100644 --- a/lasso/xml/disco_requested_service_type.h +++ b/lasso/xml/disco_requested_service_type.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/disco_options.h> +#include "xml.h" +#include "disco_options.h" #define LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE (lasso_disco_requested_service_type_get_type()) #define LASSO_DISCO_REQUESTED_SERVICE_TYPE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/disco_resource_id.c b/lasso/xml/disco_resource_id.c index 0185517a..b111e207 100644 --- a/lasso/xml/disco_resource_id.c +++ b/lasso/xml/disco_resource_id.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_resource_id.h> +#include "disco_resource_id.h" /** * SECTION:disco_resource_id diff --git a/lasso/xml/disco_resource_id.h b/lasso/xml/disco_resource_id.h index 9b045533..5fb12419 100644 --- a/lasso/xml/disco_resource_id.h +++ b/lasso/xml/disco_resource_id.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_RESOURCE_ID (lasso_disco_resource_id_get_type()) #define LASSO_DISCO_RESOURCE_ID(obj) \ diff --git a/lasso/xml/disco_resource_offering.c b/lasso/xml/disco_resource_offering.c index 22b66a0f..4f70441d 100644 --- a/lasso/xml/disco_resource_offering.c +++ b/lasso/xml/disco_resource_offering.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_resource_offering.h> +#include "disco_resource_offering.h" #include "../utils.h" /** diff --git a/lasso/xml/disco_resource_offering.h b/lasso/xml/disco_resource_offering.h index 9be5b163..0b0fef90 100644 --- a/lasso/xml/disco_resource_offering.h +++ b/lasso/xml/disco_resource_offering.h @@ -29,11 +29,11 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/disco_encrypted_resource_id.h> -#include <lasso/xml/disco_service_instance.h> -#include <lasso/xml/disco_options.h> +#include "xml.h" +#include "disco_resource_id.h" +#include "disco_encrypted_resource_id.h" +#include "disco_service_instance.h" +#include "disco_options.h" #define LASSO_TYPE_DISCO_RESOURCE_OFFERING (lasso_disco_resource_offering_get_type()) #define LASSO_DISCO_RESOURCE_OFFERING(obj) \ diff --git a/lasso/xml/disco_send_single_logout.c b/lasso/xml/disco_send_single_logout.c index e7c8fd23..7c18b65a 100644 --- a/lasso/xml/disco_send_single_logout.c +++ b/lasso/xml/disco_send_single_logout.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_send_single_logout.h> +#include "disco_send_single_logout.h" /** * SECTION:disco_send_single_logout diff --git a/lasso/xml/disco_send_single_logout.h b/lasso/xml/disco_send_single_logout.h index ffef1c61..1d415ade 100644 --- a/lasso/xml/disco_send_single_logout.h +++ b/lasso/xml/disco_send_single_logout.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DISCO_SEND_SINGLE_LOGOUT (lasso_disco_send_single_logout_get_type()) #define LASSO_DISCO_SEND_SINGLE_LOGOUT(obj) \ diff --git a/lasso/xml/disco_service_instance.c b/lasso/xml/disco_service_instance.c index 12030da9..eb9b0d7c 100644 --- a/lasso/xml/disco_service_instance.c +++ b/lasso/xml/disco_service_instance.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/disco_service_instance.h> +#include "disco_service_instance.h" /** * SECTION:disco_service_instance diff --git a/lasso/xml/disco_service_instance.h b/lasso/xml/disco_service_instance.h index 8f494b23..69b20ab5 100644 --- a/lasso/xml/disco_service_instance.h +++ b/lasso/xml/disco_service_instance.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/disco_description.h> +#include "xml.h" +#include "disco_description.h" #define LASSO_TYPE_DISCO_SERVICE_INSTANCE (lasso_disco_service_instance_get_type()) #define LASSO_DISCO_SERVICE_INSTANCE(obj) \ diff --git a/lasso/xml/ds_key_info.c b/lasso/xml/ds_key_info.c index abc05cb6..70a20892 100644 --- a/lasso/xml/ds_key_info.c +++ b/lasso/xml/ds_key_info.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/ds_key_info.h> +#include "ds_key_info.h" /* * diff --git a/lasso/xml/ds_key_info.h b/lasso/xml/ds_key_info.h index b2867912..059e6ef5 100644 --- a/lasso/xml/ds_key_info.h +++ b/lasso/xml/ds_key_info.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/ds_key_value.h> +#include "xml.h" +#include "ds_key_value.h" #define LASSO_TYPE_DS_KEY_INFO (lasso_ds_key_info_get_type()) #define LASSO_DS_KEY_INFO(obj) \ diff --git a/lasso/xml/ds_key_value.c b/lasso/xml/ds_key_value.c index 581c7f61..ffa2dabd 100644 --- a/lasso/xml/ds_key_value.c +++ b/lasso/xml/ds_key_value.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/ds_key_value.h> +#include "ds_key_value.h" /* * diff --git a/lasso/xml/ds_key_value.h b/lasso/xml/ds_key_value.h index 7919c52c..48a2e8fc 100644 --- a/lasso/xml/ds_key_value.h +++ b/lasso/xml/ds_key_value.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/ds_rsa_key_value.h> +#include "xml.h" +#include "ds_rsa_key_value.h" #define LASSO_TYPE_DS_KEY_VALUE (lasso_ds_key_value_get_type()) #define LASSO_DS_KEY_VALUE(obj) \ diff --git a/lasso/xml/ds_rsa_key_value.c b/lasso/xml/ds_rsa_key_value.c index d02016a3..f76827f4 100644 --- a/lasso/xml/ds_rsa_key_value.c +++ b/lasso/xml/ds_rsa_key_value.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/ds_rsa_key_value.h> +#include "ds_rsa_key_value.h" /* * diff --git a/lasso/xml/ds_rsa_key_value.h b/lasso/xml/ds_rsa_key_value.h index 79958cae..1add7310 100644 --- a/lasso/xml/ds_rsa_key_value.h +++ b/lasso/xml/ds_rsa_key_value.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DS_RSA_KEY_VALUE (lasso_ds_rsa_key_value_get_type()) #define LASSO_DS_RSA_KEY_VALUE(obj) \ diff --git a/lasso/xml/dst_data.c b/lasso/xml/dst_data.c index dcc6a003..65877840 100644 --- a/lasso/xml/dst_data.c +++ b/lasso/xml/dst_data.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_data.h> +#include "dst_data.h" /** * SECTION:dst_data diff --git a/lasso/xml/dst_data.h b/lasso/xml/dst_data.h index 1f79ed7a..aa17c704 100644 --- a/lasso/xml/dst_data.h +++ b/lasso/xml/dst_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DST_DATA (lasso_dst_data_get_type()) #define LASSO_DST_DATA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DST_DATA, LassoDstData)) diff --git a/lasso/xml/dst_modification.c b/lasso/xml/dst_modification.c index fbf79a41..243186d4 100644 --- a/lasso/xml/dst_modification.c +++ b/lasso/xml/dst_modification.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_modification.h> +#include "dst_modification.h" /** * SECTION:dst_modification diff --git a/lasso/xml/dst_modification.h b/lasso/xml/dst_modification.h index b91f50d0..6d8ab58e 100644 --- a/lasso/xml/dst_modification.h +++ b/lasso/xml/dst_modification.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/dst_new_data.h> -#include <lasso/xml/xml.h> +#include "dst_new_data.h" +#include "xml.h" #define LASSO_TYPE_DST_MODIFICATION (lasso_dst_modification_get_type()) #define LASSO_DST_MODIFICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/dst_modify.c b/lasso/xml/dst_modify.c index 75839b85..dcdb8708 100644 --- a/lasso/xml/dst_modify.c +++ b/lasso/xml/dst_modify.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_modify.h> +#include "dst_modify.h" /** * SECTION:dst_modify diff --git a/lasso/xml/dst_modify.h b/lasso/xml/dst_modify.h index bd64bf2d..2089d262 100644 --- a/lasso/xml/dst_modify.h +++ b/lasso/xml/dst_modify.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/disco_encrypted_resource_id.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/dst_modification.h> -#include <lasso/xml/xml.h> +#include "disco_encrypted_resource_id.h" +#include "disco_resource_id.h" +#include "dst_modification.h" +#include "xml.h" #define LASSO_TYPE_DST_MODIFY (lasso_dst_modify_get_type()) #define LASSO_DST_MODIFY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/dst_modify_response.c b/lasso/xml/dst_modify_response.c index a4e5d872..75cb2b95 100644 --- a/lasso/xml/dst_modify_response.c +++ b/lasso/xml/dst_modify_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_modify_response.h> +#include "dst_modify_response.h" /** * SECTION:dst_modify_response diff --git a/lasso/xml/dst_modify_response.h b/lasso/xml/dst_modify_response.h index 72c4477d..5ceed477 100644 --- a/lasso/xml/dst_modify_response.h +++ b/lasso/xml/dst_modify_response.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/utility_status.h> -#include <lasso/xml/xml.h> +#include "utility_status.h" +#include "xml.h" #define LASSO_TYPE_DST_MODIFY_RESPONSE (lasso_dst_modify_response_get_type()) #define LASSO_DST_MODIFY_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/dst_new_data.c b/lasso/xml/dst_new_data.c index 6e6b2a39..43a0e473 100644 --- a/lasso/xml/dst_new_data.c +++ b/lasso/xml/dst_new_data.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_new_data.h> +#include "dst_new_data.h" /** * SECTION:dst_new_data diff --git a/lasso/xml/dst_new_data.h b/lasso/xml/dst_new_data.h index 110ca8a8..64c972c0 100644 --- a/lasso/xml/dst_new_data.h +++ b/lasso/xml/dst_new_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DST_NEW_DATA (lasso_dst_new_data_get_type()) #define LASSO_DST_NEW_DATA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/dst_query.c b/lasso/xml/dst_query.c index 44bdedac..6b76baef 100644 --- a/lasso/xml/dst_query.c +++ b/lasso/xml/dst_query.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_query.h> +#include "dst_query.h" /** * SECTION:dst_query diff --git a/lasso/xml/dst_query.h b/lasso/xml/dst_query.h index d7b54c9f..70b565df 100644 --- a/lasso/xml/dst_query.h +++ b/lasso/xml/dst_query.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/disco_encrypted_resource_id.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/dst_query_item.h> -#include <lasso/xml/xml.h> +#include "disco_encrypted_resource_id.h" +#include "disco_resource_id.h" +#include "dst_query_item.h" +#include "xml.h" #define LASSO_TYPE_DST_QUERY (lasso_dst_query_get_type()) #define LASSO_DST_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/dst_query_item.c b/lasso/xml/dst_query_item.c index 73931380..16c01445 100644 --- a/lasso/xml/dst_query_item.c +++ b/lasso/xml/dst_query_item.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_query_item.h> +#include "dst_query_item.h" /** * SECTION:dst_query_item diff --git a/lasso/xml/dst_query_item.h b/lasso/xml/dst_query_item.h index 77a143c8..90e12f75 100644 --- a/lasso/xml/dst_query_item.h +++ b/lasso/xml/dst_query_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_DST_QUERY_ITEM (lasso_dst_query_item_get_type()) #define LASSO_DST_QUERY_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/dst_query_response.c b/lasso/xml/dst_query_response.c index bc0fe9f3..3a4e47f9 100644 --- a/lasso/xml/dst_query_response.c +++ b/lasso/xml/dst_query_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/dst_query_response.h> +#include "dst_query_response.h" /** * SECTION:dst_query_response diff --git a/lasso/xml/dst_query_response.h b/lasso/xml/dst_query_response.h index 5a9dff8d..ffb2c0d8 100644 --- a/lasso/xml/dst_query_response.h +++ b/lasso/xml/dst_query_response.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/dst_data.h> -#include <lasso/xml/utility_status.h> -#include <lasso/xml/xml.h> +#include "dst_data.h" +#include "utility_status.h" +#include "xml.h" #define LASSO_TYPE_DST_QUERY_RESPONSE (lasso_dst_query_response_get_type()) #define LASSO_DST_QUERY_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.h b/lasso/xml/id-wsf-2.0/disco_abstract.h index 5e96f692..24293932 100644 --- a/lasso/xml/id-wsf-2.0/disco_abstract.h +++ b/lasso/xml/id-wsf-2.0/disco_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_ABSTRACT (lasso_idwsf2_disco_abstract_get_type()) #define LASSO_IDWSF2_DISCO_ABSTRACT(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h index 00a88395..518b8943 100644 --- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h +++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT \ (lasso_idwsf2_disco_endpoint_context_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_keys.h b/lasso/xml/id-wsf-2.0/disco_keys.h index 359f19ec..b636c236 100644 --- a/lasso/xml/id-wsf-2.0/disco_keys.h +++ b/lasso/xml/id-wsf-2.0/disco_keys.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_KEYS (lasso_idwsf2_disco_keys_get_type()) #define LASSO_IDWSF2_DISCO_KEYS(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_options.h b/lasso/xml/id-wsf-2.0/disco_options.h index 6910010d..36f31ccb 100644 --- a/lasso/xml/id-wsf-2.0/disco_options.h +++ b/lasso/xml/id-wsf-2.0/disco_options.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_OPTIONS (lasso_idwsf2_disco_options_get_type()) #define LASSO_IDWSF2_DISCO_OPTIONS(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_provider_id.h b/lasso/xml/id-wsf-2.0/disco_provider_id.h index 690e2925..0bc90777 100644 --- a/lasso/xml/id-wsf-2.0/disco_provider_id.h +++ b/lasso/xml/id-wsf-2.0/disco_provider_id.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID (lasso_idwsf2_disco_provider_id_get_type()) #define LASSO_IDWSF2_DISCO_PROVIDER_ID(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_query.h b/lasso/xml/id-wsf-2.0/disco_query.h index cc7e36d4..ac078059 100644 --- a/lasso/xml/id-wsf-2.0/disco_query.h +++ b/lasso/xml/id-wsf-2.0/disco_query.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_QUERY (lasso_idwsf2_disco_query_get_type()) #define LASSO_IDWSF2_DISCO_QUERY(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.h b/lasso/xml/id-wsf-2.0/disco_query_response.h index 8f49a427..1588bf75 100644 --- a/lasso/xml/id-wsf-2.0/disco_query_response.h +++ b/lasso/xml/id-wsf-2.0/disco_query_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE (lasso_idwsf2_disco_query_response_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_requested_service.h b/lasso/xml/id-wsf-2.0/disco_requested_service.h index fe1b2c52..e63699e2 100644 --- a/lasso/xml/id-wsf-2.0/disco_requested_service.h +++ b/lasso/xml/id-wsf-2.0/disco_requested_service.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_REQUESTED_SERVICE \ (lasso_idwsf2_disco_requested_service_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.h b/lasso/xml/id-wsf-2.0/disco_security_context.h index 79dcb9c9..b4985393 100644 --- a/lasso/xml/id-wsf-2.0/disco_security_context.h +++ b/lasso/xml/id-wsf-2.0/disco_security_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SECURITY_CONTEXT \ (lasso_idwsf2_disco_security_context_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.h b/lasso/xml/id-wsf-2.0/disco_service_context.h index 99e1a3d1..10712459 100644 --- a/lasso/xml/id-wsf-2.0/disco_service_context.h +++ b/lasso/xml/id-wsf-2.0/disco_service_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "disco_endpoint_context.h" #define LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT (lasso_idwsf2_disco_service_context_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_service_type.h b/lasso/xml/id-wsf-2.0/disco_service_type.h index 957a0705..a3525748 100644 --- a/lasso/xml/id-wsf-2.0/disco_service_type.h +++ b/lasso/xml/id-wsf-2.0/disco_service_type.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE (lasso_idwsf2_disco_service_type_get_type()) #define LASSO_IDWSF2_DISCO_SERVICE_TYPE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h index 8dd8b585..b921194d 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_ADD \ (lasso_idwsf2_disco_svc_md_association_add_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h index 4ff835ef..8d474aa9 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_ADD_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h index cffd250a..e749c379 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE \ (lasso_idwsf2_disco_svc_md_association_delete_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h index 0c2c3990..5aa51fc7 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h index 072ba303..f8af4392 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY \ (lasso_idwsf2_disco_svc_md_association_query_get_type()) diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h index 2e705f1e..23271f53 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h index efae8eb5..e6335106 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE (lasso_idwsf2_disco_svc_md_delete_get_type()) #define LASSO_IDWSF2_DISCO_SVC_MD_DELETE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h index 6717622e..f1e20748 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query.h b/lasso/xml/id-wsf-2.0/disco_svc_md_query.h index 9b7a3bd8..809200a2 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_query.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY (lasso_idwsf2_disco_svc_md_query_get_type()) #define LASSO_IDWSF2_DISCO_SVC_MD_QUERY(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h index 970f3b5d..5853b756 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h index 598c0ad8..8b530cc0 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER (lasso_idwsf2_disco_svc_md_register_get_type()) #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h index 90d78374..706f2d42 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h index 98d32f89..d33ee1f6 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE (lasso_idwsf2_disco_svc_md_replace_get_type()) #define LASSO_IDWSF2_DISCO_SVC_MD_REPLACE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h index 9000025e..f6ee268e 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h index 3813aa99..2d23e006 100644 --- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h +++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA (lasso_idwsf2_disco_svc_metadata_get_type()) #define LASSO_IDWSF2_DISCO_SVC_METADATA(obj) \ diff --git a/lasso/xml/id-wsf-2.0/dst_data_response_base.h b/lasso/xml/id-wsf-2.0/dst_data_response_base.h index 9aaa3e78..64fffb9c 100644 --- a/lasso/xml/id-wsf-2.0/dst_data_response_base.h +++ b/lasso/xml/id-wsf-2.0/dst_data_response_base.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_response.h" #define LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE (lasso_idwsf2_dst_data_response_base_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dst_delete_item_base.h b/lasso/xml/id-wsf-2.0/dst_delete_item_base.h index 069c9035..ad960fed 100644 --- a/lasso/xml/id-wsf-2.0/dst_delete_item_base.h +++ b/lasso/xml/id-wsf-2.0/dst_delete_item_base.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE (lasso_idwsf2_dst_delete_item_base_get_type()) #define LASSO_IDWSF2_DST_DELETE_ITEM_BASE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.h b/lasso/xml/id-wsf-2.0/dst_delete_response.h index 8b4fa8e6..713a77cf 100644 --- a/lasso/xml/id-wsf-2.0/dst_delete_response.h +++ b/lasso/xml/id-wsf-2.0/dst_delete_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_response.h" #define LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE (lasso_idwsf2_dst_delete_response_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dst_request.h b/lasso/xml/id-wsf-2.0/dst_request.h index c50e47d6..7dd8777f 100644 --- a/lasso/xml/id-wsf-2.0/dst_request.h +++ b/lasso/xml/id-wsf-2.0/dst_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DST_REQUEST (lasso_idwsf2_dst_request_get_type()) #define LASSO_IDWSF2_DST_REQUEST(obj) \ diff --git a/lasso/xml/id-wsf-2.0/dst_result_query_base.h b/lasso/xml/id-wsf-2.0/dst_result_query_base.h index 425eba00..cdbe73f0 100644 --- a/lasso/xml/id-wsf-2.0/dst_result_query_base.h +++ b/lasso/xml/id-wsf-2.0/dst_result_query_base.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DST_RESULT_QUERY_BASE (lasso_idwsf2_dst_result_query_base_get_type()) #define LASSO_IDWSF2_DST_RESULT_QUERY_BASE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/dst_test_item_base.h b/lasso/xml/id-wsf-2.0/dst_test_item_base.h index 4074b564..cd45cdb9 100644 --- a/lasso/xml/id-wsf-2.0/dst_test_item_base.h +++ b/lasso/xml/id-wsf-2.0/dst_test_item_base.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE (lasso_idwsf2_dst_test_item_base_get_type()) #define LASSO_IDWSF2_DST_TEST_ITEM_BASE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/dstref_app_data.h b/lasso/xml/id-wsf-2.0/dstref_app_data.h index ccdaa036..4c16a114 100644 --- a/lasso/xml/id-wsf-2.0/dstref_app_data.h +++ b/lasso/xml/id-wsf-2.0/dstref_app_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_DSTREF_APP_DATA (lasso_idwsf2_dstref_app_data_get_type()) #define LASSO_IDWSF2_DSTREF_APP_DATA(obj) \ diff --git a/lasso/xml/id-wsf-2.0/dstref_create.h b/lasso/xml/id-wsf-2.0/dstref_create.h index 141c0ee7..d64da23b 100644 --- a/lasso/xml/id-wsf-2.0/dstref_create.h +++ b/lasso/xml/id-wsf-2.0/dstref_create.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_DSTREF_CREATE (lasso_idwsf2_dstref_create_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_create_item.h b/lasso/xml/id-wsf-2.0/dstref_create_item.h index ad677b4c..f943550d 100644 --- a/lasso/xml/id-wsf-2.0/dstref_create_item.h +++ b/lasso/xml/id-wsf-2.0/dstref_create_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dstref_app_data.h" #define LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM (lasso_idwsf2_dstref_create_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.h b/lasso/xml/id-wsf-2.0/dstref_create_response.h index 136dc30c..f7b1f8f0 100644 --- a/lasso/xml/id-wsf-2.0/dstref_create_response.h +++ b/lasso/xml/id-wsf-2.0/dstref_create_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dstref_data_response.h" #define LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/dstref_data.h b/lasso/xml/id-wsf-2.0/dstref_data.h index addd4862..79f9a936 100644 --- a/lasso/xml/id-wsf-2.0/dstref_data.h +++ b/lasso/xml/id-wsf-2.0/dstref_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dstref_item_data.h" #define LASSO_TYPE_IDWSF2_DSTREF_DATA (lasso_idwsf2_dstref_data_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_data_response.h b/lasso/xml/id-wsf-2.0/dstref_data_response.h index ee87221c..388548d2 100644 --- a/lasso/xml/id-wsf-2.0/dstref_data_response.h +++ b/lasso/xml/id-wsf-2.0/dstref_data_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_data_response_base.h" #define LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE (lasso_idwsf2_dstref_data_response_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_delete.h b/lasso/xml/id-wsf-2.0/dstref_delete.h index 53132d9a..3a07582d 100644 --- a/lasso/xml/id-wsf-2.0/dstref_delete.h +++ b/lasso/xml/id-wsf-2.0/dstref_delete.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_DSTREF_DELETE (lasso_idwsf2_dstref_delete_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_item.h b/lasso/xml/id-wsf-2.0/dstref_delete_item.h index c65b4a6d..14afa078 100644 --- a/lasso/xml/id-wsf-2.0/dstref_delete_item.h +++ b/lasso/xml/id-wsf-2.0/dstref_delete_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_delete_item_base.h" #define LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM (lasso_idwsf2_dstref_delete_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.h b/lasso/xml/id-wsf-2.0/dstref_delete_response.h index 22eaf195..91432f12 100644 --- a/lasso/xml/id-wsf-2.0/dstref_delete_response.h +++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_response.h" #define LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/dstref_item_data.h b/lasso/xml/id-wsf-2.0/dstref_item_data.h index 3a4d78ef..9f87d977 100644 --- a/lasso/xml/id-wsf-2.0/dstref_item_data.h +++ b/lasso/xml/id-wsf-2.0/dstref_item_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dstref_app_data.h" #define LASSO_TYPE_IDWSF2_DSTREF_ITEM_DATA (lasso_idwsf2_dstref_item_data_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_modify.h b/lasso/xml/id-wsf-2.0/dstref_modify.h index 4d65efb8..1e4cc32a 100644 --- a/lasso/xml/id-wsf-2.0/dstref_modify.h +++ b/lasso/xml/id-wsf-2.0/dstref_modify.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_DSTREF_MODIFY (lasso_idwsf2_dstref_modify_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_item.h b/lasso/xml/id-wsf-2.0/dstref_modify_item.h index fe702467..2690da10 100644 --- a/lasso/xml/id-wsf-2.0/dstref_modify_item.h +++ b/lasso/xml/id-wsf-2.0/dstref_modify_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dstref_app_data.h" #define LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM (lasso_idwsf2_dstref_modify_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_response.h b/lasso/xml/id-wsf-2.0/dstref_modify_response.h index 14eaed9f..fc187e8c 100644 --- a/lasso/xml/id-wsf-2.0/dstref_modify_response.h +++ b/lasso/xml/id-wsf-2.0/dstref_modify_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dstref_data_response.h" #define LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/dstref_query.h b/lasso/xml/id-wsf-2.0/dstref_query.h index a4c61ef2..2ba287ac 100644 --- a/lasso/xml/id-wsf-2.0/dstref_query.h +++ b/lasso/xml/id-wsf-2.0/dstref_query.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_DSTREF_QUERY (lasso_idwsf2_dstref_query_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_query_item.h b/lasso/xml/id-wsf-2.0/dstref_query_item.h index 9afc70a7..257e0c49 100644 --- a/lasso/xml/id-wsf-2.0/dstref_query_item.h +++ b/lasso/xml/id-wsf-2.0/dstref_query_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dstref_result_query.h" #define LASSO_TYPE_IDWSF2_DSTREF_QUERY_ITEM (lasso_idwsf2_dstref_query_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_query_response.h b/lasso/xml/id-wsf-2.0/dstref_query_response.h index 33dde9ea..a3ce3623 100644 --- a/lasso/xml/id-wsf-2.0/dstref_query_response.h +++ b/lasso/xml/id-wsf-2.0/dstref_query_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_data_response_base.h" #define LASSO_TYPE_IDWSF2_DSTREF_QUERY_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/dstref_result_query.h b/lasso/xml/id-wsf-2.0/dstref_result_query.h index ac876e1f..69d53427 100644 --- a/lasso/xml/id-wsf-2.0/dstref_result_query.h +++ b/lasso/xml/id-wsf-2.0/dstref_result_query.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_result_query_base.h" #define LASSO_TYPE_IDWSF2_DSTREF_RESULT_QUERY (lasso_idwsf2_dstref_result_query_get_type()) diff --git a/lasso/xml/id-wsf-2.0/dstref_test_item.h b/lasso/xml/id-wsf-2.0/dstref_test_item.h index 4e8f325d..a8889c51 100644 --- a/lasso/xml/id-wsf-2.0/dstref_test_item.h +++ b/lasso/xml/id-wsf-2.0/dstref_test_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_test_item_base.h" #define LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM (lasso_idwsf2_dstref_test_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h index 562e0c38..707c3dfd 100644 --- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h +++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST \ (lasso_idwsf2_ims_identity_mapping_request_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h index 75d7fa20..9761a18b 100644 --- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h +++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.h b/lasso/xml/id-wsf-2.0/ims_mapping_input.h index 2c069e5d..71198f2e 100644 --- a/lasso/xml/id-wsf-2.0/ims_mapping_input.h +++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "sec_token_policy.h" #include "sec_token.h" diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.h b/lasso/xml/id-wsf-2.0/ims_mapping_output.h index 4e94c6f5..b586fee3 100644 --- a/lasso/xml/id-wsf-2.0/ims_mapping_output.h +++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "sec_token.h" #define LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT (lasso_idwsf2_ims_mapping_output_get_type()) diff --git a/lasso/xml/id-wsf-2.0/is_help.h b/lasso/xml/id-wsf-2.0/is_help.h index 3acc40d3..bcce2bc1 100644 --- a/lasso/xml/id-wsf-2.0/is_help.h +++ b/lasso/xml/id-wsf-2.0/is_help.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_IS_HELP (lasso_idwsf2_is_help_get_type()) #define LASSO_IDWSF2_IS_HELP(obj) \ diff --git a/lasso/xml/id-wsf-2.0/is_inquiry.h b/lasso/xml/id-wsf-2.0/is_inquiry.h index a4da315a..46aeaf92 100644 --- a/lasso/xml/id-wsf-2.0/is_inquiry.h +++ b/lasso/xml/id-wsf-2.0/is_inquiry.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "is_help.h" #define LASSO_TYPE_IDWSF2_IS_INQUIRY (lasso_idwsf2_is_inquiry_get_type()) diff --git a/lasso/xml/id-wsf-2.0/is_inquiry_element.h b/lasso/xml/id-wsf-2.0/is_inquiry_element.h index 2f3c0589..79f75d41 100644 --- a/lasso/xml/id-wsf-2.0/is_inquiry_element.h +++ b/lasso/xml/id-wsf-2.0/is_inquiry_element.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "is_help.h" #define LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT (lasso_idwsf2_is_inquiry_element_get_type()) diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.h b/lasso/xml/id-wsf-2.0/is_interaction_request.h index 51b2883c..b43dbec9 100644 --- a/lasso/xml/id-wsf-2.0/is_interaction_request.h +++ b/lasso/xml/id-wsf-2.0/is_interaction_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "is_inquiry.h" #define LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST (lasso_idwsf2_is_interaction_request_get_type()) diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.h b/lasso/xml/id-wsf-2.0/is_interaction_response.h index 1a8f849a..ee82deda 100644 --- a/lasso/xml/id-wsf-2.0/is_interaction_response.h +++ b/lasso/xml/id-wsf-2.0/is_interaction_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE (lasso_idwsf2_is_interaction_response_get_type()) diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.h b/lasso/xml/id-wsf-2.0/is_interaction_statement.h index 0b4ffe7e..d4572124 100644 --- a/lasso/xml/id-wsf-2.0/is_interaction_statement.h +++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT \ (lasso_idwsf2_is_interaction_statement_get_type()) diff --git a/lasso/xml/id-wsf-2.0/is_item.h b/lasso/xml/id-wsf-2.0/is_item.h index 185b19bb..c6820ad9 100644 --- a/lasso/xml/id-wsf-2.0/is_item.h +++ b/lasso/xml/id-wsf-2.0/is_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_IS_ITEM (lasso_idwsf2_is_item_get_type()) #define LASSO_IDWSF2_IS_ITEM(obj) \ diff --git a/lasso/xml/id-wsf-2.0/is_parameter.h b/lasso/xml/id-wsf-2.0/is_parameter.h index 479b4232..5ab187c1 100644 --- a/lasso/xml/id-wsf-2.0/is_parameter.h +++ b/lasso/xml/id-wsf-2.0/is_parameter.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_IS_PARAMETER (lasso_idwsf2_is_parameter_get_type()) #define LASSO_IDWSF2_IS_PARAMETER(obj) \ diff --git a/lasso/xml/id-wsf-2.0/is_select.h b/lasso/xml/id-wsf-2.0/is_select.h index abf83632..366fd330 100644 --- a/lasso/xml/id-wsf-2.0/is_select.h +++ b/lasso/xml/id-wsf-2.0/is_select.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "is_inquiry_element.h" #define LASSO_TYPE_IDWSF2_IS_SELECT (lasso_idwsf2_is_select_get_type()) diff --git a/lasso/xml/id-wsf-2.0/is_text.h b/lasso/xml/id-wsf-2.0/is_text.h index 3b84b961..777b7027 100644 --- a/lasso/xml/id-wsf-2.0/is_text.h +++ b/lasso/xml/id-wsf-2.0/is_text.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "is_inquiry_element.h" #define LASSO_TYPE_IDWSF2_IS_TEXT (lasso_idwsf2_is_text_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_request.h b/lasso/xml/id-wsf-2.0/ps_add_collection_request.h index 275aa51a..084087db 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_collection_request.h +++ b/lasso/xml/id-wsf-2.0/ps_add_collection_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_object.h" #include "ps_request_abstract.h" #include "subs_subscription.h" diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_response.h b/lasso/xml/id-wsf-2.0/ps_add_collection_response.h index ecdab2ef..caba79ab 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_collection_response.h +++ b/lasso/xml/id-wsf-2.0/ps_add_collection_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #include "ps_object.h" diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_request.h b/lasso/xml/id-wsf-2.0/ps_add_entity_request.h index 650a655c..018ce71f 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_entity_request.h +++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "sec_token_policy.h" #include "ps_object.h" #include "ps_request_abstract.h" diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_response.h b/lasso/xml/id-wsf-2.0/ps_add_entity_response.h index 47ba5cb4..88bff742 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_entity_response.h +++ b/lasso/xml/id-wsf-2.0/ps_add_entity_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #include "ps_object.h" diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h index 4f07853b..fa9b73c6 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h +++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "sec_token_policy.h" #include "sec_token.h" #include "ps_object.h" diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h index 815e3922..ecedd318 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h +++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #include "ps_object.h" diff --git a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h index 748b5ddc..424e2e8c 100644 --- a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h +++ b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #include "ps_request_abstract.h" diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h index dd4bd95b..c4361e40 100644 --- a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h +++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #include "ps_request_abstract.h" diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h index 92868381..ed892c01 100644 --- a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h +++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #include "ps_object.h" diff --git a/lasso/xml/id-wsf-2.0/ps_item_data.h b/lasso/xml/id-wsf-2.0/ps_item_data.h index c41829ef..733c21bd 100644 --- a/lasso/xml/id-wsf-2.0/ps_item_data.h +++ b/lasso/xml/id-wsf-2.0/ps_item_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_object.h" #define LASSO_TYPE_IDWSF2_PS_ITEM_DATA (lasso_idwsf2_ps_item_data_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_request.h b/lasso/xml/id-wsf-2.0/ps_list_members_request.h index 1b314d58..e9f77630 100644 --- a/lasso/xml/id-wsf-2.0/ps_list_members_request.h +++ b/lasso/xml/id-wsf-2.0/ps_list_members_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #include "ps_request_abstract.h" diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_response.h b/lasso/xml/id-wsf-2.0/ps_list_members_response.h index a9564a7d..cb650ffd 100644 --- a/lasso/xml/id-wsf-2.0/ps_list_members_response.h +++ b/lasso/xml/id-wsf-2.0/ps_list_members_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #define LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/ps_notification.h b/lasso/xml/id-wsf-2.0/ps_notification.h index 55a3e724..4043e36a 100644 --- a/lasso/xml/id-wsf-2.0/ps_notification.h +++ b/lasso/xml/id-wsf-2.0/ps_notification.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_notification.h" #define LASSO_TYPE_IDWSF2_PS_NOTIFICATION (lasso_idwsf2_ps_notification_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ps_notify.h b/lasso/xml/id-wsf-2.0/ps_notify.h index 8eb6e9e4..bc5e341c 100644 --- a/lasso/xml/id-wsf-2.0/ps_notify.h +++ b/lasso/xml/id-wsf-2.0/ps_notify.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_request_abstract.h" #define LASSO_TYPE_IDWSF2_PS_NOTIFY (lasso_idwsf2_ps_notify_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ps_object.h b/lasso/xml/id-wsf-2.0/ps_object.h index 0c410843..6372245d 100644 --- a/lasso/xml/id-wsf-2.0/ps_object.h +++ b/lasso/xml/id-wsf-2.0/ps_object.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_PS_OBJECT (lasso_idwsf2_ps_object_get_type()) #define LASSO_IDWSF2_PS_OBJECT(obj) \ diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_request.h b/lasso/xml/id-wsf-2.0/ps_query_objects_request.h index 5ad7124d..cc380a88 100644 --- a/lasso/xml/id-wsf-2.0/ps_query_objects_request.h +++ b/lasso/xml/id-wsf-2.0/ps_query_objects_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #include "ps_request_abstract.h" diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_response.h b/lasso/xml/id-wsf-2.0/ps_query_objects_response.h index e3c8e0e5..8274325b 100644 --- a/lasso/xml/id-wsf-2.0/ps_query_objects_response.h +++ b/lasso/xml/id-wsf-2.0/ps_query_objects_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #define LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h index 1bbd62f2..86cd4c74 100644 --- a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h +++ b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_request_abstract.h" #define LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST \ diff --git a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h index 46b71f95..d3f2e18c 100644 --- a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h +++ b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_request_abstract.h" #define LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST \ diff --git a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h index 21f5c14d..b2240d7b 100644 --- a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h +++ b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #include "ps_request_abstract.h" diff --git a/lasso/xml/id-wsf-2.0/ps_request_abstract.h b/lasso/xml/id-wsf-2.0/ps_request_abstract.h index 16349654..982a10cc 100644 --- a/lasso/xml/id-wsf-2.0/ps_request_abstract.h +++ b/lasso/xml/id-wsf-2.0/ps_request_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT (lasso_idwsf2_ps_request_abstract_get_type()) #define LASSO_IDWSF2_PS_REQUEST_ABSTRACT(obj) \ diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h index 8b899ae4..b3a4fde2 100644 --- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h +++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_request_abstract.h" #define LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST \ diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h index 33ddb00b..6cd16fbd 100644 --- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h +++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #define LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_input.h b/lasso/xml/id-wsf-2.0/ps_resolve_input.h index 41414116..8cd24cda 100644 --- a/lasso/xml/id-wsf-2.0/ps_resolve_input.h +++ b/lasso/xml/id-wsf-2.0/ps_resolve_input.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ims_mapping_input.h" #define LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT (lasso_idwsf2_ps_resolve_input_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.h b/lasso/xml/id-wsf-2.0/ps_response_abstract.h index d6a39a5d..f9e1d6ad 100644 --- a/lasso/xml/id-wsf-2.0/ps_response_abstract.h +++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT (lasso_idwsf2_ps_response_abstract_get_type()) diff --git a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h index fea248bd..372a4d29 100644 --- a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h +++ b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #include "ps_request_abstract.h" diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_request.h b/lasso/xml/id-wsf-2.0/ps_test_membership_request.h index d135c5ce..c4113f42 100644 --- a/lasso/xml/id-wsf-2.0/ps_test_membership_request.h +++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #include "ps_request_abstract.h" #include "sec_token.h" diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_response.h b/lasso/xml/id-wsf-2.0/ps_test_membership_response.h index 8a6c2140..e7b629a6 100644 --- a/lasso/xml/id-wsf-2.0/ps_test_membership_response.h +++ b/lasso/xml/id-wsf-2.0/ps_test_membership_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "ps_response_abstract.h" #define LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/sb2_consent.h b/lasso/xml/id-wsf-2.0/sb2_consent.h index 3f152f4e..14f0cadd 100644 --- a/lasso/xml/id-wsf-2.0/sb2_consent.h +++ b/lasso/xml/id-wsf-2.0/sb2_consent.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SB2_CONSENT (lasso_idwsf2_sb2_consent_get_type()) #define LASSO_IDWSF2_SB2_CONSENT(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.h b/lasso/xml/id-wsf-2.0/sb2_credentials_context.h index e700bd34..54a48911 100644 --- a/lasso/xml/id-wsf-2.0/sb2_credentials_context.h +++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/saml-2.0/samlp2_requested_authn_context.h> +#include "../xml.h" +#include "../saml-2.0/samlp2_requested_authn_context.h" #define LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT (lasso_idwsf2_sb2_credentials_context_get_type()) #define LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h index d1056234..e7f7e7ac 100644 --- a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h +++ b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/ws/wsa_endpoint_reference.h> +#include "../xml.h" +#include "../ws/wsa_endpoint_reference.h" #define LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE (lasso_idwsf2_sb2_endpoint_update_get_type()) #define LASSO_IDWSF2_SB2_ENDPOINT_UPDATE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_redirect_request.h b/lasso/xml/id-wsf-2.0/sb2_redirect_request.h index 22419b59..bf8a455f 100644 --- a/lasso/xml/id-wsf-2.0/sb2_redirect_request.h +++ b/lasso/xml/id-wsf-2.0/sb2_redirect_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST (lasso_idwsf2_sb2_redirect_request_get_type()) #define LASSO_IDWSF2_SB2_REDIRECT_REQUEST(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_sender.h b/lasso/xml/id-wsf-2.0/sb2_sender.h index 4d1f1de9..e47a2070 100644 --- a/lasso/xml/id-wsf-2.0/sb2_sender.h +++ b/lasso/xml/id-wsf-2.0/sb2_sender.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SB2_SENDER (lasso_idwsf2_sb2_sender_get_type()) #define LASSO_IDWSF2_SB2_SENDER(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_target_identity.h b/lasso/xml/id-wsf-2.0/sb2_target_identity.h index a1a25d37..2a8825e3 100644 --- a/lasso/xml/id-wsf-2.0/sb2_target_identity.h +++ b/lasso/xml/id-wsf-2.0/sb2_target_identity.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY (lasso_idwsf2_sb2_target_identity_get_type()) #define LASSO_IDWSF2_SB2_TARGET_IDENTITY(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_timeout.h b/lasso/xml/id-wsf-2.0/sb2_timeout.h index 048fc4f9..f14672ce 100644 --- a/lasso/xml/id-wsf-2.0/sb2_timeout.h +++ b/lasso/xml/id-wsf-2.0/sb2_timeout.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SB2_TIMEOUT (lasso_idwsf2_sb2_timeout_get_type()) #define LASSO_IDWSF2_SB2_TIMEOUT(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_usage_directive.h b/lasso/xml/id-wsf-2.0/sb2_usage_directive.h index fa505fed..c40cc988 100644 --- a/lasso/xml/id-wsf-2.0/sb2_usage_directive.h +++ b/lasso/xml/id-wsf-2.0/sb2_usage_directive.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE (lasso_idwsf2_sb2_usage_directive_get_type()) #define LASSO_IDWSF2_SB2_USAGE_DIRECTIVE(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h index 7a3ebe1c..4935043c 100644 --- a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h +++ b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER \ (lasso_idwsf2_sb2_user_interaction_header_get_type()) diff --git a/lasso/xml/id-wsf-2.0/sbf_framework.h b/lasso/xml/id-wsf-2.0/sbf_framework.h index 4c70bd4b..8a093f87 100644 --- a/lasso/xml/id-wsf-2.0/sbf_framework.h +++ b/lasso/xml/id-wsf-2.0/sbf_framework.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SBF_FRAMEWORK (lasso_idwsf2_sbf_framework_get_type()) #define LASSO_IDWSF2_SBF_FRAMEWORK(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sec_token.h b/lasso/xml/id-wsf-2.0/sec_token.h index 297bed10..1c3e3570 100644 --- a/lasso/xml/id-wsf-2.0/sec_token.h +++ b/lasso/xml/id-wsf-2.0/sec_token.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SEC_TOKEN (lasso_idwsf2_sec_token_get_type()) #define LASSO_IDWSF2_SEC_TOKEN(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sec_token_policy.h b/lasso/xml/id-wsf-2.0/sec_token_policy.h index faa6970a..6c038fb5 100644 --- a/lasso/xml/id-wsf-2.0/sec_token_policy.h +++ b/lasso/xml/id-wsf-2.0/sec_token_policy.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY (lasso_idwsf2_sec_token_policy_get_type()) #define LASSO_IDWSF2_SEC_TOKEN_POLICY(obj) \ diff --git a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h index be812c23..8d1dd20f 100644 --- a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h +++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH \ (lasso_idwsf2_sec_transited_provider_path_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subs_notification.h b/lasso/xml/id-wsf-2.0/subs_notification.h index 3d6bdc6e..aad12d32 100644 --- a/lasso/xml/id-wsf-2.0/subs_notification.h +++ b/lasso/xml/id-wsf-2.0/subs_notification.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION (lasso_idwsf2_subs_notification_get_type()) #define LASSO_IDWSF2_SUBS_NOTIFICATION(obj) \ diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.h b/lasso/xml/id-wsf-2.0/subs_notify_response.h index 4178892d..0cf62858 100644 --- a/lasso/xml/id-wsf-2.0/subs_notify_response.h +++ b/lasso/xml/id-wsf-2.0/subs_notify_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_response.h" #define LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE (lasso_idwsf2_subs_notify_response_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subs_ref_item.h b/lasso/xml/id-wsf-2.0/subs_ref_item.h index de6b4a93..1b612422 100644 --- a/lasso/xml/id-wsf-2.0/subs_ref_item.h +++ b/lasso/xml/id-wsf-2.0/subs_ref_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SUBS_REF_ITEM (lasso_idwsf2_subs_ref_item_get_type()) #define LASSO_IDWSF2_SUBS_REF_ITEM(obj) \ diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.h b/lasso/xml/id-wsf-2.0/subs_subscription.h index b6e70f6b..574fa9bb 100644 --- a/lasso/xml/id-wsf-2.0/subs_subscription.h +++ b/lasso/xml/id-wsf-2.0/subs_subscription.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION (lasso_idwsf2_subs_subscription_get_type()) #define LASSO_IDWSF2_SUBS_SUBSCRIPTION(obj) \ diff --git a/lasso/xml/id-wsf-2.0/subsref_app_data.h b/lasso/xml/id-wsf-2.0/subsref_app_data.h index 898e1ed9..8a14f8b5 100644 --- a/lasso/xml/id-wsf-2.0/subsref_app_data.h +++ b/lasso/xml/id-wsf-2.0/subsref_app_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA (lasso_idwsf2_subsref_app_data_get_type()) #define LASSO_IDWSF2_SUBSREF_APP_DATA(obj) \ diff --git a/lasso/xml/id-wsf-2.0/subsref_create.h b/lasso/xml/id-wsf-2.0/subsref_create.h index 522ff26e..c193dfbd 100644 --- a/lasso/xml/id-wsf-2.0/subsref_create.h +++ b/lasso/xml/id-wsf-2.0/subsref_create.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_SUBSREF_CREATE (lasso_idwsf2_subsref_create_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_create_item.h b/lasso/xml/id-wsf-2.0/subsref_create_item.h index 9f0a639d..fe1a2c99 100644 --- a/lasso/xml/id-wsf-2.0/subsref_create_item.h +++ b/lasso/xml/id-wsf-2.0/subsref_create_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subsref_app_data.h" #define LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM (lasso_idwsf2_subsref_create_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.h b/lasso/xml/id-wsf-2.0/subsref_create_response.h index 8c0f4a4b..465d77ec 100644 --- a/lasso/xml/id-wsf-2.0/subsref_create_response.h +++ b/lasso/xml/id-wsf-2.0/subsref_create_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subsref_data_response.h" #define LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/subsref_data.h b/lasso/xml/id-wsf-2.0/subsref_data.h index ba6d5c87..0f4ee173 100644 --- a/lasso/xml/id-wsf-2.0/subsref_data.h +++ b/lasso/xml/id-wsf-2.0/subsref_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subsref_item_data.h" #define LASSO_TYPE_IDWSF2_SUBSREF_DATA (lasso_idwsf2_subsref_data_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_data_response.h b/lasso/xml/id-wsf-2.0/subsref_data_response.h index ebb46912..b57f0261 100644 --- a/lasso/xml/id-wsf-2.0/subsref_data_response.h +++ b/lasso/xml/id-wsf-2.0/subsref_data_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_data_response_base.h" #define LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/subsref_delete.h b/lasso/xml/id-wsf-2.0/subsref_delete.h index dadac3d2..566522ad 100644 --- a/lasso/xml/id-wsf-2.0/subsref_delete.h +++ b/lasso/xml/id-wsf-2.0/subsref_delete.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_SUBSREF_DELETE (lasso_idwsf2_subsref_delete_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_item.h b/lasso/xml/id-wsf-2.0/subsref_delete_item.h index d0ed0b0f..18a79856 100644 --- a/lasso/xml/id-wsf-2.0/subsref_delete_item.h +++ b/lasso/xml/id-wsf-2.0/subsref_delete_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_delete_item_base.h" #define LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM (lasso_idwsf2_subsref_delete_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.h b/lasso/xml/id-wsf-2.0/subsref_delete_response.h index 85e5763f..eab23885 100644 --- a/lasso/xml/id-wsf-2.0/subsref_delete_response.h +++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_response.h" #define LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/subsref_item_data.h b/lasso/xml/id-wsf-2.0/subsref_item_data.h index 77a943b1..9460fa36 100644 --- a/lasso/xml/id-wsf-2.0/subsref_item_data.h +++ b/lasso/xml/id-wsf-2.0/subsref_item_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subsref_app_data.h" #define LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA (lasso_idwsf2_subsref_item_data_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_modify.h b/lasso/xml/id-wsf-2.0/subsref_modify.h index 61568ce5..c301d757 100644 --- a/lasso/xml/id-wsf-2.0/subsref_modify.h +++ b/lasso/xml/id-wsf-2.0/subsref_modify.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_SUBSREF_MODIFY (lasso_idwsf2_subsref_modify_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_item.h b/lasso/xml/id-wsf-2.0/subsref_modify_item.h index 8cdbeff4..e4556985 100644 --- a/lasso/xml/id-wsf-2.0/subsref_modify_item.h +++ b/lasso/xml/id-wsf-2.0/subsref_modify_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subsref_app_data.h" #define LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM (lasso_idwsf2_subsref_modify_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.h b/lasso/xml/id-wsf-2.0/subsref_modify_response.h index d3f52267..e7723143 100644 --- a/lasso/xml/id-wsf-2.0/subsref_modify_response.h +++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subsref_data_response.h" #define LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/subsref_notification.h b/lasso/xml/id-wsf-2.0/subsref_notification.h index af8f48d2..f8c822e8 100644 --- a/lasso/xml/id-wsf-2.0/subsref_notification.h +++ b/lasso/xml/id-wsf-2.0/subsref_notification.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_notification.h" #define LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION \ diff --git a/lasso/xml/id-wsf-2.0/subsref_notify.h b/lasso/xml/id-wsf-2.0/subsref_notify.h index 61961f49..dcab4952 100644 --- a/lasso/xml/id-wsf-2.0/subsref_notify.h +++ b/lasso/xml/id-wsf-2.0/subsref_notify.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY (lasso_idwsf2_subsref_notify_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.h b/lasso/xml/id-wsf-2.0/subsref_notify_response.h index a88e203a..6fe0d3ff 100644 --- a/lasso/xml/id-wsf-2.0/subsref_notify_response.h +++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_notify_response.h" #define LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/subsref_query.h b/lasso/xml/id-wsf-2.0/subsref_query.h index d4eb431f..2e435a70 100644 --- a/lasso/xml/id-wsf-2.0/subsref_query.h +++ b/lasso/xml/id-wsf-2.0/subsref_query.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_request.h" #define LASSO_TYPE_IDWSF2_SUBSREF_QUERY (lasso_idwsf2_subsref_query_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_query_item.h b/lasso/xml/id-wsf-2.0/subsref_query_item.h index 30bcae9e..4f1ac730 100644 --- a/lasso/xml/id-wsf-2.0/subsref_query_item.h +++ b/lasso/xml/id-wsf-2.0/subsref_query_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subsref_result_query.h" #define LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM (lasso_idwsf2_subsref_query_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.h b/lasso/xml/id-wsf-2.0/subsref_query_response.h index 682e40d7..8be62084 100644 --- a/lasso/xml/id-wsf-2.0/subsref_query_response.h +++ b/lasso/xml/id-wsf-2.0/subsref_query_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_data_response_base.h" #define LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE \ diff --git a/lasso/xml/id-wsf-2.0/subsref_result_query.h b/lasso/xml/id-wsf-2.0/subsref_result_query.h index be218167..e954e2ef 100644 --- a/lasso/xml/id-wsf-2.0/subsref_result_query.h +++ b/lasso/xml/id-wsf-2.0/subsref_result_query.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_result_query_base.h" #define LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY \ diff --git a/lasso/xml/id-wsf-2.0/subsref_subscription.h b/lasso/xml/id-wsf-2.0/subsref_subscription.h index 3ef5bf85..5cffd1e7 100644 --- a/lasso/xml/id-wsf-2.0/subsref_subscription.h +++ b/lasso/xml/id-wsf-2.0/subsref_subscription.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "subs_subscription.h" #define LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION \ diff --git a/lasso/xml/id-wsf-2.0/subsref_test_item.h b/lasso/xml/id-wsf-2.0/subsref_test_item.h index df5cac14..8768ec25 100644 --- a/lasso/xml/id-wsf-2.0/subsref_test_item.h +++ b/lasso/xml/id-wsf-2.0/subsref_test_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "dst_test_item_base.h" #define LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM (lasso_idwsf2_subsref_test_item_get_type()) diff --git a/lasso/xml/id-wsf-2.0/util_empty.h b/lasso/xml/id-wsf-2.0/util_empty.h index edf5d692..33ce32c2 100644 --- a/lasso/xml/id-wsf-2.0/util_empty.h +++ b/lasso/xml/id-wsf-2.0/util_empty.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_UTIL_EMPTY (lasso_idwsf2_util_empty_get_type()) #define LASSO_IDWSF2_UTIL_EMPTY(obj) \ diff --git a/lasso/xml/id-wsf-2.0/util_extension.h b/lasso/xml/id-wsf-2.0/util_extension.h index d5064c1a..1fc08965 100644 --- a/lasso/xml/id-wsf-2.0/util_extension.h +++ b/lasso/xml/id-wsf-2.0/util_extension.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_UTIL_EXTENSION (lasso_idwsf2_util_extension_get_type()) #define LASSO_IDWSF2_UTIL_EXTENSION(obj) \ diff --git a/lasso/xml/id-wsf-2.0/util_response.h b/lasso/xml/id-wsf-2.0/util_response.h index 73ad32ba..9bc5886a 100644 --- a/lasso/xml/id-wsf-2.0/util_response.h +++ b/lasso/xml/id-wsf-2.0/util_response.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "util_status.h" #define LASSO_TYPE_IDWSF2_UTIL_RESPONSE (lasso_idwsf2_util_response_get_type()) diff --git a/lasso/xml/id-wsf-2.0/util_status.h b/lasso/xml/id-wsf-2.0/util_status.h index 9eb656a8..77e0e63b 100644 --- a/lasso/xml/id-wsf-2.0/util_status.h +++ b/lasso/xml/id-wsf-2.0/util_status.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_IDWSF2_UTIL_STATUS (lasso_idwsf2_util_status_get_type()) #define LASSO_IDWSF2_UTIL_STATUS(obj) \ diff --git a/lasso/xml/is_help.c b/lasso/xml/is_help.c index 69edc089..98b44b5b 100644 --- a/lasso/xml/is_help.c +++ b/lasso/xml/is_help.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_help.h> +#include "is_help.h" /** * SECTION:is_help diff --git a/lasso/xml/is_help.h b/lasso/xml/is_help.h index 0a8dc8ae..7fb95a53 100644 --- a/lasso/xml/is_help.h +++ b/lasso/xml/is_help.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_IS_HELP (lasso_is_help_get_type()) #define LASSO_IS_HELP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IS_HELP, LassoIsHelp)) diff --git a/lasso/xml/is_inquiry.c b/lasso/xml/is_inquiry.c index e46bf770..b0f53991 100644 --- a/lasso/xml/is_inquiry.c +++ b/lasso/xml/is_inquiry.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_inquiry.h> +#include "is_inquiry.h" /** * SECTION:is_inquiry diff --git a/lasso/xml/is_inquiry.h b/lasso/xml/is_inquiry.h index 1ab0eea5..a95f26d5 100644 --- a/lasso/xml/is_inquiry.h +++ b/lasso/xml/is_inquiry.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_IS_INQUIRY (lasso_is_inquiry_get_type()) #define LASSO_IS_INQUIRY(obj) \ diff --git a/lasso/xml/is_inquiry_element.c b/lasso/xml/is_inquiry_element.c index 2786c1de..4d72fbc7 100644 --- a/lasso/xml/is_inquiry_element.c +++ b/lasso/xml/is_inquiry_element.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_inquiry_element.h> +#include "is_inquiry_element.h" /** * SECTION:is_inquiry_element diff --git a/lasso/xml/is_inquiry_element.h b/lasso/xml/is_inquiry_element.h index 50fe14c6..a98e700d 100644 --- a/lasso/xml/is_inquiry_element.h +++ b/lasso/xml/is_inquiry_element.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/is_help.h> -#include <lasso/xml/xml.h> +#include "is_help.h" +#include "xml.h" #define LASSO_TYPE_IS_INQUIRY_ELEMENT (lasso_is_inquiry_element_get_type()) #define LASSO_IS_INQUIRY_ELEMENT(obj) \ diff --git a/lasso/xml/is_interaction_request.c b/lasso/xml/is_interaction_request.c index 402117d6..691b39e6 100644 --- a/lasso/xml/is_interaction_request.c +++ b/lasso/xml/is_interaction_request.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_interaction_request.h> +#include "is_interaction_request.h" /** * SECTION:is_interaction_request diff --git a/lasso/xml/is_interaction_request.h b/lasso/xml/is_interaction_request.h index 19ca0e87..8fb30a18 100644 --- a/lasso/xml/is_interaction_request.h +++ b/lasso/xml/is_interaction_request.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/disco_encrypted_resource_id.h> -#include <lasso/xml/disco_resource_id.h> -#include <lasso/xml/is_inquiry.h> -#include <lasso/xml/xml.h> +#include "disco_encrypted_resource_id.h" +#include "disco_resource_id.h" +#include "is_inquiry.h" +#include "xml.h" #define LASSO_TYPE_IS_INTERACTION_REQUEST (lasso_is_interaction_request_get_type()) diff --git a/lasso/xml/is_interaction_response.c b/lasso/xml/is_interaction_response.c index 7cf8865f..55065b39 100644 --- a/lasso/xml/is_interaction_response.c +++ b/lasso/xml/is_interaction_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_interaction_response.h> +#include "is_interaction_response.h" /** * SECTION:is_interaction_response diff --git a/lasso/xml/is_interaction_response.h b/lasso/xml/is_interaction_response.h index 4fe49dbc..f4b3d82b 100644 --- a/lasso/xml/is_interaction_response.h +++ b/lasso/xml/is_interaction_response.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/utility_status.h> -#include <lasso/xml/xml.h> +#include "utility_status.h" +#include "xml.h" #define LASSO_TYPE_IS_INTERACTION_RESPONSE (lasso_is_interaction_response_get_type()) #define LASSO_IS_INTERACTION_RESPONSE(obj) \ diff --git a/lasso/xml/is_interaction_statement.c b/lasso/xml/is_interaction_statement.c index 9628d37c..58299f10 100644 --- a/lasso/xml/is_interaction_statement.c +++ b/lasso/xml/is_interaction_statement.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_interaction_statement.h> +#include "is_interaction_statement.h" /** * SECTION:is_interaction_statement diff --git a/lasso/xml/is_interaction_statement.h b/lasso/xml/is_interaction_statement.h index 79322a6e..3c858ea3 100644 --- a/lasso/xml/is_interaction_statement.h +++ b/lasso/xml/is_interaction_statement.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/is_inquiry.h> -#include <lasso/xml/xml.h> +#include "is_inquiry.h" +#include "xml.h" #define LASSO_TYPE_IS_INTERACTION_STATEMENT (lasso_is_interaction_statement_get_type()) #define LASSO_IS_INTERACTION_STATEMENT(obj) \ diff --git a/lasso/xml/is_item.c b/lasso/xml/is_item.c index 954536cb..d0370f4d 100644 --- a/lasso/xml/is_item.c +++ b/lasso/xml/is_item.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_item.h> +#include "is_item.h" /** * SECTION:is_item diff --git a/lasso/xml/is_item.h b/lasso/xml/is_item.h index 9a917f7f..80ef137b 100644 --- a/lasso/xml/is_item.h +++ b/lasso/xml/is_item.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_IS_ITEM (lasso_is_item_get_type()) #define LASSO_IS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IS_ITEM, LassoIsItem)) diff --git a/lasso/xml/is_parameter.c b/lasso/xml/is_parameter.c index d2784c8d..347527fb 100644 --- a/lasso/xml/is_parameter.c +++ b/lasso/xml/is_parameter.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_parameter.h> +#include "is_parameter.h" /** * SECTION:is_parameter diff --git a/lasso/xml/is_parameter.h b/lasso/xml/is_parameter.h index 4062dde7..97b2b797 100644 --- a/lasso/xml/is_parameter.h +++ b/lasso/xml/is_parameter.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_IS_PARAMETER (lasso_is_parameter_get_type()) #define LASSO_IS_PARAMETER(obj) \ diff --git a/lasso/xml/is_redirect_request.c b/lasso/xml/is_redirect_request.c index 11bfe4aa..909ca2c8 100644 --- a/lasso/xml/is_redirect_request.c +++ b/lasso/xml/is_redirect_request.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_redirect_request.h> +#include "is_redirect_request.h" /** * SECTION:is_redirect_request diff --git a/lasso/xml/is_redirect_request.h b/lasso/xml/is_redirect_request.h index 5cb1429f..b9d9340a 100644 --- a/lasso/xml/is_redirect_request.h +++ b/lasso/xml/is_redirect_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_IS_REDIRECT_REQUEST (lasso_is_redirect_request_get_type()) #define LASSO_IS_REDIRECT_REQUEST(obj) \ diff --git a/lasso/xml/is_select.c b/lasso/xml/is_select.c index bdc0b71d..1cf6e557 100644 --- a/lasso/xml/is_select.c +++ b/lasso/xml/is_select.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_select.h> +#include "is_select.h" /** * SECTION:is_select diff --git a/lasso/xml/is_select.h b/lasso/xml/is_select.h index 1744d6fd..d61fccca 100644 --- a/lasso/xml/is_select.h +++ b/lasso/xml/is_select.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/is_item.h> -#include <lasso/xml/xml.h> +#include "is_item.h" +#include "xml.h" #define LASSO_TYPE_IS_SELECT (lasso_is_select_get_type()) #define LASSO_IS_SELECT(obj) \ diff --git a/lasso/xml/is_text.c b/lasso/xml/is_text.c index c76fce7d..2f6874d5 100644 --- a/lasso/xml/is_text.c +++ b/lasso/xml/is_text.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_text.h> +#include "is_text.h" /** * SECTION:is_text diff --git a/lasso/xml/is_text.h b/lasso/xml/is_text.h index b20b1279..1d6248e7 100644 --- a/lasso/xml/is_text.h +++ b/lasso/xml/is_text.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_IS_TEXT (lasso_is_text_get_type()) #define LASSO_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IS_TEXT, LassoIsText)) diff --git a/lasso/xml/is_user_interaction.c b/lasso/xml/is_user_interaction.c index 128d4fb4..ac79261d 100644 --- a/lasso/xml/is_user_interaction.c +++ b/lasso/xml/is_user_interaction.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/is_user_interaction.h> +#include "is_user_interaction.h" /** * SECTION:is_user_interaction diff --git a/lasso/xml/is_user_interaction.h b/lasso/xml/is_user_interaction.h index d03a7742..3ae287e4 100644 --- a/lasso/xml/is_user_interaction.h +++ b/lasso/xml/is_user_interaction.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_IS_USER_INTERACTION (lasso_is_user_interaction_get_type()) #define LASSO_IS_USER_INTERACTION(obj) \ diff --git a/lasso/xml/lib_assertion.c b/lasso/xml/lib_assertion.c index 4f0b5092..e1772ca8 100644 --- a/lasso/xml/lib_assertion.c +++ b/lasso/xml/lib_assertion.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_assertion.h> +#include "lib_assertion.h" /** * SECTION:lib_assertion diff --git a/lasso/xml/lib_assertion.h b/lasso/xml/lib_assertion.h index 2e4ab9c7..f23d080c 100644 --- a/lasso/xml/lib_assertion.h +++ b/lasso/xml/lib_assertion.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_assertion.h> +#include "saml_assertion.h" #define LASSO_TYPE_LIB_ASSERTION (lasso_lib_assertion_get_type()) #define LASSO_LIB_ASSERTION(obj) \ diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c index 5ab4d34c..a1afdff5 100644 --- a/lasso/xml/lib_authentication_statement.c +++ b/lasso/xml/lib_authentication_statement.c @@ -23,8 +23,8 @@ */ #include "private.h" -#include <lasso/xml/lib_authentication_statement.h> -#include <lasso/xml/lib_subject.h> +#include "lib_authentication_statement.h" +#include "lib_subject.h" /** * SECTION:lib_authentication_statement diff --git a/lasso/xml/lib_authentication_statement.h b/lasso/xml/lib_authentication_statement.h index 1712b738..76bac581 100644 --- a/lasso/xml/lib_authentication_statement.h +++ b/lasso/xml/lib_authentication_statement.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_authentication_statement.h> -#include <lasso/xml/lib_authn_context.h> +#include "saml_authentication_statement.h" +#include "lib_authn_context.h" #define LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT (lasso_lib_authentication_statement_get_type()) #define LASSO_LIB_AUTHENTICATION_STATEMENT(obj) \ diff --git a/lasso/xml/lib_authn_context.c b/lasso/xml/lib_authn_context.c index 6bd278d8..76631ab0 100644 --- a/lasso/xml/lib_authn_context.c +++ b/lasso/xml/lib_authn_context.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_authn_context.h> +#include "lib_authn_context.h" /** * SECTION:lib_authn_context diff --git a/lasso/xml/lib_authn_context.h b/lasso/xml/lib_authn_context.h index e8450661..2742c300 100644 --- a/lasso/xml/lib_authn_context.h +++ b/lasso/xml/lib_authn_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_LIB_AUTHN_CONTEXT (lasso_lib_authn_context_get_type()) #define LASSO_LIB_AUTHN_CONTEXT(obj) \ diff --git a/lasso/xml/lib_authn_request.c b/lasso/xml/lib_authn_request.c index 8543f352..be4bcdc0 100644 --- a/lasso/xml/lib_authn_request.c +++ b/lasso/xml/lib_authn_request.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_authn_request.h> +#include "lib_authn_request.h" #include <libxml/uri.h> #include "../utils.h" diff --git a/lasso/xml/lib_authn_request.h b/lasso/xml/lib_authn_request.h index e43fe511..a9f5911d 100644 --- a/lasso/xml/lib_authn_request.h +++ b/lasso/xml/lib_authn_request.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_request_abstract.h> -#include <lasso/xml/lib_request_authn_context.h> -#include <lasso/xml/lib_scoping.h> +#include "samlp_request_abstract.h" +#include "lib_request_authn_context.h" +#include "lib_scoping.h" #define LASSO_TYPE_LIB_AUTHN_REQUEST (lasso_lib_authn_request_get_type()) #define LASSO_LIB_AUTHN_REQUEST(obj) \ diff --git a/lasso/xml/lib_authn_request_envelope.c b/lasso/xml/lib_authn_request_envelope.c index fe4aade9..2fac3a26 100644 --- a/lasso/xml/lib_authn_request_envelope.c +++ b/lasso/xml/lib_authn_request_envelope.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_authn_request_envelope.h> +#include "lib_authn_request_envelope.h" /** * SECTION:lib_authn_request_envelope diff --git a/lasso/xml/lib_authn_request_envelope.h b/lasso/xml/lib_authn_request_envelope.h index 95879445..8a5274ea 100644 --- a/lasso/xml/lib_authn_request_envelope.h +++ b/lasso/xml/lib_authn_request_envelope.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/lib_idp_list.h> -#include <lasso/xml/lib_authn_request.h> +#include "xml.h" +#include "lib_idp_list.h" +#include "lib_authn_request.h" #define LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE (lasso_lib_authn_request_envelope_get_type()) #define LASSO_LIB_AUTHN_REQUEST_ENVELOPE(obj) \ diff --git a/lasso/xml/lib_authn_response.c b/lasso/xml/lib_authn_response.c index 34fe72c5..d6f6ed31 100644 --- a/lasso/xml/lib_authn_response.c +++ b/lasso/xml/lib_authn_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_authn_response.h> +#include "lib_authn_response.h" /** * SECTION:lib_authn_response diff --git a/lasso/xml/lib_authn_response.h b/lasso/xml/lib_authn_response.h index 4981070a..a70ae9da 100644 --- a/lasso/xml/lib_authn_response.h +++ b/lasso/xml/lib_authn_response.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_response.h> -#include <lasso/xml/lib_authn_request.h> +#include "samlp_response.h" +#include "lib_authn_request.h" #define LASSO_TYPE_LIB_AUTHN_RESPONSE (lasso_lib_authn_response_get_type()) #define LASSO_LIB_AUTHN_RESPONSE(obj) \ diff --git a/lasso/xml/lib_authn_response_envelope.c b/lasso/xml/lib_authn_response_envelope.c index aa05e83c..95de6ad6 100644 --- a/lasso/xml/lib_authn_response_envelope.c +++ b/lasso/xml/lib_authn_response_envelope.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_authn_response_envelope.h> +#include "lib_authn_response_envelope.h" /** * SECTION:lib_authn_response_envelope diff --git a/lasso/xml/lib_authn_response_envelope.h b/lasso/xml/lib_authn_response_envelope.h index 0d3a3853..50e28cf4 100644 --- a/lasso/xml/lib_authn_response_envelope.h +++ b/lasso/xml/lib_authn_response_envelope.h @@ -28,7 +28,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/lib_authn_response.h> +#include "lib_authn_response.h" #define LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE (lasso_lib_authn_response_envelope_get_type()) #define LASSO_LIB_AUTHN_RESPONSE_ENVELOPE(obj) \ diff --git a/lasso/xml/lib_federation_termination_notification.c b/lasso/xml/lib_federation_termination_notification.c index fe28ceed..9e90b091 100644 --- a/lasso/xml/lib_federation_termination_notification.c +++ b/lasso/xml/lib_federation_termination_notification.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_federation_termination_notification.h> +#include "lib_federation_termination_notification.h" #include <libxml/uri.h> /** diff --git a/lasso/xml/lib_federation_termination_notification.h b/lasso/xml/lib_federation_termination_notification.h index e786ec98..b3e776f5 100644 --- a/lasso/xml/lib_federation_termination_notification.h +++ b/lasso/xml/lib_federation_termination_notification.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_name_identifier.h> -#include <lasso/xml/samlp_request_abstract.h> +#include "saml_name_identifier.h" +#include "samlp_request_abstract.h" #define LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION \ (lasso_lib_federation_termination_notification_get_type()) diff --git a/lasso/xml/lib_idp_entries.c b/lasso/xml/lib_idp_entries.c index fa130f76..f73a7218 100644 --- a/lasso/xml/lib_idp_entries.c +++ b/lasso/xml/lib_idp_entries.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_idp_entries.h> +#include "lib_idp_entries.h" /** * SECTION:lib_idp_entries diff --git a/lasso/xml/lib_idp_entries.h b/lasso/xml/lib_idp_entries.h index 41250f52..4cfad581 100644 --- a/lasso/xml/lib_idp_entries.h +++ b/lasso/xml/lib_idp_entries.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/lib_idp_entry.h> +#include "xml.h" +#include "lib_idp_entry.h" #define LASSO_TYPE_LIB_IDP_ENTRIES (lasso_lib_idp_entries_get_type()) #define LASSO_LIB_IDP_ENTRIES(obj) \ diff --git a/lasso/xml/lib_idp_entry.c b/lasso/xml/lib_idp_entry.c index 1439336b..c37ef405 100644 --- a/lasso/xml/lib_idp_entry.c +++ b/lasso/xml/lib_idp_entry.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_idp_entry.h> +#include "lib_idp_entry.h" /** * SECTION:lib_idp_entry diff --git a/lasso/xml/lib_idp_entry.h b/lasso/xml/lib_idp_entry.h index 940c5bde..d881860e 100644 --- a/lasso/xml/lib_idp_entry.h +++ b/lasso/xml/lib_idp_entry.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_LIB_IDP_ENTRY (lasso_lib_idp_entry_get_type()) #define LASSO_LIB_IDP_ENTRY(obj) \ diff --git a/lasso/xml/lib_idp_list.c b/lasso/xml/lib_idp_list.c index c200f454..e4c892eb 100644 --- a/lasso/xml/lib_idp_list.c +++ b/lasso/xml/lib_idp_list.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_idp_list.h> +#include "lib_idp_list.h" /** * SECTION:lib_idp_list diff --git a/lasso/xml/lib_idp_list.h b/lasso/xml/lib_idp_list.h index 5ed54800..7003330a 100644 --- a/lasso/xml/lib_idp_list.h +++ b/lasso/xml/lib_idp_list.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/lib_idp_entries.h> +#include "xml.h" +#include "lib_idp_entries.h" #define LASSO_TYPE_LIB_IDP_LIST (lasso_lib_idp_list_get_type()) #define LASSO_LIB_IDP_LIST(obj) \ diff --git a/lasso/xml/lib_logout_request.c b/lasso/xml/lib_logout_request.c index caf41b43..e76d42f9 100644 --- a/lasso/xml/lib_logout_request.c +++ b/lasso/xml/lib_logout_request.c @@ -24,7 +24,7 @@ #include "private.h" #include <libxml/uri.h> -#include <lasso/xml/lib_logout_request.h> +#include "lib_logout_request.h" #include "../utils.h" /** diff --git a/lasso/xml/lib_logout_request.h b/lasso/xml/lib_logout_request.h index 2c1c7691..b61b3bfc 100644 --- a/lasso/xml/lib_logout_request.h +++ b/lasso/xml/lib_logout_request.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_request_abstract.h> -#include <lasso/xml/saml_name_identifier.h> +#include "samlp_request_abstract.h" +#include "saml_name_identifier.h" #define LASSO_TYPE_LIB_LOGOUT_REQUEST (lasso_lib_logout_request_get_type()) #define LASSO_LIB_LOGOUT_REQUEST(obj) \ diff --git a/lasso/xml/lib_logout_response.c b/lasso/xml/lib_logout_response.c index 6e9cd9bc..069c06ad 100644 --- a/lasso/xml/lib_logout_response.c +++ b/lasso/xml/lib_logout_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_logout_response.h> +#include "lib_logout_response.h" /** * SECTION:lib_logout_response diff --git a/lasso/xml/lib_logout_response.h b/lasso/xml/lib_logout_response.h index e67d8650..18164d22 100644 --- a/lasso/xml/lib_logout_response.h +++ b/lasso/xml/lib_logout_response.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/lib_status_response.h> -#include <lasso/xml/lib_logout_request.h> +#include "lib_status_response.h" +#include "lib_logout_request.h" #define LASSO_TYPE_LIB_LOGOUT_RESPONSE (lasso_lib_logout_response_get_type()) #define LASSO_LIB_LOGOUT_RESPONSE(obj) \ diff --git a/lasso/xml/lib_name_identifier_mapping_request.c b/lasso/xml/lib_name_identifier_mapping_request.c index bc589fe0..35098274 100644 --- a/lasso/xml/lib_name_identifier_mapping_request.c +++ b/lasso/xml/lib_name_identifier_mapping_request.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_name_identifier_mapping_request.h> +#include "lib_name_identifier_mapping_request.h" /** * SECTION:lib_name_identifier_mapping_request diff --git a/lasso/xml/lib_name_identifier_mapping_request.h b/lasso/xml/lib_name_identifier_mapping_request.h index b2da9ad4..c2f2ff07 100644 --- a/lasso/xml/lib_name_identifier_mapping_request.h +++ b/lasso/xml/lib_name_identifier_mapping_request.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_request_abstract.h> -#include <lasso/xml/saml_name_identifier.h> +#include "samlp_request_abstract.h" +#include "saml_name_identifier.h" #define LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST \ (lasso_lib_name_identifier_mapping_request_get_type()) diff --git a/lasso/xml/lib_name_identifier_mapping_response.c b/lasso/xml/lib_name_identifier_mapping_response.c index e54276e7..d4edd40d 100644 --- a/lasso/xml/lib_name_identifier_mapping_response.c +++ b/lasso/xml/lib_name_identifier_mapping_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_name_identifier_mapping_response.h> +#include "lib_name_identifier_mapping_response.h" /** * SECTION:lib_name_identifier_mapping_response diff --git a/lasso/xml/lib_name_identifier_mapping_response.h b/lasso/xml/lib_name_identifier_mapping_response.h index 23eead35..dfe8442c 100644 --- a/lasso/xml/lib_name_identifier_mapping_response.h +++ b/lasso/xml/lib_name_identifier_mapping_response.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_response_abstract.h> -#include <lasso/xml/samlp_status.h> -#include <lasso/xml/saml_name_identifier.h> -#include <lasso/xml/lib_name_identifier_mapping_request.h> +#include "samlp_response_abstract.h" +#include "samlp_status.h" +#include "saml_name_identifier.h" +#include "lib_name_identifier_mapping_request.h" #define LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE \ (lasso_lib_name_identifier_mapping_response_get_type()) diff --git a/lasso/xml/lib_register_name_identifier_request.h b/lasso/xml/lib_register_name_identifier_request.h index e50665a1..9f6488bc 100644 --- a/lasso/xml/lib_register_name_identifier_request.h +++ b/lasso/xml/lib_register_name_identifier_request.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_request_abstract.h> -#include <lasso/xml/saml_name_identifier.h> +#include "samlp_request_abstract.h" +#include "saml_name_identifier.h" #define LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST \ (lasso_lib_register_name_identifier_request_get_type()) diff --git a/lasso/xml/lib_register_name_identifier_response.c b/lasso/xml/lib_register_name_identifier_response.c index db8d425d..87852516 100644 --- a/lasso/xml/lib_register_name_identifier_response.c +++ b/lasso/xml/lib_register_name_identifier_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_register_name_identifier_response.h> +#include "lib_register_name_identifier_response.h" /** * SECTION:lib_register_name_identifier_response diff --git a/lasso/xml/lib_register_name_identifier_response.h b/lasso/xml/lib_register_name_identifier_response.h index 16fe5172..a7954aa3 100644 --- a/lasso/xml/lib_register_name_identifier_response.h +++ b/lasso/xml/lib_register_name_identifier_response.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/lib_register_name_identifier_request.h> -#include <lasso/xml/lib_status_response.h> +#include "lib_register_name_identifier_request.h" +#include "lib_status_response.h" #define LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE \ (lasso_lib_register_name_identifier_response_get_type()) diff --git a/lasso/xml/lib_request_authn_context.c b/lasso/xml/lib_request_authn_context.c index c8027b46..a04a93af 100644 --- a/lasso/xml/lib_request_authn_context.c +++ b/lasso/xml/lib_request_authn_context.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_request_authn_context.h> +#include "lib_request_authn_context.h" /** * SECTION:lib_request_authn_context diff --git a/lasso/xml/lib_request_authn_context.h b/lasso/xml/lib_request_authn_context.h index 877256d1..720145cb 100644 --- a/lasso/xml/lib_request_authn_context.h +++ b/lasso/xml/lib_request_authn_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT (lasso_lib_request_authn_context_get_type()) #define LASSO_LIB_REQUEST_AUTHN_CONTEXT(obj) \ diff --git a/lasso/xml/lib_scoping.c b/lasso/xml/lib_scoping.c index 4a3d6598..d01dcbac 100644 --- a/lasso/xml/lib_scoping.c +++ b/lasso/xml/lib_scoping.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_scoping.h> +#include "lib_scoping.h" /** * SECTION:lib_scoping diff --git a/lasso/xml/lib_scoping.h b/lasso/xml/lib_scoping.h index 8148250e..745ede53 100644 --- a/lasso/xml/lib_scoping.h +++ b/lasso/xml/lib_scoping.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/lib_idp_list.h> +#include "xml.h" +#include "lib_idp_list.h" #define LASSO_TYPE_LIB_SCOPING (lasso_lib_scoping_get_type()) #define LASSO_LIB_SCOPING(obj) \ diff --git a/lasso/xml/lib_status_response.c b/lasso/xml/lib_status_response.c index 2af6b204..e21f302a 100644 --- a/lasso/xml/lib_status_response.c +++ b/lasso/xml/lib_status_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_status_response.h> +#include "lib_status_response.h" #include <libxml/uri.h> #include "../utils.h" diff --git a/lasso/xml/lib_status_response.h b/lasso/xml/lib_status_response.h index e4a1816e..71dbc675 100644 --- a/lasso/xml/lib_status_response.h +++ b/lasso/xml/lib_status_response.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_response_abstract.h> -#include <lasso/xml/samlp_status.h> +#include "samlp_response_abstract.h" +#include "samlp_status.h" #define LASSO_TYPE_LIB_STATUS_RESPONSE (lasso_lib_status_response_get_type()) #define LASSO_LIB_STATUS_RESPONSE(obj) \ diff --git a/lasso/xml/lib_subject.c b/lasso/xml/lib_subject.c index fc45174c..f2231175 100644 --- a/lasso/xml/lib_subject.c +++ b/lasso/xml/lib_subject.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/lib_subject.h> +#include "lib_subject.h" /** * SECTION:lib_subject diff --git a/lasso/xml/lib_subject.h b/lasso/xml/lib_subject.h index 00323c90..4882894c 100644 --- a/lasso/xml/lib_subject.h +++ b/lasso/xml/lib_subject.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_subject.h> -#include <lasso/xml/saml_name_identifier.h> +#include "saml_subject.h" +#include "saml_name_identifier.h" #define LASSO_TYPE_LIB_SUBJECT (lasso_lib_subject_get_type()) #define LASSO_LIB_SUBJECT(obj) \ diff --git a/lasso/xml/misc_text_node.h b/lasso/xml/misc_text_node.h index d977b779..f6733bed 100644 --- a/lasso/xml/misc_text_node.h +++ b/lasso/xml/misc_text_node.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_MISC_TEXT_NODE (lasso_misc_text_node_get_type()) #define LASSO_MISC_TEXT_NODE(obj) \ diff --git a/lasso/xml/private.h b/lasso/xml/private.h index 82460eb3..82c056d3 100644 --- a/lasso/xml/private.h +++ b/lasso/xml/private.h @@ -29,11 +29,11 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/xml_enc.h> +#include "xml.h" +#include "xml_enc.h" #include <xmlsec/crypto.h> #include <xmlsec/xmlenc.h> -#include <lasso/xml/saml-2.0/saml2_encrypted_element.h> +#include "saml-2.0/saml2_encrypted_element.h" typedef enum { SNIPPET_NODE, diff --git a/lasso/xml/sa_credentials.c b/lasso/xml/sa_credentials.c index 70aa80a9..78306c21 100644 --- a/lasso/xml/sa_credentials.c +++ b/lasso/xml/sa_credentials.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/sa_credentials.h> +#include "sa_credentials.h" /** * SECTION:sa_credentials diff --git a/lasso/xml/sa_credentials.h b/lasso/xml/sa_credentials.h index df13e40d..55f3a34e 100644 --- a/lasso/xml/sa_credentials.h +++ b/lasso/xml/sa_credentials.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/saml_assertion.h> +#include "xml.h" +#include "saml_assertion.h" #define LASSO_TYPE_SA_CREDENTIALS (lasso_sa_credentials_get_type()) #define LASSO_SA_CREDENTIALS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/sa_parameter.c b/lasso/xml/sa_parameter.c index 4a826792..6319918a 100644 --- a/lasso/xml/sa_parameter.c +++ b/lasso/xml/sa_parameter.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/sa_parameter.h> +#include "sa_parameter.h" /** * SECTION:sa_parameter diff --git a/lasso/xml/sa_parameter.h b/lasso/xml/sa_parameter.h index e68ca6ae..b9acf8d4 100644 --- a/lasso/xml/sa_parameter.h +++ b/lasso/xml/sa_parameter.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SA_PARAMETER (lasso_sa_parameter_get_type()) #define LASSO_SA_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/sa_password_transforms.c b/lasso/xml/sa_password_transforms.c index 56606839..ab0c6299 100644 --- a/lasso/xml/sa_password_transforms.c +++ b/lasso/xml/sa_password_transforms.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/sa_password_transforms.h> +#include "sa_password_transforms.h" /** * SECTION:sa_password_transforms diff --git a/lasso/xml/sa_password_transforms.h b/lasso/xml/sa_password_transforms.h index 2b96794b..d1aa5fac 100644 --- a/lasso/xml/sa_password_transforms.h +++ b/lasso/xml/sa_password_transforms.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SA_PASSWORD_TRANSFORMS (lasso_sa_password_transforms_get_type()) #define LASSO_SA_PASSWORD_TRANSFORMS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/sa_sasl_request.c b/lasso/xml/sa_sasl_request.c index 36aa449c..4d9745f3 100644 --- a/lasso/xml/sa_sasl_request.c +++ b/lasso/xml/sa_sasl_request.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/sa_sasl_request.h> +#include "sa_sasl_request.h" /** * SECTION:sa_sasl_request diff --git a/lasso/xml/sa_sasl_request.h b/lasso/xml/sa_sasl_request.h index e63a3a6a..575d1e9d 100644 --- a/lasso/xml/sa_sasl_request.h +++ b/lasso/xml/sa_sasl_request.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/lib_request_authn_context.h> -#include <lasso/xml/xml.h> +#include "lib_request_authn_context.h" +#include "xml.h" #define LASSO_TYPE_SA_SASL_REQUEST (lasso_sa_sasl_request_get_type()) #define LASSO_SA_SASL_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/sa_sasl_response.c b/lasso/xml/sa_sasl_response.c index 3b7cd04f..20c8ee82 100644 --- a/lasso/xml/sa_sasl_response.c +++ b/lasso/xml/sa_sasl_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/sa_sasl_response.h> +#include "sa_sasl_response.h" /** * SECTION:sa_sasl_response diff --git a/lasso/xml/sa_sasl_response.h b/lasso/xml/sa_sasl_response.h index b3247576..f855e9d3 100644 --- a/lasso/xml/sa_sasl_response.h +++ b/lasso/xml/sa_sasl_response.h @@ -29,11 +29,11 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/disco_resource_offering.h> -#include <lasso/xml/utility_status.h> -#include <lasso/xml/sa_credentials.h> -#include <lasso/xml/sa_password_transforms.h> -#include <lasso/xml/xml.h> +#include "disco_resource_offering.h" +#include "utility_status.h" +#include "sa_credentials.h" +#include "sa_password_transforms.h" +#include "xml.h" #define LASSO_TYPE_SA_SASL_RESPONSE (lasso_sa_sasl_response_get_type()) #define LASSO_SA_SASL_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/sa_transform.c b/lasso/xml/sa_transform.c index 0ab70d31..603afcc5 100644 --- a/lasso/xml/sa_transform.c +++ b/lasso/xml/sa_transform.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/sa_transform.h> +#include "sa_transform.h" /** * SECTION:sa_transform diff --git a/lasso/xml/sa_transform.h b/lasso/xml/sa_transform.h index aa030d8f..9114adb1 100644 --- a/lasso/xml/sa_transform.h +++ b/lasso/xml/sa_transform.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SA_TRANSFORM (lasso_sa_transform_get_type()) #define LASSO_SA_TRANSFORM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/saml-2.0/saml2_action.h b/lasso/xml/saml-2.0/saml2_action.h index dedee9b2..ef443e40 100644 --- a/lasso/xml/saml-2.0/saml2_action.h +++ b/lasso/xml/saml-2.0/saml2_action.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_ACTION (lasso_saml2_action_get_type()) #define LASSO_SAML2_ACTION(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_advice.h b/lasso/xml/saml-2.0/saml2_advice.h index 7c2e094a..b2925042 100644 --- a/lasso/xml/saml-2.0/saml2_advice.h +++ b/lasso/xml/saml-2.0/saml2_advice.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #ifndef __LASSO_SAML2_ASSERTION_H__ /* to avoid circular inclusion of saml2_assertion.h */ diff --git a/lasso/xml/saml-2.0/saml2_assertion.h b/lasso/xml/saml-2.0/saml2_assertion.h index 524943cd..465184c9 100644 --- a/lasso/xml/saml-2.0/saml2_assertion.h +++ b/lasso/xml/saml-2.0/saml2_assertion.h @@ -53,7 +53,7 @@ typedef struct _LassoSaml2AssertionClass LassoSaml2AssertionClass; #include "saml2_subject.h" #include "saml2_name_id.h" -#include <lasso/xml/xml_enc.h> +#include "../xml_enc.h" struct _LassoSaml2Assertion { LassoNode parent; diff --git a/lasso/xml/saml-2.0/saml2_attribute.h b/lasso/xml/saml-2.0/saml2_attribute.h index 71820c1a..dadc03a3 100644 --- a/lasso/xml/saml-2.0/saml2_attribute.h +++ b/lasso/xml/saml-2.0/saml2_attribute.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_ATTRIBUTE (lasso_saml2_attribute_get_type()) #define LASSO_SAML2_ATTRIBUTE(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_attribute_value.c b/lasso/xml/saml-2.0/saml2_attribute_value.c index 5dd13f14..064590d5 100644 --- a/lasso/xml/saml-2.0/saml2_attribute_value.c +++ b/lasso/xml/saml-2.0/saml2_attribute_value.c @@ -21,7 +21,7 @@ */ #include "../private.h" -#include <lasso/xml/saml-2.0/saml2_attribute_value.h> +#include "saml2_attribute_value.h" /** * SECTION:saml2_attribute_value diff --git a/lasso/xml/saml-2.0/saml2_attribute_value.h b/lasso/xml/saml-2.0/saml2_attribute_value.h index 6a24cba7..90857073 100644 --- a/lasso/xml/saml-2.0/saml2_attribute_value.h +++ b/lasso/xml/saml-2.0/saml2_attribute_value.h @@ -27,7 +27,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_ATTRIBUTE_VALUE (lasso_saml2_attribute_value_get_type()) #define LASSO_SAML2_ATTRIBUTE_VALUE(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_authn_context.h b/lasso/xml/saml-2.0/saml2_authn_context.h index d1e23282..9ba6af08 100644 --- a/lasso/xml/saml-2.0/saml2_authn_context.h +++ b/lasso/xml/saml-2.0/saml2_authn_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_AUTHN_CONTEXT (lasso_saml2_authn_context_get_type()) #define LASSO_SAML2_AUTHN_CONTEXT(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_base_idabstract.h b/lasso/xml/saml-2.0/saml2_base_idabstract.h index 50957fff..2ab011b9 100644 --- a/lasso/xml/saml-2.0/saml2_base_idabstract.h +++ b/lasso/xml/saml-2.0/saml2_base_idabstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_BASE_IDABSTRACT (lasso_saml2_base_idabstract_get_type()) #define LASSO_SAML2_BASE_IDABSTRACT(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_condition_abstract.h b/lasso/xml/saml-2.0/saml2_condition_abstract.h index 37ecceec..b101096e 100644 --- a/lasso/xml/saml-2.0/saml2_condition_abstract.h +++ b/lasso/xml/saml-2.0/saml2_condition_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_CONDITION_ABSTRACT (lasso_saml2_condition_abstract_get_type()) #define LASSO_SAML2_CONDITION_ABSTRACT(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_conditions.h b/lasso/xml/saml-2.0/saml2_conditions.h index bab8c57f..0ec65f66 100644 --- a/lasso/xml/saml-2.0/saml2_conditions.h +++ b/lasso/xml/saml-2.0/saml2_conditions.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_CONDITIONS (lasso_saml2_conditions_get_type()) #define LASSO_SAML2_CONDITIONS(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_evidence.h b/lasso/xml/saml-2.0/saml2_evidence.h index d5fccfbc..3f96b675 100644 --- a/lasso/xml/saml-2.0/saml2_evidence.h +++ b/lasso/xml/saml-2.0/saml2_evidence.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #ifndef __LASSO_SAML2_ASSERTION_H__ /* to avoid circular inclusion of saml2_assertion.h */ diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h index 5827f216..2745bc78 100644 --- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h +++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_KEY_INFO_CONFIRMATION_DATA \ (lasso_saml2_key_info_confirmation_data_get_type()) diff --git a/lasso/xml/saml-2.0/saml2_name_id.h b/lasso/xml/saml-2.0/saml2_name_id.h index eb2df09b..e90f5da2 100644 --- a/lasso/xml/saml-2.0/saml2_name_id.h +++ b/lasso/xml/saml-2.0/saml2_name_id.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_NAME_ID (lasso_saml2_name_id_get_type()) #define LASSO_SAML2_NAME_ID(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_statement_abstract.h b/lasso/xml/saml-2.0/saml2_statement_abstract.h index 85bf1cf7..2c2a3191 100644 --- a/lasso/xml/saml-2.0/saml2_statement_abstract.h +++ b/lasso/xml/saml-2.0/saml2_statement_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_STATEMENT_ABSTRACT (lasso_saml2_statement_abstract_get_type()) #define LASSO_SAML2_STATEMENT_ABSTRACT(obj) \ diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h index 64163a0c..24ddbd4e 100644 --- a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h +++ b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_SUBJECT_CONFIRMATION_DATA \ (lasso_saml2_subject_confirmation_data_get_type()) diff --git a/lasso/xml/saml-2.0/saml2_subject_locality.h b/lasso/xml/saml-2.0/saml2_subject_locality.h index 7f2afc05..2b9d99b8 100644 --- a/lasso/xml/saml-2.0/saml2_subject_locality.h +++ b/lasso/xml/saml-2.0/saml2_subject_locality.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAML2_SUBJECT_LOCALITY (lasso_saml2_subject_locality_get_type()) #define LASSO_SAML2_SUBJECT_LOCALITY(obj) \ diff --git a/lasso/xml/saml-2.0/samlp2_extensions.h b/lasso/xml/saml-2.0/samlp2_extensions.h index cc06e781..72c62377 100644 --- a/lasso/xml/saml-2.0/samlp2_extensions.h +++ b/lasso/xml/saml-2.0/samlp2_extensions.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAMLP2_EXTENSIONS (lasso_samlp2_extensions_get_type()) #define LASSO_SAMLP2_EXTENSIONS(obj) \ diff --git a/lasso/xml/saml-2.0/samlp2_idp_entry.h b/lasso/xml/saml-2.0/samlp2_idp_entry.h index 3c76e9af..76a1494e 100644 --- a/lasso/xml/saml-2.0/samlp2_idp_entry.h +++ b/lasso/xml/saml-2.0/samlp2_idp_entry.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAMLP2_IDP_ENTRY (lasso_samlp2_idp_entry_get_type()) #define LASSO_SAMLP2_IDP_ENTRY(obj) \ diff --git a/lasso/xml/saml-2.0/samlp2_name_id_policy.h b/lasso/xml/saml-2.0/samlp2_name_id_policy.h index 94e1e7b7..dfdb5346 100644 --- a/lasso/xml/saml-2.0/samlp2_name_id_policy.h +++ b/lasso/xml/saml-2.0/samlp2_name_id_policy.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAMLP2_NAME_ID_POLICY (lasso_samlp2_name_id_policy_get_type()) #define LASSO_SAMLP2_NAME_ID_POLICY(obj) \ diff --git a/lasso/xml/saml-2.0/samlp2_requested_authn_context.h b/lasso/xml/saml-2.0/samlp2_requested_authn_context.h index 9ec3da9f..7e17513a 100644 --- a/lasso/xml/saml-2.0/samlp2_requested_authn_context.h +++ b/lasso/xml/saml-2.0/samlp2_requested_authn_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAMLP2_REQUESTED_AUTHN_CONTEXT (lasso_samlp2_requested_authn_context_get_type()) #define LASSO_SAMLP2_REQUESTED_AUTHN_CONTEXT(obj) \ diff --git a/lasso/xml/saml-2.0/samlp2_status_code.h b/lasso/xml/saml-2.0/samlp2_status_code.h index 75403b35..07683594 100644 --- a/lasso/xml/saml-2.0/samlp2_status_code.h +++ b/lasso/xml/saml-2.0/samlp2_status_code.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAMLP2_STATUS_CODE (lasso_samlp2_status_code_get_type()) #define LASSO_SAMLP2_STATUS_CODE(obj) \ diff --git a/lasso/xml/saml-2.0/samlp2_status_detail.h b/lasso/xml/saml-2.0/samlp2_status_detail.h index 2a124695..34c6f241 100644 --- a/lasso/xml/saml-2.0/samlp2_status_detail.h +++ b/lasso/xml/saml-2.0/samlp2_status_detail.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAMLP2_STATUS_DETAIL (lasso_samlp2_status_detail_get_type()) #define LASSO_SAMLP2_STATUS_DETAIL(obj) \ diff --git a/lasso/xml/saml-2.0/samlp2_terminate.h b/lasso/xml/saml-2.0/samlp2_terminate.h index 01e26f96..3ed8cfcf 100644 --- a/lasso/xml/saml-2.0/samlp2_terminate.h +++ b/lasso/xml/saml-2.0/samlp2_terminate.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_SAMLP2_TERMINATE (lasso_samlp2_terminate_get_type()) #define LASSO_SAMLP2_TERMINATE(obj) \ diff --git a/lasso/xml/saml_advice.c b/lasso/xml/saml_advice.c index db8a761f..21ff99b7 100644 --- a/lasso/xml/saml_advice.c +++ b/lasso/xml/saml_advice.c @@ -23,8 +23,8 @@ */ #include "private.h" -#include <lasso/xml/saml_advice.h> -#include <lasso/xml/saml_assertion.h> +#include "saml_advice.h" +#include "saml_assertion.h" /** * SECTION:saml_advice diff --git a/lasso/xml/saml_advice.h b/lasso/xml/saml_advice.h index 6a5a822d..2b3cdea7 100644 --- a/lasso/xml/saml_advice.h +++ b/lasso/xml/saml_advice.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_ADVICE (lasso_saml_advice_get_type()) #define LASSO_SAML_ADVICE(obj) \ diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c index 819c733a..0cf14504 100644 --- a/lasso/xml/saml_assertion.c +++ b/lasso/xml/saml_assertion.c @@ -28,7 +28,7 @@ #include <xmlsec/xmldsig.h> #include <xmlsec/templates.h> -#include <lasso/xml/saml_assertion.h> +#include "saml_assertion.h" /** * SECTION:saml_assertion diff --git a/lasso/xml/saml_assertion.h b/lasso/xml/saml_assertion.h index 26d007cd..837b868c 100644 --- a/lasso/xml/saml_assertion.h +++ b/lasso/xml/saml_assertion.h @@ -29,13 +29,13 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/saml_advice.h> -#include <lasso/xml/saml_authentication_statement.h> -#include <lasso/xml/saml_conditions.h> -#include <lasso/xml/saml_statement_abstract.h> -#include <lasso/xml/saml_subject_statement.h> -#include <lasso/xml/saml_attribute_statement.h> +#include "xml.h" +#include "saml_advice.h" +#include "saml_authentication_statement.h" +#include "saml_conditions.h" +#include "saml_statement_abstract.h" +#include "saml_subject_statement.h" +#include "saml_attribute_statement.h" #define LASSO_TYPE_SAML_ASSERTION (lasso_saml_assertion_get_type()) #define LASSO_SAML_ASSERTION(obj) \ diff --git a/lasso/xml/saml_attribute.c b/lasso/xml/saml_attribute.c index 6b7e5727..e436c86a 100644 --- a/lasso/xml/saml_attribute.c +++ b/lasso/xml/saml_attribute.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_attribute.h> +#include "saml_attribute.h" /* * The schema fragment (oasis-sstc-saml-schema-assertion-1.1.xsd): diff --git a/lasso/xml/saml_attribute.h b/lasso/xml/saml_attribute.h index ca14555f..df48b034 100644 --- a/lasso/xml/saml_attribute.h +++ b/lasso/xml/saml_attribute.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_attribute_designator.h> +#include "saml_attribute_designator.h" #define LASSO_TYPE_SAML_ATTRIBUTE (lasso_saml_attribute_get_type()) #define LASSO_SAML_ATTRIBUTE(obj) \ diff --git a/lasso/xml/saml_attribute_designator.c b/lasso/xml/saml_attribute_designator.c index de54c592..9479a78a 100644 --- a/lasso/xml/saml_attribute_designator.c +++ b/lasso/xml/saml_attribute_designator.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_attribute_designator.h> +#include "saml_attribute_designator.h" /* * The schema fragment (oasis-sstc-saml-schema-assertion-1.1.xsd): diff --git a/lasso/xml/saml_attribute_designator.h b/lasso/xml/saml_attribute_designator.h index acbf4aff..7d1f6192 100644 --- a/lasso/xml/saml_attribute_designator.h +++ b/lasso/xml/saml_attribute_designator.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_ATTRIBUTE_DESIGNATOR (lasso_saml_attribute_designator_get_type()) #define LASSO_SAML_ATTRIBUTE_DESIGNATOR(obj) \ diff --git a/lasso/xml/saml_attribute_statement.c b/lasso/xml/saml_attribute_statement.c index 1a216836..cd856ed6 100644 --- a/lasso/xml/saml_attribute_statement.c +++ b/lasso/xml/saml_attribute_statement.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_attribute_statement.h> +#include "saml_attribute_statement.h" /* * The schema fragment (oasis-sstc-saml-schema-assertion-1.1.xsd): diff --git a/lasso/xml/saml_attribute_statement.h b/lasso/xml/saml_attribute_statement.h index a8b73a19..afbf0f21 100644 --- a/lasso/xml/saml_attribute_statement.h +++ b/lasso/xml/saml_attribute_statement.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_attribute.h> -#include <lasso/xml/saml_subject_statement_abstract.h> +#include "saml_attribute.h" +#include "saml_subject_statement_abstract.h" #define LASSO_TYPE_SAML_ATTRIBUTE_STATEMENT (lasso_saml_attribute_statement_get_type()) #define LASSO_SAML_ATTRIBUTE_STATEMENT(obj) \ diff --git a/lasso/xml/saml_attribute_value.c b/lasso/xml/saml_attribute_value.c index ca9fffa5..a7af9bfa 100644 --- a/lasso/xml/saml_attribute_value.c +++ b/lasso/xml/saml_attribute_value.c @@ -24,7 +24,7 @@ */ #include "private.h" -#include <lasso/xml/saml_attribute_value.h> +#include "saml_attribute_value.h" /** * SECTION:saml_attribute_value diff --git a/lasso/xml/saml_attribute_value.h b/lasso/xml/saml_attribute_value.h index d3b12983..3c819b28 100644 --- a/lasso/xml/saml_attribute_value.h +++ b/lasso/xml/saml_attribute_value.h @@ -30,7 +30,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_ATTRIBUTE_VALUE (lasso_saml_attribute_value_get_type()) #define LASSO_SAML_ATTRIBUTE_VALUE(obj) \ diff --git a/lasso/xml/saml_audience_restriction_condition.c b/lasso/xml/saml_audience_restriction_condition.c index 8c5c0077..0e4f0334 100644 --- a/lasso/xml/saml_audience_restriction_condition.c +++ b/lasso/xml/saml_audience_restriction_condition.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_audience_restriction_condition.h> +#include "saml_audience_restriction_condition.h" /* * schema fragment (oasis-sstc-saml-schema-assertion-1.0.xsd): diff --git a/lasso/xml/saml_audience_restriction_condition.h b/lasso/xml/saml_audience_restriction_condition.h index 860e72b0..abb2869e 100644 --- a/lasso/xml/saml_audience_restriction_condition.h +++ b/lasso/xml/saml_audience_restriction_condition.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_condition_abstract.h> +#include "saml_condition_abstract.h" #define LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION \ (lasso_saml_audience_restriction_condition_get_type()) diff --git a/lasso/xml/saml_authentication_statement.c b/lasso/xml/saml_authentication_statement.c index 0cb0dc8e..a39c9758 100644 --- a/lasso/xml/saml_authentication_statement.c +++ b/lasso/xml/saml_authentication_statement.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_authentication_statement.h> +#include "saml_authentication_statement.h" /** * SECTION:saml_authentication_statement diff --git a/lasso/xml/saml_authentication_statement.h b/lasso/xml/saml_authentication_statement.h index dd6909a3..5ef6ea0d 100644 --- a/lasso/xml/saml_authentication_statement.h +++ b/lasso/xml/saml_authentication_statement.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_authority_binding.h> -#include <lasso/xml/saml_subject_locality.h> -#include <lasso/xml/saml_subject_statement_abstract.h> +#include "saml_authority_binding.h" +#include "saml_subject_locality.h" +#include "saml_subject_statement_abstract.h" #define LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT (lasso_saml_authentication_statement_get_type()) #define LASSO_SAML_AUTHENTICATION_STATEMENT(obj) \ diff --git a/lasso/xml/saml_authority_binding.c b/lasso/xml/saml_authority_binding.c index a529e3e6..e8daeab1 100644 --- a/lasso/xml/saml_authority_binding.c +++ b/lasso/xml/saml_authority_binding.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_authority_binding.h> +#include "saml_authority_binding.h" /** * SECTION:saml_authority_binding diff --git a/lasso/xml/saml_authority_binding.h b/lasso/xml/saml_authority_binding.h index ca372101..36b9958f 100644 --- a/lasso/xml/saml_authority_binding.h +++ b/lasso/xml/saml_authority_binding.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_AUTHORITY_BINDING (lasso_saml_authority_binding_get_type()) #define LASSO_SAML_AUTHORITY_BINDING(obj) \ diff --git a/lasso/xml/saml_condition_abstract.c b/lasso/xml/saml_condition_abstract.c index be07a182..f88be52f 100644 --- a/lasso/xml/saml_condition_abstract.c +++ b/lasso/xml/saml_condition_abstract.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_condition_abstract.h> +#include "saml_condition_abstract.h" /** * SECTION:saml_condition_abstract diff --git a/lasso/xml/saml_condition_abstract.h b/lasso/xml/saml_condition_abstract.h index f8e0414a..8132bc50 100644 --- a/lasso/xml/saml_condition_abstract.h +++ b/lasso/xml/saml_condition_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_CONDITION_ABSTRACT (lasso_saml_condition_abstract_get_type()) #define LASSO_SAML_CONDITION_ABSTRACT(obj) \ diff --git a/lasso/xml/saml_conditions.c b/lasso/xml/saml_conditions.c index ab416819..b884593c 100644 --- a/lasso/xml/saml_conditions.c +++ b/lasso/xml/saml_conditions.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_conditions.h> +#include "saml_conditions.h" /** * SECTION:saml_conditions diff --git a/lasso/xml/saml_conditions.h b/lasso/xml/saml_conditions.h index 9f1c3764..038ac1cf 100644 --- a/lasso/xml/saml_conditions.h +++ b/lasso/xml/saml_conditions.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/saml_audience_restriction_condition.h> -#include <lasso/xml/saml_condition_abstract.h> +#include "xml.h" +#include "saml_audience_restriction_condition.h" +#include "saml_condition_abstract.h" #define LASSO_TYPE_SAML_CONDITIONS (lasso_saml_conditions_get_type()) #define LASSO_SAML_CONDITIONS(obj) \ diff --git a/lasso/xml/saml_name_identifier.c b/lasso/xml/saml_name_identifier.c index 00f5d00a..1d0d1a14 100644 --- a/lasso/xml/saml_name_identifier.c +++ b/lasso/xml/saml_name_identifier.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_name_identifier.h> +#include "saml_name_identifier.h" #include <libxml/uri.h> /** diff --git a/lasso/xml/saml_name_identifier.h b/lasso/xml/saml_name_identifier.h index 1d9a54b5..4902727c 100644 --- a/lasso/xml/saml_name_identifier.h +++ b/lasso/xml/saml_name_identifier.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_NAME_IDENTIFIER (lasso_saml_name_identifier_get_type()) #define LASSO_SAML_NAME_IDENTIFIER(obj) \ diff --git a/lasso/xml/saml_statement_abstract.c b/lasso/xml/saml_statement_abstract.c index 54ac24cd..4bba5100 100644 --- a/lasso/xml/saml_statement_abstract.c +++ b/lasso/xml/saml_statement_abstract.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_statement_abstract.h> +#include "saml_statement_abstract.h" /** * SECTION:saml_statement_abstract diff --git a/lasso/xml/saml_statement_abstract.h b/lasso/xml/saml_statement_abstract.h index 54a38f03..c55be4dc 100644 --- a/lasso/xml/saml_statement_abstract.h +++ b/lasso/xml/saml_statement_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_STATEMENT_ABSTRACT (lasso_saml_statement_abstract_get_type()) #define LASSO_SAML_STATEMENT_ABSTRACT(obj) \ diff --git a/lasso/xml/saml_subject.c b/lasso/xml/saml_subject.c index 5746588f..5d82ad29 100644 --- a/lasso/xml/saml_subject.c +++ b/lasso/xml/saml_subject.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_subject.h> +#include "saml_subject.h" /** * SECTION:saml_subject diff --git a/lasso/xml/saml_subject.h b/lasso/xml/saml_subject.h index 8c1b5d7a..c2305387 100644 --- a/lasso/xml/saml_subject.h +++ b/lasso/xml/saml_subject.h @@ -29,10 +29,10 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/saml_name_identifier.h> -#include <lasso/xml/saml_subject_confirmation.h> -#include <lasso/xml/saml-2.0/saml2_encrypted_element.h> +#include "xml.h" +#include "saml_name_identifier.h" +#include "saml_subject_confirmation.h" +#include "saml-2.0/saml2_encrypted_element.h" #define LASSO_TYPE_SAML_SUBJECT (lasso_saml_subject_get_type()) #define LASSO_SAML_SUBJECT(obj) \ diff --git a/lasso/xml/saml_subject_confirmation.c b/lasso/xml/saml_subject_confirmation.c index f472da25..120bcdfb 100644 --- a/lasso/xml/saml_subject_confirmation.c +++ b/lasso/xml/saml_subject_confirmation.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_subject_confirmation.h> +#include "saml_subject_confirmation.h" /** * SECTION:saml_subject_confirmation diff --git a/lasso/xml/saml_subject_confirmation.h b/lasso/xml/saml_subject_confirmation.h index 0e74b0f7..c6be253e 100644 --- a/lasso/xml/saml_subject_confirmation.h +++ b/lasso/xml/saml_subject_confirmation.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/ds_key_info.h> +#include "xml.h" +#include "ds_key_info.h" #define LASSO_TYPE_SAML_SUBJECT_CONFIRMATION (lasso_saml_subject_confirmation_get_type()) #define LASSO_SAML_SUBJECT_CONFIRMATION(obj) \ diff --git a/lasso/xml/saml_subject_locality.c b/lasso/xml/saml_subject_locality.c index 6b8b73a5..6c38c0fb 100644 --- a/lasso/xml/saml_subject_locality.c +++ b/lasso/xml/saml_subject_locality.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_subject_locality.h> +#include "saml_subject_locality.h" /** * SECTION:saml_subject_locality diff --git a/lasso/xml/saml_subject_locality.h b/lasso/xml/saml_subject_locality.h index 3368f002..e0964a5b 100644 --- a/lasso/xml/saml_subject_locality.h +++ b/lasso/xml/saml_subject_locality.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAML_SUBJECT_LOCALITY (lasso_saml_subject_locality_get_type()) #define LASSO_SAML_SUBJECT_LOCALITY(obj) \ diff --git a/lasso/xml/saml_subject_statement.c b/lasso/xml/saml_subject_statement.c index 19a9ab96..40da63b3 100644 --- a/lasso/xml/saml_subject_statement.c +++ b/lasso/xml/saml_subject_statement.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_subject_statement.h> +#include "saml_subject_statement.h" /* The schema fragment (oasis-sstc-saml-schema-assertion-1.0.xsd): diff --git a/lasso/xml/saml_subject_statement.h b/lasso/xml/saml_subject_statement.h index d14dbd7f..29d7d6bd 100644 --- a/lasso/xml/saml_subject_statement.h +++ b/lasso/xml/saml_subject_statement.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_subject_statement_abstract.h> +#include "saml_subject_statement_abstract.h" #define LASSO_TYPE_SAML_SUBJECT_STATEMENT (lasso_saml_subject_statement_get_type()) #define LASSO_SAML_SUBJECT_STATEMENT(obj) \ diff --git a/lasso/xml/saml_subject_statement_abstract.c b/lasso/xml/saml_subject_statement_abstract.c index d4a9066a..d691768a 100644 --- a/lasso/xml/saml_subject_statement_abstract.c +++ b/lasso/xml/saml_subject_statement_abstract.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/saml_subject_statement_abstract.h> +#include "saml_subject_statement_abstract.h" /** * SECTION:saml_subject_statement_abstract diff --git a/lasso/xml/saml_subject_statement_abstract.h b/lasso/xml/saml_subject_statement_abstract.h index ae810bcc..0318d963 100644 --- a/lasso/xml/saml_subject_statement_abstract.h +++ b/lasso/xml/saml_subject_statement_abstract.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/saml_statement_abstract.h> -#include <lasso/xml/saml_subject.h> +#include "saml_statement_abstract.h" +#include "saml_subject.h" #define LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT \ (lasso_saml_subject_statement_abstract_get_type()) diff --git a/lasso/xml/samlp_request.c b/lasso/xml/samlp_request.c index 785fc7dd..308fd5a6 100644 --- a/lasso/xml/samlp_request.c +++ b/lasso/xml/samlp_request.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/samlp_request.h> +#include "samlp_request.h" /** * SECTION:samlp_request diff --git a/lasso/xml/samlp_request.h b/lasso/xml/samlp_request.h index 07b944dd..980ed479 100644 --- a/lasso/xml/samlp_request.h +++ b/lasso/xml/samlp_request.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_request_abstract.h> +#include "samlp_request_abstract.h" #define LASSO_TYPE_SAMLP_REQUEST (lasso_samlp_request_get_type()) #define LASSO_SAMLP_REQUEST(obj) \ diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c index 3ef984f1..f3266fe7 100644 --- a/lasso/xml/samlp_request_abstract.c +++ b/lasso/xml/samlp_request_abstract.c @@ -27,7 +27,7 @@ #include <xmlsec/xmldsig.h> #include <xmlsec/templates.h> -#include <lasso/xml/samlp_request_abstract.h> +#include "samlp_request_abstract.h" /** * SECTION:samlp_request_abstract diff --git a/lasso/xml/samlp_request_abstract.h b/lasso/xml/samlp_request_abstract.h index ad2ea1a9..f2274232 100644 --- a/lasso/xml/samlp_request_abstract.h +++ b/lasso/xml/samlp_request_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAMLP_REQUEST_ABSTRACT (lasso_samlp_request_abstract_get_type()) #define LASSO_SAMLP_REQUEST_ABSTRACT(obj) \ diff --git a/lasso/xml/samlp_response.c b/lasso/xml/samlp_response.c index 617d8f14..bf6f5601 100644 --- a/lasso/xml/samlp_response.c +++ b/lasso/xml/samlp_response.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/samlp_response.h> +#include "samlp_response.h" #include <libxml/tree.h> /** diff --git a/lasso/xml/samlp_response.h b/lasso/xml/samlp_response.h index 7dd5c6a9..6dde3c09 100644 --- a/lasso/xml/samlp_response.h +++ b/lasso/xml/samlp_response.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/samlp_response_abstract.h> -#include <lasso/xml/samlp_status.h> -#include <lasso/xml/saml_assertion.h> +#include "samlp_response_abstract.h" +#include "samlp_status.h" +#include "saml_assertion.h" #define LASSO_TYPE_SAMLP_RESPONSE (lasso_samlp_response_get_type()) #define LASSO_SAMLP_RESPONSE(obj) \ diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c index e52e4ba8..3c3a62a2 100644 --- a/lasso/xml/samlp_response_abstract.c +++ b/lasso/xml/samlp_response_abstract.c @@ -27,7 +27,7 @@ #include <xmlsec/xmldsig.h> #include <xmlsec/templates.h> -#include <lasso/xml/samlp_response_abstract.h> +#include "samlp_response_abstract.h" /** * SECTION:samlp_response_abstract diff --git a/lasso/xml/samlp_response_abstract.h b/lasso/xml/samlp_response_abstract.h index 34732fd6..45f261b8 100644 --- a/lasso/xml/samlp_response_abstract.h +++ b/lasso/xml/samlp_response_abstract.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT (lasso_samlp_response_abstract_get_type()) #define LASSO_SAMLP_RESPONSE_ABSTRACT(obj) \ diff --git a/lasso/xml/samlp_status.c b/lasso/xml/samlp_status.c index 40e03ecf..b4c67015 100644 --- a/lasso/xml/samlp_status.c +++ b/lasso/xml/samlp_status.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/samlp_status.h> +#include "samlp_status.h" /** * SECTION:samlp_status diff --git a/lasso/xml/samlp_status.h b/lasso/xml/samlp_status.h index 527d06e5..7af106b0 100644 --- a/lasso/xml/samlp_status.h +++ b/lasso/xml/samlp_status.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/samlp_status_code.h> +#include "xml.h" +#include "samlp_status_code.h" #define LASSO_TYPE_SAMLP_STATUS (lasso_samlp_status_get_type()) #define LASSO_SAMLP_STATUS(obj) \ diff --git a/lasso/xml/samlp_status_code.c b/lasso/xml/samlp_status_code.c index a63f9244..1fbe0719 100644 --- a/lasso/xml/samlp_status_code.c +++ b/lasso/xml/samlp_status_code.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/samlp_status_code.h> +#include "samlp_status_code.h" /** * SECTION:samlp_status_code diff --git a/lasso/xml/samlp_status_code.h b/lasso/xml/samlp_status_code.h index 85eb8ad5..adb2596b 100644 --- a/lasso/xml/samlp_status_code.h +++ b/lasso/xml/samlp_status_code.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SAMLP_STATUS_CODE (lasso_samlp_status_code_get_type()) #define LASSO_SAMLP_STATUS_CODE(obj) \ diff --git a/lasso/xml/sec_resource_access_statement.c b/lasso/xml/sec_resource_access_statement.c index eae2d314..34810a5e 100644 --- a/lasso/xml/sec_resource_access_statement.c +++ b/lasso/xml/sec_resource_access_statement.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/sec_resource_access_statement.h> +#include "sec_resource_access_statement.h" /* * <xs: element name="ResourceAccessStatement" diff --git a/lasso/xml/sec_resource_access_statement.h b/lasso/xml/sec_resource_access_statement.h index 589c93cc..4b54058c 100644 --- a/lasso/xml/sec_resource_access_statement.h +++ b/lasso/xml/sec_resource_access_statement.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/saml_subject_statement_abstract.h> +#include "xml.h" +#include "saml_subject_statement_abstract.h" #define LASSO_TYPE_SEC_RESOURCE_ACCESS_STATEMENT (lasso_sec_resource_access_statement_get_type()) #define LASSO_SEC_RESOURCE_ACCESS_STATEMENT(obj) \ diff --git a/lasso/xml/soap_binding.c b/lasso/xml/soap_binding.c index 43768741..b62c980d 100644 --- a/lasso/xml/soap_binding.c +++ b/lasso/xml/soap_binding.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding.h> +#include "soap_binding.h" #define find_node_type_in_list(iter, check) \ {\ diff --git a/lasso/xml/soap_binding.h b/lasso/xml/soap_binding.h index f7ef004a..d8c94fc2 100644 --- a/lasso/xml/soap_binding.h +++ b/lasso/xml/soap_binding.h @@ -25,9 +25,9 @@ #ifndef __LASSO_SOAP_BINDING_H__ #define __LASSO_SOAP_BINDING_H__ -#include <lasso/xml/soap_binding_provider.h> -#include <lasso/xml/soap_binding_correlation.h> -#include <lasso/xml/soap_envelope.h> +#include "soap_binding_provider.h" +#include "soap_binding_correlation.h" +#include "soap_envelope.h" #ifdef __cplusplus extern "C" { diff --git a/lasso/xml/soap_binding_consent.c b/lasso/xml/soap_binding_consent.c index a63aeabb..0f954d7c 100644 --- a/lasso/xml/soap_binding_consent.c +++ b/lasso/xml/soap_binding_consent.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_consent.h> +#include "soap_binding_consent.h" /** * SECTION:soap_binding_consent diff --git a/lasso/xml/soap_binding_consent.h b/lasso/xml/soap_binding_consent.h index da63a0aa..c6c8a026 100644 --- a/lasso/xml/soap_binding_consent.h +++ b/lasso/xml/soap_binding_consent.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BINDING_CONSENT (lasso_soap_binding_consent_get_type()) #define LASSO_SOAP_BINDING_CONSENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_binding_correlation.c b/lasso/xml/soap_binding_correlation.c index 47e1afa9..9e9ffee2 100644 --- a/lasso/xml/soap_binding_correlation.c +++ b/lasso/xml/soap_binding_correlation.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_correlation.h> +#include "soap_binding_correlation.h" /** * SECTION:soap_binding_correlation diff --git a/lasso/xml/soap_binding_correlation.h b/lasso/xml/soap_binding_correlation.h index 25adf641..63e94301 100644 --- a/lasso/xml/soap_binding_correlation.h +++ b/lasso/xml/soap_binding_correlation.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BINDING_CORRELATION (lasso_soap_binding_correlation_get_type()) #define LASSO_SOAP_BINDING_CORRELATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_binding_ext_credential.c b/lasso/xml/soap_binding_ext_credential.c index ad734a04..0f524cc5 100644 --- a/lasso/xml/soap_binding_ext_credential.c +++ b/lasso/xml/soap_binding_ext_credential.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_ext_credential.h> +#include "soap_binding_ext_credential.h" /** * SECTION:soap_binding_ext_credential diff --git a/lasso/xml/soap_binding_ext_credential.h b/lasso/xml/soap_binding_ext_credential.h index 36b63a1e..61fbbcf9 100644 --- a/lasso/xml/soap_binding_ext_credential.h +++ b/lasso/xml/soap_binding_ext_credential.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BINDING_EXT_CREDENTIAL \ (lasso_soap_binding_ext_credential_get_type()) diff --git a/lasso/xml/soap_binding_ext_credentials_context.c b/lasso/xml/soap_binding_ext_credentials_context.c index 8c09772d..3be492d9 100644 --- a/lasso/xml/soap_binding_ext_credentials_context.c +++ b/lasso/xml/soap_binding_ext_credentials_context.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_ext_credentials_context.h> +#include "soap_binding_ext_credentials_context.h" /** * SECTION:soap_binding_ext_credentials_context diff --git a/lasso/xml/soap_binding_ext_credentials_context.h b/lasso/xml/soap_binding_ext_credentials_context.h index b02ec5ce..bc6216d7 100644 --- a/lasso/xml/soap_binding_ext_credentials_context.h +++ b/lasso/xml/soap_binding_ext_credentials_context.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/lib_request_authn_context.h> +#include "xml.h" +#include "lib_request_authn_context.h" #define LASSO_TYPE_SOAP_BINDING_EXT_CREDENTIALS_CONTEXT \ (lasso_soap_binding_ext_credentials_context_get_type()) diff --git a/lasso/xml/soap_binding_ext_service_instance_update.c b/lasso/xml/soap_binding_ext_service_instance_update.c index 21f0d778..05121b5a 100644 --- a/lasso/xml/soap_binding_ext_service_instance_update.c +++ b/lasso/xml/soap_binding_ext_service_instance_update.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_ext_service_instance_update.h> +#include "soap_binding_ext_service_instance_update.h" /** * SECTION:soap_binding_ext_service_instance_update diff --git a/lasso/xml/soap_binding_ext_service_instance_update.h b/lasso/xml/soap_binding_ext_service_instance_update.h index 0fde03dd..8f03daad 100644 --- a/lasso/xml/soap_binding_ext_service_instance_update.h +++ b/lasso/xml/soap_binding_ext_service_instance_update.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/soap_binding_ext_credential.h> +#include "xml.h" +#include "soap_binding_ext_credential.h" #define LASSO_TYPE_SOAP_BINDING_EXT_SERVICE_INSTANCE_UPDATE \ (lasso_soap_binding_ext_service_instance_update_get_type()) diff --git a/lasso/xml/soap_binding_ext_timeout.c b/lasso/xml/soap_binding_ext_timeout.c index 4a26760b..b244aab1 100644 --- a/lasso/xml/soap_binding_ext_timeout.c +++ b/lasso/xml/soap_binding_ext_timeout.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_ext_timeout.h> +#include "soap_binding_ext_timeout.h" /** * SECTION:soap_binding_ext_timeout diff --git a/lasso/xml/soap_binding_ext_timeout.h b/lasso/xml/soap_binding_ext_timeout.h index 830b9f49..f7749672 100644 --- a/lasso/xml/soap_binding_ext_timeout.h +++ b/lasso/xml/soap_binding_ext_timeout.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BINDING_EXT_TIMEOUT (lasso_soap_binding_ext_timeout_get_type()) #define LASSO_SOAP_BINDING_EXT_TIMEOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_binding_processing_context.c b/lasso/xml/soap_binding_processing_context.c index 472cfdba..b26b3a9c 100644 --- a/lasso/xml/soap_binding_processing_context.c +++ b/lasso/xml/soap_binding_processing_context.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_processing_context.h> +#include "soap_binding_processing_context.h" /** * SECTION:soap_binding_processing_context diff --git a/lasso/xml/soap_binding_processing_context.h b/lasso/xml/soap_binding_processing_context.h index afd775db..9a2c70e0 100644 --- a/lasso/xml/soap_binding_processing_context.h +++ b/lasso/xml/soap_binding_processing_context.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BINDING_PROCESSING_CONTEXT \ (lasso_soap_binding_processing_context_get_type()) diff --git a/lasso/xml/soap_binding_provider.c b/lasso/xml/soap_binding_provider.c index e8e398fb..009c9a7a 100644 --- a/lasso/xml/soap_binding_provider.c +++ b/lasso/xml/soap_binding_provider.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_provider.h> +#include "soap_binding_provider.h" /** * SECTION:soap_binding_provider diff --git a/lasso/xml/soap_binding_provider.h b/lasso/xml/soap_binding_provider.h index e4b74e07..f1342f1d 100644 --- a/lasso/xml/soap_binding_provider.h +++ b/lasso/xml/soap_binding_provider.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BINDING_PROVIDER (lasso_soap_binding_provider_get_type()) #define LASSO_SOAP_BINDING_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_binding_usage_directive.c b/lasso/xml/soap_binding_usage_directive.c index 2bbbe8f6..21f7e03e 100644 --- a/lasso/xml/soap_binding_usage_directive.c +++ b/lasso/xml/soap_binding_usage_directive.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_binding_usage_directive.h> +#include "soap_binding_usage_directive.h" /** * SECTION:soap_binding_usage_directive diff --git a/lasso/xml/soap_binding_usage_directive.h b/lasso/xml/soap_binding_usage_directive.h index 6739a17a..92d4ae94 100644 --- a/lasso/xml/soap_binding_usage_directive.h +++ b/lasso/xml/soap_binding_usage_directive.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BINDING_USAGE_DIRECTIVE (lasso_soap_binding_usage_directive_get_type()) #define LASSO_SOAP_BINDING_USAGE_DIRECTIVE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_body.c b/lasso/xml/soap_body.c index 9f940952..d5542c3a 100644 --- a/lasso/xml/soap_body.c +++ b/lasso/xml/soap_body.c @@ -23,8 +23,8 @@ */ #include "private.h" -#include <lasso/xml/soap_body.h> -#include <lasso/xml/private.h> +#include "soap_body.h" +#include "private.h" /** * SECTION:soap_body diff --git a/lasso/xml/soap_body.h b/lasso/xml/soap_body.h index 25e721a2..e8591193 100644 --- a/lasso/xml/soap_body.h +++ b/lasso/xml/soap_body.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_BODY (lasso_soap_body_get_type()) #define LASSO_SOAP_BODY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_detail.c b/lasso/xml/soap_detail.c index 9d8bc3da..0ef40da8 100644 --- a/lasso/xml/soap_detail.c +++ b/lasso/xml/soap_detail.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_detail.h> +#include "soap_detail.h" /* * diff --git a/lasso/xml/soap_detail.h b/lasso/xml/soap_detail.h index 6870e647..6c477f09 100644 --- a/lasso/xml/soap_detail.h +++ b/lasso/xml/soap_detail.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_DETAIL (lasso_soap_detail_get_type()) #define LASSO_SOAP_DETAIL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_envelope.c b/lasso/xml/soap_envelope.c index 845477b9..ae0e80f8 100644 --- a/lasso/xml/soap_envelope.c +++ b/lasso/xml/soap_envelope.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_envelope.h> +#include "soap_envelope.h" #include "../utils.h" /** diff --git a/lasso/xml/soap_envelope.h b/lasso/xml/soap_envelope.h index 2ac77dae..1f6f2e29 100644 --- a/lasso/xml/soap_envelope.h +++ b/lasso/xml/soap_envelope.h @@ -29,9 +29,9 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/soap_body.h> -#include <lasso/xml/soap_header.h> +#include "xml.h" +#include "soap_body.h" +#include "soap_header.h" #define LASSO_TYPE_SOAP_ENVELOPE (lasso_soap_envelope_get_type()) #define LASSO_SOAP_ENVELOPE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_fault.c b/lasso/xml/soap_fault.c index c533fc52..e913a67e 100644 --- a/lasso/xml/soap_fault.c +++ b/lasso/xml/soap_fault.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_fault.h> +#include "soap_fault.h" /* * diff --git a/lasso/xml/soap_fault.h b/lasso/xml/soap_fault.h index 14f643ac..92f57a5d 100644 --- a/lasso/xml/soap_fault.h +++ b/lasso/xml/soap_fault.h @@ -29,8 +29,8 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> -#include <lasso/xml/soap_detail.h> +#include "xml.h" +#include "soap_detail.h" #define LASSO_TYPE_SOAP_FAULT (lasso_soap_fault_get_type()) #define LASSO_SOAP_FAULT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/soap_header.c b/lasso/xml/soap_header.c index 1b9f53d6..77378f7c 100644 --- a/lasso/xml/soap_header.c +++ b/lasso/xml/soap_header.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/soap_header.h> +#include "soap_header.h" /** * SECTION:soap_header diff --git a/lasso/xml/soap_header.h b/lasso/xml/soap_header.h index 69d6bfa9..efa5e127 100644 --- a/lasso/xml/soap_header.h +++ b/lasso/xml/soap_header.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_SOAP_HEADER (lasso_soap_header_get_type()) #define LASSO_SOAP_HEADER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index d31e0a7b..69ee1362 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -49,9 +49,9 @@ #include <zlib.h> #include <glib.h> -#include <lasso/xml/xml.h> -#include <lasso/xml/xml_enc.h> -#include <lasso/xml/saml-2.0/saml2_assertion.h> +#include "xml.h" +#include "xml_enc.h" +#include "saml-2.0/saml2_assertion.h" #include <unistd.h> #include "../debug.h" #include "../utils.h" diff --git a/lasso/xml/utility_status.c b/lasso/xml/utility_status.c index e604d34c..0e201a66 100644 --- a/lasso/xml/utility_status.c +++ b/lasso/xml/utility_status.c @@ -23,7 +23,7 @@ */ #include "private.h" -#include <lasso/xml/utility_status.h> +#include "utility_status.h" /** * SECTION:utility_status diff --git a/lasso/xml/utility_status.h b/lasso/xml/utility_status.h index 6e3d522a..a58e2ec3 100644 --- a/lasso/xml/utility_status.h +++ b/lasso/xml/utility_status.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_UTILITY_STATUS (lasso_utility_status_get_type()) #define LASSO_UTILITY_STATUS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/ws/wsa_attributed_any.h b/lasso/xml/ws/wsa_attributed_any.h index 4c798d4e..63c5f69b 100644 --- a/lasso/xml/ws/wsa_attributed_any.h +++ b/lasso/xml/ws/wsa_attributed_any.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSA_ATTRIBUTED_ANY (lasso_wsa_attributed_any_get_type()) #define LASSO_WSA_ATTRIBUTED_ANY(obj) \ diff --git a/lasso/xml/ws/wsa_attributed_qname.h b/lasso/xml/ws/wsa_attributed_qname.h index 5779b575..7ef8dc5e 100644 --- a/lasso/xml/ws/wsa_attributed_qname.h +++ b/lasso/xml/ws/wsa_attributed_qname.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSA_ATTRIBUTED_QNAME (lasso_wsa_attributed_qname_get_type()) #define LASSO_WSA_ATTRIBUTED_QNAME(obj) \ diff --git a/lasso/xml/ws/wsa_attributed_unsigned_long.h b/lasso/xml/ws/wsa_attributed_unsigned_long.h index 011d6757..dcf35b3b 100644 --- a/lasso/xml/ws/wsa_attributed_unsigned_long.h +++ b/lasso/xml/ws/wsa_attributed_unsigned_long.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG \ (lasso_wsa_attributed_unsigned_long_get_type()) diff --git a/lasso/xml/ws/wsa_attributed_uri.h b/lasso/xml/ws/wsa_attributed_uri.h index a77e6c05..1dfd9706 100644 --- a/lasso/xml/ws/wsa_attributed_uri.h +++ b/lasso/xml/ws/wsa_attributed_uri.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSA_ATTRIBUTED_URI (lasso_wsa_attributed_uri_get_type()) #define LASSO_WSA_ATTRIBUTED_URI(obj) \ diff --git a/lasso/xml/ws/wsa_endpoint_reference.h b/lasso/xml/ws/wsa_endpoint_reference.h index c62fd383..e7339c61 100644 --- a/lasso/xml/ws/wsa_endpoint_reference.h +++ b/lasso/xml/ws/wsa_endpoint_reference.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "wsa_attributed_uri.h" #include "wsa_metadata.h" #include "wsa_reference_parameters.h" diff --git a/lasso/xml/ws/wsa_metadata.h b/lasso/xml/ws/wsa_metadata.h index f253b75a..d2237d66 100644 --- a/lasso/xml/ws/wsa_metadata.h +++ b/lasso/xml/ws/wsa_metadata.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSA_METADATA (lasso_wsa_metadata_get_type()) #define LASSO_WSA_METADATA(obj) \ diff --git a/lasso/xml/ws/wsa_problem_action.h b/lasso/xml/ws/wsa_problem_action.h index 5a17357d..3b4f6ecd 100644 --- a/lasso/xml/ws/wsa_problem_action.h +++ b/lasso/xml/ws/wsa_problem_action.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #include "wsa_attributed_uri.h" #define LASSO_TYPE_WSA_PROBLEM_ACTION (lasso_wsa_problem_action_get_type()) diff --git a/lasso/xml/ws/wsa_reference_parameters.h b/lasso/xml/ws/wsa_reference_parameters.h index 7cd3f9ca..9e6778ea 100644 --- a/lasso/xml/ws/wsa_reference_parameters.h +++ b/lasso/xml/ws/wsa_reference_parameters.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSA_REFERENCE_PARAMETERS (lasso_wsa_reference_parameters_get_type()) #define LASSO_WSA_REFERENCE_PARAMETERS(obj) \ diff --git a/lasso/xml/ws/wsa_relates_to.h b/lasso/xml/ws/wsa_relates_to.h index 67562024..cbbfde5e 100644 --- a/lasso/xml/ws/wsa_relates_to.h +++ b/lasso/xml/ws/wsa_relates_to.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSA_RELATES_TO (lasso_wsa_relates_to_get_type()) #define LASSO_WSA_RELATES_TO(obj) \ diff --git a/lasso/xml/ws/wsse_embedded.h b/lasso/xml/ws/wsse_embedded.h index d02ab2dd..5e6648aa 100644 --- a/lasso/xml/ws/wsse_embedded.h +++ b/lasso/xml/ws/wsse_embedded.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSSE_EMBEDDED (lasso_wsse_embedded_get_type()) #define LASSO_WSSE_EMBEDDED(obj) \ diff --git a/lasso/xml/ws/wsse_reference.h b/lasso/xml/ws/wsse_reference.h index 270eb88c..aab9d858 100644 --- a/lasso/xml/ws/wsse_reference.h +++ b/lasso/xml/ws/wsse_reference.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSSE_REFERENCE (lasso_wsse_reference_get_type()) #define LASSO_WSSE_REFERENCE(obj) \ diff --git a/lasso/xml/ws/wsse_security_header.h b/lasso/xml/ws/wsse_security_header.h index e9f8c355..61b55983 100644 --- a/lasso/xml/ws/wsse_security_header.h +++ b/lasso/xml/ws/wsse_security_header.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSSE_SECURITY_HEADER (lasso_wsse_security_header_get_type()) #define LASSO_WSSE_SECURITY_HEADER(obj) \ diff --git a/lasso/xml/ws/wsse_security_token_reference.h b/lasso/xml/ws/wsse_security_token_reference.h index 0f23c5f3..f9db9a33 100644 --- a/lasso/xml/ws/wsse_security_token_reference.h +++ b/lasso/xml/ws/wsse_security_token_reference.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE \ (lasso_wsse_security_token_reference_get_type()) diff --git a/lasso/xml/ws/wsse_transformation_parameters.h b/lasso/xml/ws/wsse_transformation_parameters.h index 1700a4fe..5bdbcce4 100644 --- a/lasso/xml/ws/wsse_transformation_parameters.h +++ b/lasso/xml/ws/wsse_transformation_parameters.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS \ (lasso_wsse_transformation_parameters_get_type()) diff --git a/lasso/xml/ws/wsse_username_token.h b/lasso/xml/ws/wsse_username_token.h index 891ab27a..960f9c22 100644 --- a/lasso/xml/ws/wsse_username_token.h +++ b/lasso/xml/ws/wsse_username_token.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSSE_USERNAME_TOKEN (lasso_wsse_username_token_get_type()) #define LASSO_WSSE_USERNAME_TOKEN(obj) \ diff --git a/lasso/xml/ws/wsu_timestamp.h b/lasso/xml/ws/wsu_timestamp.h index e26f56d8..91c3af93 100644 --- a/lasso/xml/ws/wsu_timestamp.h +++ b/lasso/xml/ws/wsu_timestamp.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "../xml.h" #define LASSO_TYPE_WSU_TIMESTAMP (lasso_wsu_timestamp_get_type()) #define LASSO_WSU_TIMESTAMP(obj) \ diff --git a/lasso/xml/wsse_security.c b/lasso/xml/wsse_security.c index 9d5996de..bb2d9ab5 100644 --- a/lasso/xml/wsse_security.c +++ b/lasso/xml/wsse_security.c @@ -22,7 +22,7 @@ */ #include "private.h" -#include <lasso/xml/wsse_security.h> +#include "wsse_security.h" /* * diff --git a/lasso/xml/wsse_security.h b/lasso/xml/wsse_security.h index 94f8fd7b..89f12860 100644 --- a/lasso/xml/wsse_security.h +++ b/lasso/xml/wsse_security.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/xml/xml.h> +#include "xml.h" #define LASSO_TYPE_WSSE_SECURITY (lasso_wsse_security_get_type()) #define LASSO_WSSE_SECURITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c index 96f9de6b..e389eb9b 100644 --- a/lasso/xml/xml.c +++ b/lasso/xml/xml.c @@ -42,9 +42,9 @@ #include <xmlsec/crypto.h> #include <xmlsec/xmlenc.h> -#include <lasso/xml/xml.h> -#include <lasso/xml/xml_enc.h> -#include <lasso/xml/saml_name_identifier.h> +#include "xml.h" +#include "xml_enc.h" +#include "saml_name_identifier.h" #include "../utils.h" #include "../registry.h" #include "../debug.h" diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h index 255fdec0..886301a0 100644 --- a/lasso/xml/xml.h +++ b/lasso/xml/xml.h @@ -38,9 +38,9 @@ extern "C" { #include <libxml/uri.h> #include <libxml/tree.h> -#include <lasso/export.h> -#include <lasso/errors.h> -#include <lasso/xml/strings.h> +#include "../export.h" +#include "../errors.h" +#include "strings.h" #define LASSO_TYPE_NODE (lasso_node_get_type()) #define LASSO_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_NODE, LassoNode)) diff --git a/lasso/xml/xml_enc.h b/lasso/xml/xml_enc.h index 70f2f629..c00c104d 100644 --- a/lasso/xml/xml_enc.h +++ b/lasso/xml/xml_enc.h @@ -31,7 +31,7 @@ extern "C" { #include <xmlsec/xmlenc.h> -#include <lasso/xml/xml.h> +#include "xml.h" /** * LassoEncryptionSymKeyType: diff --git a/tests/basic_tests.c b/tests/basic_tests.c index 4503d258..fccaa4c2 100644 --- a/tests/basic_tests.c +++ b/tests/basic_tests.c @@ -26,8 +26,8 @@ #include <check.h> -#include <lasso/lasso.h> -#include <lasso/xml/strings.h> +#include "../lasso/lasso.h" +#include "../lasso/xml/strings.h" START_TEST(test01_server_load_dump_empty_string) @@ -76,7 +76,7 @@ START_TEST(test05_identity_load_dump_empty) } END_TEST -#include <lasso/registry.h> +#include "../lasso/registry.h" START_TEST(test06_registry_direct_mapping) { diff --git a/tests/login_tests.c b/tests/login_tests.c index eb7dc869..df2c54bb 100644 --- a/tests/login_tests.c +++ b/tests/login_tests.c @@ -26,7 +26,7 @@ #include <check.h> -#include <lasso/lasso.h> +#include <../lasso/lasso.h> #include <glib.h> #include "utils.h" #include "../lasso/backward_comp.h" diff --git a/tests/login_tests_saml2.c b/tests/login_tests_saml2.c index 6726415e..87a812e3 100644 --- a/tests/login_tests_saml2.c +++ b/tests/login_tests_saml2.c @@ -25,11 +25,11 @@ #include <string.h> #include <check.h> - -#include <lasso/lasso.h> -#include <lasso/xml/saml-2.0/samlp2_authn_request.h> #include <glib.h> -#include "utils.h" + +#include "../lasso/lasso.h" +#include "../lasso/xml/saml-2.0/samlp2_authn_request.h" +#include "../lasso/utils.h" #include "../lasso/backward_comp.h" diff --git a/tests/metadata_tests.c b/tests/metadata_tests.c index 171fdedd..33096965 100644 --- a/tests/metadata_tests.c +++ b/tests/metadata_tests.c @@ -26,8 +26,8 @@ #include <check.h> -#include <lasso/lasso.h> -#include <lasso/id-ff/provider.h> +#include <../lasso/lasso.h> +#include <../lasso/id-ff/provider.h> START_TEST(test01_metadata_load_der_certificate_from_x509_cert) { diff --git a/tests/perfs.c b/tests/perfs.c index f98f9805..79bd580f 100644 --- a/tests/perfs.c +++ b/tests/perfs.c @@ -24,7 +24,7 @@ #include <sys/time.h> #include <time.h> -#include <lasso/lasso.h> +#include <../lasso/lasso.h> char* create_authn_response_msg(char *query); diff --git a/tests/random_tests.c b/tests/random_tests.c index 33841c17..0c6be863 100644 --- a/tests/random_tests.c +++ b/tests/random_tests.c @@ -26,12 +26,12 @@ #include <check.h> -#include <lasso/lasso.h> +#include <../lasso/lasso.h> -#include <lasso/xml/lib_assertion.h> -#include <lasso/xml/lib_authentication_statement.h> -#include <lasso/xml/saml_name_identifier.h> -#include <lasso/xml/samlp_response.h> +#include <../lasso/xml/lib_assertion.h> +#include <../lasso/xml/lib_authentication_statement.h> +#include <../lasso/xml/saml_name_identifier.h> +#include <../lasso/xml/samlp_response.h> #include "../lasso/utils.h" diff --git a/tests/tests.c b/tests/tests.c index ed410d07..448a2136 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -26,7 +26,7 @@ #include <config.h> #include <check.h> -#include <lasso/lasso.h> +#include "../lasso/lasso.h" extern Suite* basic_suite(); extern Suite* login_suite(); |