summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-03-16 12:35:00 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-03-16 12:35:00 +0100
commit173e12f4f04da40b1480ca264d512c3f91526378 (patch)
tree8f07eebe6c5c0317094b96db52cf083d9de2e67e
parent696d6fd6a543833e8836bc709864481ebcdf3ce4 (diff)
downloadgnutls-173e12f4f04da40b1480ca264d512c3f91526378.tar.gz
avoid internal error
-rw-r--r--lib/pkcs11.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index d0999128f7..ebdf04d8cd 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -170,7 +170,7 @@ pkcs11_rv_to_err (ck_rv_t rv)
static int scan_slots(struct gnutls_pkcs11_provider_s * p)
{
-int rv;
+ck_rv_t rv;
unsigned long nslots = 0;
if (p->nslots > 0)
@@ -501,7 +501,7 @@ initialize_automatic_p11_kit (void)
gnutls_assert ();
_gnutls_debug_log ("Cannot initialize registered module: %s\n",
p11_kit_strerror (rv));
- return GNUTLS_E_INTERNAL_ERROR;
+ return pkcs11_rv_to_err(rv);
}
initialized_registered = 1;
@@ -588,6 +588,7 @@ gnutls_pkcs11_init (unsigned int flags, const char *deprecated_config_file)
int gnutls_pkcs11_reinit (void)
{
unsigned i;
+ int rv;
for (i = 0; i < active_providers; i++)
{