diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2006-11-19 19:01:50 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2006-11-19 19:01:50 +0000 |
| commit | 1729459a2f3799aed1d87d762415f3e577753bb7 (patch) | |
| tree | a264a3fe0df42eed174a00e7f0f7254bf6b6e241 | |
| parent | 13907aba6749d88f7a9dc655ba385b0cad273b04 (diff) | |
| download | lasso-1729459a2f3799aed1d87d762415f3e577753bb7.tar.gz lasso-1729459a2f3799aed1d87d762415f3e577753bb7.tar.xz lasso-1729459a2f3799aed1d87d762415f3e577753bb7.zip | |
s/file_name/filename/
| -rw-r--r-- | lasso/id-ff/server.c | 9 | ||||
| -rw-r--r-- | lasso/id-ff/server.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c index 1b25c3c4..077350c2 100644 --- a/lasso/id-ff/server.c +++ b/lasso/id-ff/server.c @@ -121,14 +121,14 @@ lasso_server_destroy(LassoServer *server) /** * lasso_server_set_encryption_private_key: * @server: a #LassoServer - * @file_name: file name of the encryption key to load + * @filename: file name of the encryption key to load * * Load an encryption private key from a file and set it in the server object * * Return value: 0 on success; another value if an error occured. **/ int -lasso_server_set_encryption_private_key(LassoServer *server, gchar *file_name) +lasso_server_set_encryption_private_key(LassoServer *server, gchar *filename) { LassoPemFileType file_type; @@ -136,14 +136,15 @@ lasso_server_set_encryption_private_key(LassoServer *server, gchar *file_name) xmlSecKeyDestroy(server->private_data->encryption_private_key); server->private_data->encryption_private_key = NULL; } - file_type = lasso_get_pem_file_type(file_name); + file_type = lasso_get_pem_file_type(filename); if (file_type == LASSO_PEM_FILE_TYPE_PRIVATE_KEY) { - server->private_data->encryption_private_key = xmlSecCryptoAppKeyLoad(file_name, + server->private_data->encryption_private_key = xmlSecCryptoAppKeyLoad(filename, xmlSecKeyDataFormatPem, NULL, NULL, NULL); } if (server->private_data->encryption_private_key == NULL) return LASSO_SERVER_ERROR_SET_ENCRYPTION_PRIVATE_KEY_FAILED; + return 0; } diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h index 6798c890..b5dcf5a9 100644 --- a/lasso/id-ff/server.h +++ b/lasso/id-ff/server.h @@ -96,7 +96,7 @@ LASSO_EXPORT LassoProvider* lasso_server_get_provider(LassoServer *server, gchar LASSO_EXPORT LassoDiscoServiceInstance* lasso_server_get_service(LassoServer *server, gchar *serviceType); -LASSO_EXPORT int lasso_server_set_encryption_private_key(LassoServer *server, gchar *file_name); +LASSO_EXPORT int lasso_server_set_encryption_private_key(LassoServer *server, gchar *filename); #ifdef __cplusplus } |