diff options
| author | Damien Laniel <dlaniel@entrouvert.com> | 2006-11-22 11:02:43 +0000 |
|---|---|---|
| committer | Damien Laniel <dlaniel@entrouvert.com> | 2006-11-22 11:02:43 +0000 |
| commit | 0b5bbddb456b0da62d059459b4625a0c373c27cb (patch) | |
| tree | b014aa0cf638829ddc9c56ffc26da8ca5102f473 | |
| parent | a735e87b2e88a961cf1233fd5b92b21570fedf4b (diff) | |
changed provider->private_data->encryption name to provider->private_data->encryption_enabled
| -rw-r--r-- | lasso/id-ff/provider.c | 4 | ||||
| -rw-r--r-- | lasso/id-ff/providerprivate.h | 2 | ||||
| -rw-r--r-- | lasso/saml-2.0/login.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c index ac6654ff..f024905a 100644 --- a/lasso/id-ff/provider.c +++ b/lasso/id-ff/provider.c @@ -735,7 +735,7 @@ lasso_provider_new(LassoProviderRole role, const char *metadata, lasso_provider_load_public_key(provider, LASSO_PUBLIC_KEY_ENCRYPTION); - provider->private_data->encryption = FALSE; + provider->private_data->encryption_enabled = FALSE; return provider; } @@ -1017,5 +1017,5 @@ int lasso_provider_verify_signature(LassoProvider *provider, void lasso_provider_set_encryption(LassoProvider *provider, gboolean encryption_activation) { - provider->private_data->encryption = encryption_activation; + provider->private_data->encryption_enabled = encryption_activation; } diff --git a/lasso/id-ff/providerprivate.h b/lasso/id-ff/providerprivate.h index c9a7d5f3..c48bb54d 100644 --- a/lasso/id-ff/providerprivate.h +++ b/lasso/id-ff/providerprivate.h @@ -58,7 +58,7 @@ struct _LassoProviderPrivate xmlNode *signing_key_descriptor; xmlSecKey *encryption_public_key; xmlNode *encryption_key_descriptor; - gboolean encryption; + gboolean encryption_enabled; }; diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c index d7eccf25..a825bad3 100644 --- a/lasso/saml-2.0/login.c +++ b/lasso/saml-2.0/login.c @@ -588,8 +588,8 @@ lasso_saml20_login_build_assertion(LassoLogin *login, provider = g_hash_table_lookup(profile->server->providers, profile->remote_providerID); - /* If there is a key, encrypt NameID. Maybe there should be another condition ? */ - if (provider && provider->private_data->encryption + /* Encrypt NameID */ + if (provider && provider->private_data->encryption_enabled && provider->private_data->encryption_public_key != NULL) { encrypted_element = LASSO_SAML2_ENCRYPTED_ELEMENT(lasso_node_encrypt( LASSO_NODE(assertion->Subject->NameID), @@ -630,8 +630,8 @@ lasso_saml20_login_build_assertion(LassoLogin *login, response = LASSO_SAMLP2_RESPONSE(profile->response); - /* If there is a key, encrypt Assertion. Maybe there should be another condition ? */ - if (provider && provider->private_data->encryption + /* Encrypt Assertion */ + if (provider && provider->private_data->encryption_enabled && provider->private_data->encryption_public_key != NULL) { encrypted_element = LASSO_SAML2_ENCRYPTED_ELEMENT(lasso_node_encrypt( LASSO_NODE(assertion), |