oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

make refcount slightly more sane.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22853 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-04-07 18:49:16 +00:00
parent 4b92fb2f18
commit c72b88116e
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/hx509/ks_p11.c
View File

@@ -65,7 +65,7 @@ struct p11_module {
void *dl_handle; void *dl_handle;
CK_FUNCTION_LIST_PTR funcs; CK_FUNCTION_LIST_PTR funcs;
CK_ULONG num_slots; CK_ULONG num_slots;
unsigned int refcount; unsigned int ref;
struct p11_slot *slot; struct p11_slot *slot;
}; };
@@ -640,9 +640,11 @@ collect_private_key(hx509_context context,
p11rsa->slot = slot; p11rsa->slot = slot;
p11rsa->private_key = object; p11rsa->private_key = object;
p->refcount++; if (p->ref == 0)
if (p->refcount == 0) _hx509_abort("pkcs11 ref == 0 on alloc");
_hx509_abort("pkcs11 refcount to high"); p->ref++;
if (p->ref == UINT_MAX)
_hx509_abort("pkcs11 ref == UINT_MAX on alloc");
RSA_set_method(rsa, &p11_rsa_pkcs1_method); RSA_set_method(rsa, &p11_rsa_pkcs1_method);
ret = RSA_set_app_data(rsa, p11rsa); ret = RSA_set_app_data(rsa, p11rsa);
@@ -695,9 +697,11 @@ collect_cert(hx509_context context,
if (ret) if (ret)
return ret; return ret;
p->refcount++; if (p->ref == 0)
if (p->refcount == 0) _hx509_abort("pkcs11 ref == 0 on alloc");
_hx509_abort("pkcs11 refcount to high"); p->ref++;
if (p->ref == UINT_MAX)
_hx509_abort("pkcs11 ref to high");
_hx509_cert_set_release(cert, p11_cert_release, p); _hx509_cert_set_release(cert, p11_cert_release, p);
@@ -808,7 +812,7 @@ p11_init(hx509_context context,
return ENOMEM; return ENOMEM;
} }
p->refcount = 1; p->ref = 1;
str = strchr(list, ','); str = strchr(list, ',');
if (str) if (str)
@@ -934,9 +938,9 @@ p11_release_module(struct p11_module *p)
{ {
int i; int i;
if (p->refcount == 0) if (p->ref == 0)
_hx509_abort("pkcs11 refcount to low"); _hx509_abort("pkcs11 ref to low");
if (--p->refcount > 0) if (--p->ref > 0)
return; return;
for (i = 0; i < p->num_slots; i++) { for (i = 0; i < p->num_slots; i++) {