diff options
Diffstat (limited to 'module/p11-capi-builtin.c')
| -rw-r--r-- | module/p11-capi-builtin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/module/p11-capi-builtin.c b/module/p11-capi-builtin.c index 95fd476..4341f0c 100644 --- a/module/p11-capi-builtin.c +++ b/module/p11-capi-builtin.c @@ -58,12 +58,12 @@ typedef struct _BuiltinMatch BuiltinMatch; static const BuiltinMatch all_builtins[] = { - { (CK_ATTRIBUTE_PTR)&builtin_root, P11C_SLOT_TRUSTED | P11C_SLOT_CA | P11C_SLOT_CERTS }, +// { (CK_ATTRIBUTE_PTR)&builtin_root, P11C_SLOT_TRUSTED | P11C_SLOT_CA | P11C_SLOT_CERTS }, { NULL, 0 } }; /* This is filled in later */ -static CK_ULONG num_builtins = 0; +static CK_ULONG num_builtins = CK_END_LIST; /* -------------------------------------------------------------------------- * IMPLEMENTATION @@ -131,7 +131,7 @@ builtin_load_data(P11cSession* sess, P11cObject* obj, P11cObjectData** objdata) ASSERT(bobj); ASSERT(objdata); - ASSERT(num_builtins > 0); + ASSERT(num_builtins != CK_END_LIST); bdata = (BuiltinObjectData*)calloc(1, sizeof(BuiltinObjectData)); if(!bdata) @@ -211,11 +211,11 @@ p11c_builtin_find(P11cSession* sess, CK_OBJECT_CLASS cls, CK_ATTRIBUTE_PTR match CK_ULONG i, fl; /* First time around count total number */ - if(!num_builtins) + if(num_builtins == CK_END_LIST) { + num_builtins = 0; while(all_builtins[num_builtins].attr) ++num_builtins; - ASSERT(num_builtins > 0); } /* Match each certificate */ |