diff options
Diffstat (limited to 'lasso/id-ff')
-rw-r--r-- | lasso/id-ff/defederation.c | 10 | ||||
-rw-r--r-- | lasso/id-ff/defederation.h | 3 | ||||
-rw-r--r-- | lasso/id-ff/federation.c | 10 | ||||
-rw-r--r-- | lasso/id-ff/federation.h | 3 | ||||
-rw-r--r-- | lasso/id-ff/identity.c | 10 | ||||
-rw-r--r-- | lasso/id-ff/identity.h | 4 | ||||
-rw-r--r-- | lasso/id-ff/login.c | 10 | ||||
-rw-r--r-- | lasso/id-ff/login.h | 3 | ||||
-rw-r--r-- | lasso/id-ff/logout.c | 16 | ||||
-rw-r--r-- | lasso/id-ff/logout.h | 2 | ||||
-rw-r--r-- | lasso/id-ff/profile.c | 10 | ||||
-rw-r--r-- | lasso/id-ff/profile.h | 2 | ||||
-rw-r--r-- | lasso/id-ff/provider.c | 40 | ||||
-rw-r--r-- | lasso/id-ff/provider.h | 3 | ||||
-rw-r--r-- | lasso/id-ff/server.c | 10 | ||||
-rw-r--r-- | lasso/id-ff/server.h | 2 | ||||
-rw-r--r-- | lasso/id-ff/session.c | 20 | ||||
-rw-r--r-- | lasso/id-ff/session.h | 2 |
18 files changed, 78 insertions, 82 deletions
diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c index 44236ab3..55ad5d77 100644 --- a/lasso/id-ff/defederation.c +++ b/lasso/id-ff/defederation.c @@ -440,10 +440,10 @@ static void dispose(GObject *object) { LassoDefederation *defederation = LASSO_DEFEDERATION(object); - if (defederation->private->dispose_has_run == TRUE) { + if (defederation->private_data->dispose_has_run == TRUE) { return; } - defederation->private->dispose_has_run = TRUE; + defederation->private_data->dispose_has_run = TRUE; debug("Defederation object 0x%x disposed ...", defederation); G_OBJECT_CLASS(parent_class)->dispose(object); @@ -454,7 +454,7 @@ finalize(GObject *object) { LassoDefederation *defederation = LASSO_DEFEDERATION(object); debug("Defederation object 0x%x finalized ...", defederation); - g_free (defederation->private); + g_free(defederation->private_data); G_OBJECT_CLASS(parent_class)->finalize(object); } @@ -465,8 +465,8 @@ finalize(GObject *object) static void instance_init(LassoDefederation *defederation) { - defederation->private = g_new (LassoDefederationPrivate, 1); - defederation->private->dispose_has_run = FALSE; + defederation->private_data = g_new(LassoDefederationPrivate, 1); + defederation->private_data->dispose_has_run = FALSE; } static void diff --git a/lasso/id-ff/defederation.h b/lasso/id-ff/defederation.h index ab9d2e89..6abdf4bb 100644 --- a/lasso/id-ff/defederation.h +++ b/lasso/id-ff/defederation.h @@ -46,8 +46,7 @@ typedef struct _LassoDefederationPrivate LassoDefederationPrivate; struct _LassoDefederation { LassoProfile parent; - /*< private >*/ - LassoDefederationPrivate *private; + LassoDefederationPrivate *private_data; }; struct _LassoDefederationClass { diff --git a/lasso/id-ff/federation.c b/lasso/id-ff/federation.c index 74eedeeb..9f2abca0 100644 --- a/lasso/id-ff/federation.c +++ b/lasso/id-ff/federation.c @@ -200,10 +200,10 @@ static void dispose(GObject *object) { LassoFederation *federation = LASSO_FEDERATION(object); - if (federation->private->dispose_has_run) { + if (federation->private_data->dispose_has_run) { return; } - federation->private->dispose_has_run = TRUE; + federation->private_data->dispose_has_run = TRUE; debug("Federation object 0x%x disposed ...", federation); @@ -221,7 +221,7 @@ finalize(GObject *object) debug("Federation object 0x%x finalized ...", federation); g_free(federation->remote_providerID); - g_free(federation->private); + g_free(federation->private_data); G_OBJECT_CLASS(parent_class)->finalize(object); } @@ -233,8 +233,8 @@ finalize(GObject *object) static void instance_init(LassoFederation *federation) { - federation->private = g_new (LassoFederationPrivate, 1); - federation->private->dispose_has_run = FALSE; + federation->private_data = g_new(LassoFederationPrivate, 1); + federation->private_data->dispose_has_run = FALSE; federation->remote_providerID = NULL; federation->local_nameIdentifier = NULL; diff --git a/lasso/id-ff/federation.h b/lasso/id-ff/federation.h index 816192b4..dad9295a 100644 --- a/lasso/id-ff/federation.h +++ b/lasso/id-ff/federation.h @@ -52,8 +52,7 @@ struct _LassoFederation { LassoSamlNameIdentifier *local_nameIdentifier; LassoSamlNameIdentifier *remote_nameIdentifier; - /*< private >*/ - LassoFederationPrivate *private; + LassoFederationPrivate *private_data; }; struct _LassoFederationClass { diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c index 989f5db4..b0c7abe2 100644 --- a/lasso/id-ff/identity.c +++ b/lasso/id-ff/identity.c @@ -133,10 +133,10 @@ dispose(GObject *object) { LassoIdentity *identity = LASSO_IDENTITY(object); - if (identity->private->dispose_has_run == TRUE) { + if (identity->private_data->dispose_has_run == TRUE) { return; } - identity->private->dispose_has_run = TRUE; + identity->private_data->dispose_has_run = TRUE; debug("Identity object 0x%x disposed ...", identity); @@ -152,7 +152,7 @@ finalize(GObject *object) LassoIdentity *identity = LASSO_IDENTITY(object); debug("Identity object 0x%x finalized ...", identity); - identity->private = NULL; + identity->private_data = NULL; G_OBJECT_CLASS(parent_class)->finalize(object); } @@ -163,8 +163,8 @@ finalize(GObject *object) static void instance_init(LassoIdentity *identity) { - identity->private = g_new (LassoIdentityPrivate, 1); - identity->private->dispose_has_run = FALSE; + identity->private_data = g_new(LassoIdentityPrivate, 1); + identity->private_data->dispose_has_run = FALSE; identity->federations = g_hash_table_new_full(g_str_hash, g_str_equal, (GDestroyNotify)g_free, diff --git a/lasso/id-ff/identity.h b/lasso/id-ff/identity.h index 0309b586..fe2f594a 100644 --- a/lasso/id-ff/identity.h +++ b/lasso/id-ff/identity.h @@ -47,12 +47,10 @@ typedef struct _LassoIdentityPrivate LassoIdentityPrivate; struct _LassoIdentity { LassoNode parent; - /*< public >*/ GHashTable *federations; /* hash for federations with remote ProviderID as key */ gboolean is_dirty; - /*< private >*/ - LassoIdentityPrivate *private; + LassoIdentityPrivate *private_data; }; struct _LassoIdentityClass { diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c index 2857ed68..ba88736f 100644 --- a/lasso/id-ff/login.c +++ b/lasso/id-ff/login.c @@ -1311,10 +1311,10 @@ dispose(GObject *object) { LassoLogin *login = LASSO_LOGIN(object); - if (login->private->dispose_has_run == TRUE) { + if (login->private_data->dispose_has_run == TRUE) { return; } - login->private->dispose_has_run = TRUE; + login->private_data->dispose_has_run = TRUE; debug("Login object 0x%x disposed ...", login); @@ -1330,7 +1330,7 @@ finalize(GObject *object) debug("Login object 0x%x finalized ...", login); g_free(login->assertionArtifact); - g_free(login->private); + g_free(login->private_data); G_OBJECT_CLASS(parent_class)->finalize(object); } @@ -1341,8 +1341,8 @@ finalize(GObject *object) static void instance_init(LassoLogin *login) { - login->private = g_new (LassoLoginPrivate, 1); - login->private->dispose_has_run = FALSE; + login->private_data = g_new(LassoLoginPrivate, 1); + login->private_data->dispose_has_run = FALSE; login->protocolProfile = 0; login->assertionArtifact = NULL; diff --git a/lasso/id-ff/login.h b/lasso/id-ff/login.h index 0a98dc77..2d7ea608 100644 --- a/lasso/id-ff/login.h +++ b/lasso/id-ff/login.h @@ -57,14 +57,13 @@ typedef enum { struct _LassoLogin { LassoProfile parent; - /*< public >*/ lassoLoginProtocolProfile protocolProfile; gchar *assertionArtifact; /*< private >*/ gchar *nameIDPolicy; lassoHttpMethod http_method; - LassoLoginPrivate *private; + LassoLoginPrivate *private_data; }; struct _LassoLoginClass { diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c index 24385dfd..3fc3899d 100644 --- a/lasso/id-ff/logout.c +++ b/lasso/id-ff/logout.c @@ -733,11 +733,11 @@ lasso_logout_validate_request(LassoLogout *logout) if (remote_provider->role == LASSO_PROVIDER_ROLE_SP && profile->http_request_method == LASSO_HTTP_METHOD_SOAP) { - logout->private->all_soap = TRUE; + logout->private_data->all_soap = TRUE; g_hash_table_foreach(profile->server->providers, (GHFunc)check_soap_support, profile); - if (logout->private->all_soap == FALSE) { + if (logout->private_data->all_soap == FALSE) { lasso_profile_set_response_status(profile, LASSO_LIB_STATUS_CODE_UNSUPPORTED_PROFILE); return LASSO_LOGOUT_ERROR_UNSUPPORTED_PROFILE; @@ -796,7 +796,7 @@ static void check_soap_support(gchar *key, LassoProvider *provider, LassoProfile return; /* provider support profile */ - LASSO_LOGOUT(profile)->private->all_soap = FALSE; + LASSO_LOGOUT(profile)->private_data->all_soap = FALSE; } @@ -870,10 +870,10 @@ static void dispose(GObject *object) { LassoLogout *logout = LASSO_LOGOUT(object); - if (logout->private->dispose_has_run) { + if (logout->private_data->dispose_has_run) { return; } - logout->private->dispose_has_run = TRUE; + logout->private_data->dispose_has_run = TRUE; debug("Logout object 0x%x disposed ...", logout); @@ -892,7 +892,7 @@ finalize(GObject *object) LassoLogout *logout = LASSO_LOGOUT(object); debug("Logout object 0x%x finalized ...", logout); g_free(logout->initial_remote_providerID); - g_free(logout->private); + g_free(logout->private_data); G_OBJECT_CLASS(parent_class)->finalize(object); } @@ -903,8 +903,8 @@ finalize(GObject *object) static void instance_init(LassoLogout *logout) { - logout->private = g_new(LassoLogoutPrivate, 1); - logout->private->dispose_has_run = FALSE; + logout->private_data = g_new(LassoLogoutPrivate, 1); + logout->private_data->dispose_has_run = FALSE; logout->initial_request = NULL; logout->initial_response = NULL; diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h index 58b59382..e4c0773c 100644 --- a/lasso/id-ff/logout.h +++ b/lasso/id-ff/logout.h @@ -55,7 +55,7 @@ struct _LassoLogout { gint providerID_index; lassoHttpMethod initial_http_request_method; - LassoLogoutPrivate *private; + LassoLogoutPrivate *private_data; }; struct _LassoLogoutClass { diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c index 4cb022ea..5570fed9 100644 --- a/lasso/id-ff/profile.c +++ b/lasso/id-ff/profile.c @@ -341,10 +341,10 @@ dispose(GObject *object) { LassoProfile *profile = LASSO_PROFILE(object); - if (profile->private->dispose_has_run) { + if (profile->private_data->dispose_has_run) { return; } - profile->private->dispose_has_run = TRUE; + profile->private_data->dispose_has_run = TRUE; debug("Profile object 0x%x disposed ...", profile); @@ -373,7 +373,7 @@ finalize(GObject *object) g_free(profile->msg_body); g_free(profile->msg_relayState); - g_free (profile->private); + g_free(profile->private_data); G_OBJECT_CLASS(parent_class)->finalize(object); } @@ -385,8 +385,8 @@ finalize(GObject *object) static void instance_init(LassoProfile *profile) { - profile->private = g_new (LassoProfilePrivate, 1); - profile->private->dispose_has_run = FALSE; + profile->private_data = g_new(LassoProfilePrivate, 1); + profile->private_data->dispose_has_run = FALSE; profile->server = NULL; profile->request = NULL; diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h index ed3004b5..590cf5ef 100644 --- a/lasso/id-ff/profile.h +++ b/lasso/id-ff/profile.h @@ -90,7 +90,7 @@ struct _LassoProfile { lassoHttpMethod http_request_method; gint signature_status; - LassoProfilePrivate *private; + LassoProfilePrivate *private_data; }; struct _LassoProfileClass { diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c index ec3361e1..eeb142e1 100644 --- a/lasso/id-ff/provider.c +++ b/lasso/id-ff/provider.c @@ -67,9 +67,9 @@ lasso_provider_get_metadata_one(LassoProvider *provider, const char *name) GList *l; GHashTable *descriptor; - descriptor = provider->private->SPDescriptor; /* default to SP */ + descriptor = provider->private_data->SPDescriptor; /* default to SP */ if (provider->role == LASSO_PROVIDER_ROLE_IDP) - descriptor = provider->private->IDPDescriptor; + descriptor = provider->private_data->IDPDescriptor; l = g_hash_table_lookup(descriptor, name); if (l) @@ -83,9 +83,9 @@ lasso_provider_get_metadata_list(LassoProvider *provider, const char *name) { GHashTable *descriptor; - descriptor = provider->private->SPDescriptor; /* default to SP */ + descriptor = provider->private_data->SPDescriptor; /* default to SP */ if (provider->role == LASSO_PROVIDER_ROLE_IDP) - descriptor = provider->private->IDPDescriptor; + descriptor = provider->private_data->IDPDescriptor; return g_hash_table_lookup(descriptor, name); } @@ -244,15 +244,15 @@ get_xmlNode(LassoNode *node) if (provider->ca_cert_chain) xmlNewTextChild(xmlnode, NULL, "CaCertChainFilePath", provider->ca_cert_chain); - if (g_hash_table_size(provider->private->SPDescriptor)) { + if (g_hash_table_size(provider->private_data->SPDescriptor)) { t = xmlNewTextChild(xmlnode, NULL, "SPDescriptor", NULL); - g_hash_table_foreach(provider->private->SPDescriptor, + g_hash_table_foreach(provider->private_data->SPDescriptor, (GHFunc)add_descriptor_childnodes, t); } - if (g_hash_table_size(provider->private->IDPDescriptor)) { + if (g_hash_table_size(provider->private_data->IDPDescriptor)) { t = xmlNewTextChild(xmlnode, NULL, "IDPDescriptor", NULL); - g_hash_table_foreach(provider->private->IDPDescriptor, + g_hash_table_foreach(provider->private_data->IDPDescriptor, (GHFunc)add_descriptor_childnodes, t); } @@ -292,9 +292,9 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode) if (strcmp(t->name, "CaCertChainFilePath") == 0) provider->ca_cert_chain = xmlNodeGetContent(t); if (strcmp(t->name, "SPDescriptor") == 0) - load_descriptor(t, provider->private->SPDescriptor); + load_descriptor(t, provider->private_data->SPDescriptor); if (strcmp(t->name, "IDPDescriptor") == 0) - load_descriptor(t, provider->private->IDPDescriptor); + load_descriptor(t, provider->private_data->IDPDescriptor); t = t->next; } return 0; @@ -309,10 +309,10 @@ dispose(GObject *object) { LassoProvider *provider = LASSO_PROVIDER(object); - if (provider->private->dispose_has_run) { + if (provider->private_data->dispose_has_run) { return; } - provider->private->dispose_has_run = TRUE; + provider->private_data->dispose_has_run = TRUE; debug("Provider object 0x%x disposed ...", provider); @@ -330,7 +330,7 @@ finalize(GObject *object) g_free(provider->public_key); g_free(provider->ca_cert_chain); - g_free(provider->private); + g_free(provider->private_data); G_OBJECT_CLASS(parent_class)->finalize(G_OBJECT(provider)); } @@ -342,15 +342,15 @@ finalize(GObject *object) static void instance_init(LassoProvider *provider) { - provider->private = g_new (LassoProviderPrivate, 1); - provider->private->dispose_has_run = FALSE; + provider->private_data = g_new(LassoProviderPrivate, 1); + provider->private_data->dispose_has_run = FALSE; provider->role = LASSO_PROVIDER_ROLE_NONE; provider->public_key = NULL; provider->ca_cert_chain = NULL; provider->ProviderID = NULL; - provider->private->IDPDescriptor = g_hash_table_new_full( + provider->private_data->IDPDescriptor = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, NULL); - provider->private->SPDescriptor = g_hash_table_new_full( + provider->private_data->SPDescriptor = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, NULL); } @@ -413,11 +413,13 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata) xpathObj = xmlXPathEvalExpression("md:EntityDescriptor/md:IDPDescriptor", xpathCtx); if (xpathObj && xpathObj->nodesetval->nodeNr == 1) - load_descriptor(xpathObj->nodesetval->nodeTab[0], provider->private->IDPDescriptor); + load_descriptor(xpathObj->nodesetval->nodeTab[0], + provider->private_data->IDPDescriptor); xmlXPathFreeObject(xpathObj); xpathObj = xmlXPathEvalExpression("md:EntityDescriptor/md:SPDescriptor", xpathCtx); if (xpathObj && xpathObj->nodesetval->nodeNr == 1) - load_descriptor(xpathObj->nodesetval->nodeTab[0], provider->private->SPDescriptor); + load_descriptor(xpathObj->nodesetval->nodeTab[0], + provider->private_data->SPDescriptor); xmlXPathFreeObject(xpathObj); xmlFreeDoc(doc); diff --git a/lasso/id-ff/provider.h b/lasso/id-ff/provider.h index 8bed14ff..500bbdad 100644 --- a/lasso/id-ff/provider.h +++ b/lasso/id-ff/provider.h @@ -76,8 +76,7 @@ struct _LassoProvider { gchar *public_key; gchar *ca_cert_chain; - /*< private >*/ - LassoProviderPrivate *private; + LassoProviderPrivate *private_data; }; struct _LassoProviderClass { diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c index 30c49957..bf9ceb2e 100644 --- a/lasso/id-ff/server.c +++ b/lasso/id-ff/server.c @@ -239,10 +239,10 @@ dispose(GObject *object) { LassoServer *server = LASSO_SERVER(object); - if (server->private->dispose_has_run == TRUE) { + if (server->private_data->dispose_has_run == TRUE) { return; } - server->private->dispose_has_run = TRUE; + server->private_data->dispose_has_run = TRUE; debug("Server object 0x%x disposed ...", server); @@ -263,7 +263,7 @@ finalize(GObject *object) g_free(server->secret_key); g_free(server->certificate); - g_free(server->private); + g_free(server->private_data); G_OBJECT_CLASS(parent_class)->finalize(G_OBJECT(server)); } @@ -275,8 +275,8 @@ finalize(GObject *object) static void instance_init(LassoServer *server) { - server->private = g_new(LassoServerPrivate, 1); - server->private->dispose_has_run = FALSE; + server->private_data = g_new(LassoServerPrivate, 1); + server->private_data->dispose_has_run = FALSE; server->providers = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h index 868a3241..a546ffcc 100644 --- a/lasso/id-ff/server.h +++ b/lasso/id-ff/server.h @@ -54,7 +54,7 @@ struct _LassoServer { lassoSignatureMethod signature_method; /*< private >*/ - LassoServerPrivate *private; + LassoServerPrivate *private_data; }; struct _LassoServerClass { diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c index 02b87198..58c1a967 100644 --- a/lasso/id-ff/session.c +++ b/lasso/id-ff/session.c @@ -80,7 +80,7 @@ lasso_session_get_first_providerID(LassoSession *session) static void add_providerID(gchar *key, LassoLibAssertion *assertion, LassoSession *session) { - session->private->providerIDs = g_list_append(session->private->providerIDs, key); + session->private_data->providerIDs = g_list_append(session->private_data->providerIDs, key); } gchar* @@ -88,7 +88,7 @@ lasso_session_get_provider_index(LassoSession *session, gint index) { GList *element; - if (session->private->providerIDs == NULL) { + if (session->private_data->providerIDs == NULL) { g_hash_table_foreach(session->assertions, (GHFunc)add_providerID, session); /* XXX? create list */ } @@ -96,7 +96,7 @@ lasso_session_get_provider_index(LassoSession *session, gint index) if (g_hash_table_size(session->assertions) == 0) return NULL; - element = g_list_nth(session->private->providerIDs, index); + element = g_list_nth(session->private_data->providerIDs, index); if (element == NULL) return NULL; @@ -188,10 +188,10 @@ dispose(GObject *object) { LassoSession *session = LASSO_SESSION(object); - if (session->private->dispose_has_run == TRUE) { + if (session->private_data->dispose_has_run == TRUE) { return; } - session->private->dispose_has_run = TRUE; + session->private_data->dispose_has_run = TRUE; debug("Session object 0x%x disposed ...", session); @@ -210,8 +210,8 @@ finalize(GObject *object) debug("Session object 0x%x finalized ...", session); - g_free(session->private); - session->private = NULL; + g_free(session->private_data); + session->private_data = NULL; G_OBJECT_CLASS(parent_class)->finalize(object); } @@ -223,9 +223,9 @@ finalize(GObject *object) static void instance_init(LassoSession *session) { - session->private = g_new (LassoSessionPrivate, 1); - session->private->dispose_has_run = FALSE; - session->private->providerIDs = NULL; + session->private_data = g_new (LassoSessionPrivate, 1); + session->private_data->dispose_has_run = FALSE; + session->private_data->providerIDs = NULL; session->assertions = g_hash_table_new_full(g_str_hash, g_str_equal, (GDestroyNotify)g_free, diff --git a/lasso/id-ff/session.h b/lasso/id-ff/session.h index 054d5711..63263b37 100644 --- a/lasso/id-ff/session.h +++ b/lasso/id-ff/session.h @@ -51,7 +51,7 @@ struct _LassoSession { gboolean is_dirty; /*< private >*/ - LassoSessionPrivate *private; + LassoSessionPrivate *private_data; }; struct _LassoSessionClass { |