diff options
| author | Nicolas Clapies <nclapies@entrouvert.com> | 2004-07-12 13:40:51 +0000 |
|---|---|---|
| committer | Nicolas Clapies <nclapies@entrouvert.com> | 2004-07-12 13:40:51 +0000 |
| commit | 1703b150dd8a35e23eee4e2a3df5f2e78aca25b0 (patch) | |
| tree | a61642d305df81ec8081d62f762a7b79a906ec3f | |
| parent | 6aafa90361f99d5149e582454f91295b4f40b72c (diff) | |
| download | lasso-1703b150dd8a35e23eee4e2a3df5f2e78aca25b0.tar.gz lasso-1703b150dd8a35e23eee4e2a3df5f2e78aca25b0.tar.xz lasso-1703b150dd8a35e23eee4e2a3df5f2e78aca25b0.zip | |
*** empty log message ***
| -rw-r--r-- | lasso/Attic/protocols/provider.c | 6 | ||||
| -rw-r--r-- | lasso/Attic/protocols/provider.h | 4 | ||||
| -rw-r--r-- | lasso/id-ff/server.c | 9 |
3 files changed, 13 insertions, 6 deletions
diff --git a/lasso/Attic/protocols/provider.c b/lasso/Attic/protocols/provider.c index be74817e..6983cefe 100644 --- a/lasso/Attic/protocols/provider.c +++ b/lasso/Attic/protocols/provider.c @@ -38,12 +38,12 @@ lasso_provider_dump(LassoProvider *provider) /* set the public key, certificate, metadata */ provider_class = LASSO_NODE_GET_CLASS(provider_node); - provider_class->set_name(provider_node, "Provider"); + provider_class->set_name(provider_node, LASSO_PROVIDER_NODE); provider_class->add_child(provider_node, provider->metadata, FALSE); if(provider->public_key) - provider_class->set_prop(provider_node, "PublicKey", provider->public_key); + provider_class->set_prop(provider_node, LASSO_PROVIDER_PUBLIC_KEY_NODE, provider->public_key); if(provider->certificate) - provider_class->set_prop(provider_node, "Certificate", provider->certificate); + provider_class->set_prop(provider_node, LASSO_PROVIDER_CERTIFICATE_NODE, provider->certificate); return(lasso_node_export(provider_node)); } diff --git a/lasso/Attic/protocols/provider.h b/lasso/Attic/protocols/provider.h index d2292819..2bd12287 100644 --- a/lasso/Attic/protocols/provider.h +++ b/lasso/Attic/protocols/provider.h @@ -39,8 +39,8 @@ extern "C" { #define LASSO_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_PROVIDER, LassoProviderClass)) #define LASSO_PROVIDER_NODE "LassoProvider" -#define LASSO_PROVIDER_PUBLIC_KEY_NODE "LassoPublicKey" -#define LASSO_PROVIDER_CERTIFICATE_NODE "LassoCertificate" +#define LASSO_PROVIDER_PUBLIC_KEY_NODE "PublicKey" +#define LASSO_PROVIDER_CERTIFICATE_NODE "Certificate" typedef struct _LassoProvider LassoProvider; typedef struct _LassoProviderClass LassoProviderClass; diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c index eb17f5d3..8c09707e 100644 --- a/lasso/id-ff/server.c +++ b/lasso/id-ff/server.c @@ -46,6 +46,7 @@ lasso_server_dump(LassoServer *server) server_class->set_prop(server_node, LASSO_SERVER_PRIVATE_KEY_NODE, server->private_key); /* TODO : add the signature method in the dump */ + /* set public key, certificate, metadata */ provider = LASSO_PROVIDER(server); @@ -186,6 +187,8 @@ lasso_server_new_from_dump(gchar *dump) xmlNodePtr xmlNode, providers_xmlNode, provider_xmlNode, entity_xmlNode; xmlChar *content, *public_key, *certificate; + LassoNode *server_metadata_node; + server = LASSO_SERVER(g_object_new(LASSO_TYPE_SERVER, NULL)); server_node = lasso_node_new_from_dump(dump); @@ -207,6 +210,10 @@ lasso_server_new_from_dump(gchar *dump) server->signature_method = atoi(content); } + /* set public key, certificate and metadata */ + server_metadata_node = lasso_node_get_child(server_node, "EntityDescriptor", NULL); + LASSO_PROVIDER(server)->metadata = server_metadata_node; + /* set providers */ providers_node = lasso_node_get_child(server_node, LASSO_SERVER_PROVIDERS_NODE, NULL); providers_class = LASSO_NODE_GET_CLASS(providers_node); @@ -227,7 +234,7 @@ lasso_server_new_from_dump(gchar *dump) certificate = xmlGetProp(provider_xmlNode, LASSO_PROVIDER_CERTIFICATE_NODE); /* add a new provider */ - provider = lasso_provider_new_metadata_xmlNode(metadata); + provider = lasso_provider_new_metadata_xmlNode(entity_xmlNode); if(public_key){ lasso_provider_set_public_key(provider, public_key); } |