diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2006-11-08 19:23:45 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2006-11-08 19:23:45 +0000 |
| commit | 4c72aa673bc353ca21ef28d2012772f3fa6abddd (patch) | |
| tree | 00ea2192b2d9c0b70941c4a6448cbe57bd37f6e3 | |
| parent | e26ed0d719d35004dd6289bd7656a17309fede59 (diff) | |
| download | lasso-4c72aa673bc353ca21ef28d2012772f3fa6abddd.tar.gz lasso-4c72aa673bc353ca21ef28d2012772f3fa6abddd.tar.xz lasso-4c72aa673bc353ca21ef28d2012772f3fa6abddd.zip | |
spec refers to signing/encryption so use that vocabulary (even if I don't like
it)
| -rw-r--r-- | lasso/id-ff/provider.c | 8 | ||||
| -rw-r--r-- | lasso/id-ff/providerprivate.h | 4 | ||||
| -rw-r--r-- | lasso/id-ff/server.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c index 2a4b2d7a..fd9a0dd7 100644 --- a/lasso/id-ff/provider.c +++ b/lasso/id-ff/provider.c @@ -729,7 +729,7 @@ lasso_provider_new(LassoProviderRole role, const char *metadata, provider->public_key = g_strdup(public_key); provider->ca_cert_chain = g_strdup(ca_cert_chain); - if (lasso_provider_load_public_key(provider, LASSO_PUBLIC_KEY_SIGNATURE) == FALSE) { + if (lasso_provider_load_public_key(provider, LASSO_PUBLIC_KEY_SIGNING) == FALSE) { message(G_LOG_LEVEL_CRITICAL, "Failed to load signing public key for %s.", provider->ProviderID); lasso_node_destroy(LASSO_NODE(provider)); @@ -760,7 +760,7 @@ lasso_provider_load_public_key(LassoProvider *provider, LassoPublicKeyType publi }; int i; - if (public_key_type == LASSO_PUBLIC_KEY_SIGNATURE) { + if (public_key_type == LASSO_PUBLIC_KEY_SIGNING) { public_key = provider->public_key; key_descriptor = provider->private_data->signing_key_descriptor; } else { @@ -822,7 +822,7 @@ lasso_provider_load_public_key(LassoProvider *provider, LassoPublicKeyType publi xmlFree(b64_value); g_free(value); - if (public_key_type == LASSO_PUBLIC_KEY_SIGNATURE) { + if (public_key_type == LASSO_PUBLIC_KEY_SIGNING) { provider->private_data->public_key = pub_key; } else { provider->private_data->encryption_public_key = pub_key; @@ -877,7 +877,7 @@ lasso_provider_new_from_dump(const gchar *dump) doc = xmlParseMemory(dump, strlen(dump)); init_from_xml(LASSO_NODE(provider), xmlDocGetRootElement(doc)); - lasso_provider_load_public_key(provider, LASSO_PUBLIC_KEY_SIGNATURE); + lasso_provider_load_public_key(provider, LASSO_PUBLIC_KEY_SIGNING); lasso_provider_load_public_key(provider, LASSO_PUBLIC_KEY_ENCRYPTION); return provider; diff --git a/lasso/id-ff/providerprivate.h b/lasso/id-ff/providerprivate.h index 7622a26e..81ab3474 100644 --- a/lasso/id-ff/providerprivate.h +++ b/lasso/id-ff/providerprivate.h @@ -31,13 +31,13 @@ extern "C" { /** * LassoPublicKeyType: - * LASSO_PUBLIC_KEY_SIGNATURE: Signing public key + * LASSO_PUBLIC_KEY_SIGNING: Signing public key * LASSO_PUBLIC_KEY_ENCRYPTION: Encryption public key * * Public key type. **/ typedef enum { - LASSO_PUBLIC_KEY_SIGNATURE, + LASSO_PUBLIC_KEY_SIGNING, LASSO_PUBLIC_KEY_ENCRYPTION, } LassoPublicKeyType; diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c index e8091f4d..29bada7c 100644 --- a/lasso/id-ff/server.c +++ b/lasso/id-ff/server.c @@ -220,7 +220,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode) } p = g_object_new(LASSO_TYPE_PROVIDER, NULL); LASSO_NODE_GET_CLASS(p)->init_from_xml(LASSO_NODE(p), t2); - if (lasso_provider_load_public_key(p, LASSO_PUBLIC_KEY_SIGNATURE)) { + if (lasso_provider_load_public_key(p, LASSO_PUBLIC_KEY_SIGNING)) { g_hash_table_insert(server->providers, g_strdup(p->ProviderID), p); } else { |