summaryrefslogtreecommitdiff
path: root/src/module.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/module.c')
-rw-r--r--src/module.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/module.c b/src/module.c
index e2b2185..b1b82b0 100644
--- a/src/module.c
+++ b/src/module.c
@@ -25,7 +25,7 @@ create_mutex(void **mutex)
if(!mutex)
{
- p11t_msg_print("null mutex passed to create_mutex");
+ p11t_msg_print("CreateMutex: null mutex passed");
return CKR_ARGUMENTS_BAD;
}
@@ -45,7 +45,7 @@ destroy_mutex (void *mutex)
if(!mutex)
{
- p11t_msg_print("destroying null mutex");
+ p11t_msg_print("DestroyMutex: null mutex");
return CKR_MUTEX_BAD;
}
@@ -54,17 +54,17 @@ destroy_mutex (void *mutex)
{
if(res == EBUSY)
{
- p11t_msg_print("trying to destroy locked mutex");
+ p11t_msg_print("DestroyMutex: mutex is locked");
return CKR_GENERAL_ERROR;
}
else if(res == EINVAL)
{
- p11t_msg_print("destroying invalid mutex used");
+ p11t_msg_print("DestroyMutex: mutex is invalid");
return CKR_MUTEX_BAD;
}
else
{
- p11t_msg_print("couldn't destroy mutex: %d", res);
+ p11t_msg_print("DestroyMutex: failed: %d", res);
return CKR_GENERAL_ERROR;
}
@@ -79,7 +79,7 @@ lock_mutex (void *mutex)
int res;
if (!mutex)
{
- p11t_msg_print("locking null mutex");
+ p11t_msg_print("LockMutex: null mutex");
return CKR_MUTEX_BAD;
}
@@ -88,17 +88,17 @@ lock_mutex (void *mutex)
{
if(res == EDEADLK)
{
- p11t_msg_print("locking mutex would deadlock");
+ p11t_msg_print("LockMutex: would deadlock");
return CKR_CANT_LOCK;
}
else if(res == EINVAL)
{
- p11t_msg_print("locking invalid mutex used");
+ p11t_msg_print("LockMutex: invalid mutex used");
return CKR_MUTEX_BAD;
}
else
{
- p11t_msg_print("couldn't lock mutex: %d", res);
+ p11t_msg_print("LockMutex: failed: %d", res);
return CKR_GENERAL_ERROR;
}
@@ -113,7 +113,7 @@ unlock_mutex (void *mutex)
int res;
if (!mutex)
{
- p11t_msg_print("unlocking null mutex");
+ p11t_msg_print("UnlockMutex: null mutex");
return CKR_MUTEX_BAD;
}
@@ -122,17 +122,17 @@ unlock_mutex (void *mutex)
{
if(res == EPERM)
{
- p11t_msg_print("unlocking mutex without locked");
+ p11t_msg_print("UnlockMutex: mutex not locked");
return CKR_MUTEX_NOT_LOCKED;
}
else if(res == EINVAL)
{
- p11t_msg_print("unlocking invalid mutex used");
+ p11t_msg_print("UnlockMutex: invalid mutex used");
return CKR_MUTEX_BAD;
}
else
{
- p11t_msg_print("couldn't unlock mutex: %d", res);
+ p11t_msg_print("UnlockMutex: failed: %d", res);
return CKR_GENERAL_ERROR;
}
@@ -159,21 +159,21 @@ p11t_module_load(const char *filename)
/* Lookup the appropriate function in library */
get_function_list = (CK_C_GetFunctionList)dlsym (module, "C_GetFunctionList");
if(!get_function_list)
- p11t_msg_fatal("couldn't find C_GetFunctionList function in library: %s: %s", filename, dlerror());
+ p11t_msg_fatal("C_GetFunctionList: couldn't find function in library: %s: %s", filename, dlerror());
/* Get the function list */
rv = (get_function_list)(&p11t_module_funcs);
if(rv != CKR_OK)
- p11t_msg_fatal("couldn't get function list: %s", p11t_msg_rv(rv));
+ p11t_msg_fatal("C_GetFunctiontList: couldn't get function list: %s", p11t_msg_rv(rv));
/** C_GetFunctionList */
rv = (p11t_module_funcs->C_GetFunctionList)(&list);
if(rv != CKR_OK)
- p11t_msg_print("C_GetFunctionList call through function list failed: %s", p11t_msg_rv(rv));
+ p11t_msg_print("C_GetFunctionList: call through function list failed: %s", p11t_msg_rv(rv));
/** - See if returns same data as library entry point */
if(!memcmp(list, p11t_module_funcs, sizeof(*list)) != 0)
- p11t_msg_print("function lists returned directly and recursively differ");
+ p11t_msg_print("C_GetFunctionList: function lists returned directly and recursively differ");
}
static int
@@ -190,7 +190,7 @@ initialize_common(const char *mode)
if (rv != CKR_OK)
{
if(rv != CKR_CANT_LOCK)
- p11t_msg_print("C_Initialize failed (%s): %s", mode, p11t_msg_rv(rv));
+ p11t_msg_print("C_Initialize: failed (%s): %s", mode, p11t_msg_rv(rv));
return 0;
}
else
@@ -265,7 +265,7 @@ p11t_module_initialize(void)
/** - NULL argument */
rv = (p11t_module_funcs->C_Initialize) (NULL);
- p11t_check_returns("should succeed with null argument", rv, CKR_OK);
+ p11t_check_returns("C_Initialize: should succeed with null argument", rv, CKR_OK);
is_initialized = 1;
p11t_module_finalize();
@@ -281,16 +281,16 @@ p11t_module_initialize(void)
/* Actually initialize with whatever succeeded last */
if(!init_func)
- p11t_msg_fatal("no initialize succeded cannot continue");
+ p11t_msg_fatal("C_Initialize: no initialize succeded cannot continue");
(init_func)();
if(!is_initialized)
- p11t_msg_fatal("couldn't initialize pkcs11 module");
+ p11t_msg_fatal("C_Initialize: couldn't initialize pkcs11 module");
/** - Double initialize in a row */
rv = (p11t_module_funcs->C_Initialize) (&init_args);
if (rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)
{
- p11t_msg_print("double initialize should return CKR_CRYPTOKI_ALREADY_INITIALIZED: %s", p11t_msg_rv(rv));
+ p11t_msg_print("C_Initialize: double initialize should return CKR_CRYPTOKI_ALREADY_INITIALIZED: %s", p11t_msg_rv(rv));
}
else
{
@@ -308,7 +308,7 @@ p11t_module_finalize(void)
{
/** - With invalid argument */
rv = p11t_module_funcs->C_Finalize(&rv);
- p11t_check_returns("C_Finalize bad argument", rv, CKR_ARGUMENTS_BAD);
+ p11t_check_returns("C_Finalize: bad argument", rv, CKR_ARGUMENTS_BAD);
/** - Normal call */
assert(p11t_module_funcs);
@@ -319,7 +319,7 @@ p11t_module_finalize(void)
/** - Double finalize in a row */
rv = p11t_module_funcs->C_Finalize(NULL);
- p11t_check_returns("C_Finalize not initialized", rv, CKR_CRYPTOKI_NOT_INITIALIZED);
+ p11t_check_returns("C_Finalize: double finalize", rv, CKR_CRYPTOKI_NOT_INITIALIZED);
}
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:37:29 +0000