diff options
| author | Stefan Walter <stefw@src.gnome.org> | 2008-07-25 17:33:29 +0000 |
|---|---|---|
| committer | Stefan Walter <stefw@src.gnome.org> | 2008-07-25 17:33:29 +0000 |
| commit | 1c55c968e61217a31582cd2f8b3e304c057e8ac0 (patch) | |
| tree | ff20ac40803913299cfabf241895e58f4a9abfe9 | |
| parent | 2d220fe34809bf101a3939bf69f993c28ecb73bf (diff) | |
| download | gnome-keyring-1c55c968e61217a31582cd2f8b3e304c057e8ac0.tar.gz | |
Build fixes. Fixes bug #544407
* gp11/gp11-module.c: Build fixes. Fixes bug #544407
svn path=/trunk/; revision=1203
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gp11/gp11-module.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,5 +1,9 @@ 2008-07-25 Stef Walter <stef@memberwebs.com> + * gp11/gp11-module.c: Build fixes. Fixes bug #544407 + +2008-07-25 Stef Walter <stef@memberwebs.com> + * daemon/pk/gkr-pk-import.c: * daemon/pk/gkr-pk-index.c: * daemon/pk/gkr-pk-index.h: diff --git a/gp11/gp11-module.c b/gp11/gp11-module.c index 5cc830e5..877cae36 100644 --- a/gp11/gp11-module.c +++ b/gp11/gp11-module.c @@ -193,7 +193,7 @@ gp11_module_initialize (const gchar *path, gpointer reserved, GError **err) /* Load the actual module */ pv->module = g_module_open (path, 0); if (!pv->module) { - g_set_error (err, GP11_ERROR, CKR_GP11_MODULE_PROBLEM, + g_set_error (err, GP11_ERROR, (int)CKR_GP11_MODULE_PROBLEM, "Error loading pkcs11 module: %s", g_module_error ()); g_object_unref (mod); return NULL; @@ -201,7 +201,7 @@ gp11_module_initialize (const gchar *path, gpointer reserved, GError **err) /* Get the entry point */ if (!g_module_symbol (pv->module, "C_GetFunctionList", (void**)&get_function_list)) { - g_set_error (err, GP11_ERROR, CKR_GP11_MODULE_PROBLEM, + g_set_error (err, GP11_ERROR, (int)CKR_GP11_MODULE_PROBLEM, "Invalid pkcs11 module: %s", g_module_error ()); g_object_unref (mod); return NULL; @@ -218,7 +218,7 @@ gp11_module_initialize (const gchar *path, gpointer reserved, GError **err) /* Make sure we have a compatible version */ if (mod->funcs->version.major != CRYPTOKI_VERSION_MAJOR) { - g_set_error (err, GP11_ERROR, CKR_GP11_MODULE_PROBLEM, + g_set_error (err, GP11_ERROR, (int)CKR_GP11_MODULE_PROBLEM, "Incompatible version of pkcs11 module: %d.%d", (int)mod->funcs->version.major, (int)mod->funcs->version.minor); |