summaryrefslogtreecommitdiffstats
path: root/lasso/id-ff/server.h
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-02-08 09:34:11 +0000
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-02-08 09:34:11 +0000
commitb564a3b618bf09b9483b389c41e7104706fc5c89 (patch)
tree34e8938aec51b16aa08bcef71226d9a0ed435fa1 /lasso/id-ff/server.h
parent2800779b4cf3bb7b312c10419f59d4486dc860e5 (diff)
downloadlasso-b564a3b618bf09b9483b389c41e7104706fc5c89.tar.gz
lasso-b564a3b618bf09b9483b389c41e7104706fc5c89.tar.xz
lasso-b564a3b618bf09b9483b389c41e7104706fc5c89.zip
Core: in LassoServer constructors, test if private_key is loadable
* lasso/id-ff/server.c: mark private_key as not mandatory as regression tests expect it to not be mandatory. test if loading of private key to encryption_private_key private field worked, if not abort the constructor and return NULL. * lasso/id-ff/server.h: fix name of constructors argument to corresponds with comments (binding generator use this correspondance to apply annotation from comments to the model obtained by parsing the headers).
Diffstat (limited to 'lasso/id-ff/server.h')
-rw-r--r--lasso/id-ff/server.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h
index 1aff6dd4..fe8f5ae1 100644
--- a/lasso/id-ff/server.h
+++ b/lasso/id-ff/server.h
@@ -75,9 +75,9 @@ LASSO_EXPORT LassoServer* lasso_server_new(const gchar *metadata,
const gchar *certificate);
LASSO_EXPORT LassoServer* lasso_server_new_from_buffers(const gchar *metadata,
- const gchar *private_key,
+ const gchar *private_key_content,
const gchar *private_key_password,
- const gchar *certificate);
+ const gchar *certificate_content);
LASSO_EXPORT LassoServer* lasso_server_new_from_dump(const gchar *dump);