diff options
Diffstat (limited to 'ckcapi-builtin.c')
| -rw-r--r-- | ckcapi-builtin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ckcapi-builtin.c b/ckcapi-builtin.c index 94d170e..ad70ea2 100644 --- a/ckcapi-builtin.c +++ b/ckcapi-builtin.c @@ -91,7 +91,7 @@ static const CkCapiObjectDataVtable builtin_objdata_vtable = { }; static CK_RV -builtin_load(CkCapiObject* obj, CkCapiObjectData* objdata) +builtin_load_data(CkCapiSession* sess, CkCapiObject* obj, CkCapiObjectData* objdata) { BuiltinObject* bobj = (BuiltinObject*)obj; @@ -118,12 +118,12 @@ builtin_object_release(void* data) } static const CkCapiObjectVtable builtin_object_vtable = { - builtin_load, + builtin_load_data, builtin_object_release, }; static CK_RV -register_builtin_object(CkCapiSession* sess, CK_ULONG index, CK_OBJECT_HANDLE_PTR id) +register_builtin_object(CkCapiSession* sess, CK_ULONG index, CkCapiObject** obj) { BuiltinObject* bobj; CK_RV ret; @@ -148,15 +148,15 @@ register_builtin_object(CkCapiSession* sess, CK_ULONG index, CK_OBJECT_HANDLE_PT } ASSERT(bobj->obj.id != 0); - *id = bobj->obj.id; + *obj = &(bobj->obj); return CKR_OK; } CK_RV -ckcapi_builtin_find_all(CkCapiSession* sess, CK_ATTRIBUTE_PTR match, - CK_ULONG count, CkCapiArray* arr) +ckcapi_builtin_find(CkCapiSession* sess, CK_OBJECT_CLASS cls, CK_ATTRIBUTE_PTR match, + CK_ULONG count, CkCapiArray* arr) { - CK_OBJECT_HANDLE obj; + CkCapiObject* obj; CkCapiObjectData objdata; CK_RV ret = CKR_OK; CK_ULONG i; |