summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-01-12 15:40:04 +0000
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-01-12 15:40:04 +0000
commit9caacc3bb61f090035c4b55ddf7ae4d281db06e7 (patch)
tree425cad65cf93e28baecd7418fcd0a7ce23b31f44
parent5ac1c303cc149927b9721117119d9e9a9dbe9371 (diff)
Core Server: make default to load signing private key also as encryption private key
-rw-r--r--lasso/id-ff/server.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 7e5b892b..0405247d 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -261,6 +261,10 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
int rc = 0;
rc = parent_class->init_from_xml(node, xmlnode);
+
+ if (server->private_key) {
+ server->private_data->encryption_private_key = lasso_xmlsec_load_private_key(server->private_key, NULL);
+ }
if (rc)
return rc;
@@ -560,6 +564,8 @@ lasso_server_new(const gchar *metadata,
lasso_assign_string(server->private_key, private_key);
lasso_assign_string(server->private_key_password, private_key_password);
lasso_assign_string(server->certificate, certificate);
+ server->private_data->encryption_private_key = lasso_xmlsec_load_private_key(private_key,
+ private_key_password);
return server;
}
@@ -594,6 +600,9 @@ lasso_server_new_from_buffers(const char *metadata, const char *private_key_cont
lasso_assign_string(server->private_key, private_key_content);
lasso_assign_string(server->private_key_password, private_key_password);
lasso_assign_string(server->certificate, certificate_content);
+ server->private_data->encryption_private_key =
+ lasso_xmlsec_load_private_key_from_buffer(private_key_content,
+ strlen(private_key_content), private_key_password);
return server;
}