pkcs11 0.3.4 → 0.4.0

data/ext/pk11.c

@@ -39,10 +39,11 @@ static VALUE aCK_MECHANISM_members;
 
 VALUE pkcs11_return_value_to_class(CK_RV, VALUE);
 
+NORETURN()
 static void
-pkcs11_raise(VALUE self, CK_RV rv)
+pkcs11_raise(VALUE self, CK_RV rv, const char * const func)
 {
-  rb_funcall(self, rb_intern("vendor_raise_on_return_value"), 1, ULONG2NUM(rv));
+  rb_funcall(self, rb_intern("vendor_raise_on_return_value"), 2, ULONG2NUM(rv), rb_str_new_cstr(func));
   rb_raise(ePKCS11Error, "method vendor_raise_on_return_value should never return");
 }
 
@@ -53,24 +54,6 @@ typedef struct {
   CK_FUNCTION_LIST_PTR functions;
 } pkcs11_ctx;
 
-#define GetFunction(obj, name, sval) \
-{ \
-  pkcs11_ctx *ctx; \
-  Data_Get_Struct(obj, pkcs11_ctx, ctx); \
-  if (!ctx->functions) rb_raise(ePKCS11Error, "no function list"); \
-  sval = (CK_##name)ctx->functions->name; \
-  if (!sval) rb_raise(ePKCS11Error, #name " is not supported."); \
-}
-
-#define CallFunction(name, func, rv, ...) \
-{ \
-  struct tbr_##name##_params params = { \
-    func, {__VA_ARGS__}, CKR_FUNCTION_FAILED \
-  }; \
-  rb_thread_call_without_gvl(tbf_##name, &params, RUBY_UBF_PROCESS, NULL); \
-  rv = params.retval; \
-}
-
 static void
 pkcs11_ctx_unload_library(pkcs11_ctx *ctx)
 {
@@ -84,13 +67,45 @@ pkcs11_ctx_unload_library(pkcs11_ctx *ctx)
 }
 
 static void
-pkcs11_ctx_free(pkcs11_ctx *ctx)
+pkcs11_ctx_free(void *_ptr)
 {
+  pkcs11_ctx *ctx = (pkcs11_ctx *)_ptr;
   if(ctx->functions) ctx->functions->C_Finalize(NULL_PTR);
   pkcs11_ctx_unload_library(ctx);
   free(ctx);
 }
 
+static size_t
+pkcs11_ctx_memsize(const void *_ptr)
+{
+  return sizeof(pkcs11_ctx);
+}
+
+const rb_data_type_t pkcs11_ctx_type = {
+    "PKCS11::Library",
+    {0, pkcs11_ctx_free, pkcs11_ctx_memsize,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+#define GetFunction(obj, name, sval) \
+{ \
+  pkcs11_ctx *ctx; \
+  TypedData_Get_Struct(obj, pkcs11_ctx, &pkcs11_ctx_type, ctx); \
+  if (!ctx->functions) rb_raise(ePKCS11Error, "no function list"); \
+  sval = (CK_##name)ctx->functions->name; \
+  if (!sval) rb_raise(ePKCS11Error, #name " is not supported."); \
+}
+
+#define CallFunction(name, func, rv, ...) \
+{ \
+  struct tbr_##name##_params params = { \
+    func, {__VA_ARGS__}, CKR_FUNCTION_FAILED \
+  }; \
+  rb_thread_call_without_gvl(tbf_##name, &params, RUBY_UBF_PROCESS, NULL); \
+  rv = params.retval; \
+}
+
 /* rb_define_method(cPKCS11, "C_Finalize", pkcs11_C_Finalize, 0); */
 /*
  * Is called to indicate that an application is finished with the Cryptoki library.
@@ -104,7 +119,7 @@ pkcs11_C_Finalize(VALUE self)
 
   GetFunction(self, C_Finalize, func);
   CallFunction(C_Finalize, func, rv, NULL_PTR);
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_Finalize");
 
   return self;
 }
@@ -119,7 +134,7 @@ pkcs11_unload_library(VALUE self)
 {
   pkcs11_ctx *ctx;
 
-  Data_Get_Struct(self, pkcs11_ctx, ctx);
+  TypedData_Get_Struct(self, pkcs11_ctx, &pkcs11_ctx_type, ctx);
   pkcs11_ctx_unload_library(ctx);
 
   return self;
@@ -130,7 +145,7 @@ pkcs11_s_alloc(VALUE self)
 {
   VALUE obj;
   pkcs11_ctx *ctx;
-  obj = Data_Make_Struct(self, pkcs11_ctx, 0, pkcs11_ctx_free, ctx);
+  obj = TypedData_Make_Struct(self, pkcs11_ctx, &pkcs11_ctx_type, ctx);
   return obj;
 }
 
@@ -152,18 +167,18 @@ pkcs11_load_library(VALUE self, VALUE path)
   pkcs11_ctx *ctx;
 
   so_path = StringValueCStr(path);
-  Data_Get_Struct(self, pkcs11_ctx, ctx);
+  TypedData_Get_Struct(self, pkcs11_ctx, &pkcs11_ctx_type, ctx);
 #ifdef compile_for_windows
   if((ctx->module = LoadLibrary(so_path)) == NULL) {
-    char error_text[999] = "LoadLibrary() error";
+    char error_text[999] = "";
     FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
                 NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                 (LPTSTR)&error_text, sizeof(error_text), NULL);
-    rb_raise(ePKCS11Error, "%s", error_text);
+    rb_raise(ePKCS11Error, "LoadLibrary(): %s", error_text);
   }
 #else
   if((ctx->module = dlopen(so_path, RTLD_NOW)) == NULL) {
-    rb_raise(ePKCS11Error, "%s", dlerror());
+    rb_raise(ePKCS11Error, "dlopen(): %s", dlerror());
   }
 #endif
 
@@ -184,22 +199,22 @@ pkcs11_C_GetFunctionList(VALUE self)
   CK_RV rv;
   CK_C_GetFunctionList func;
 
-  Data_Get_Struct(self, pkcs11_ctx, ctx);
+  TypedData_Get_Struct(self, pkcs11_ctx, &pkcs11_ctx_type, ctx);
 #ifdef compile_for_windows
   func = (CK_C_GetFunctionList)GetProcAddress(ctx->module, "C_GetFunctionList");
   if(!func){
-    char error_text[999] = "GetProcAddress() error";
+    char error_text[999] = "";
     FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
                 NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                 (LPTSTR)&error_text, sizeof(error_text), NULL);
-    rb_raise(ePKCS11Error, "%s", error_text);
+    rb_raise(ePKCS11Error, "GetProcAddress(): %s", error_text);
   }
 #else
   func = (CK_C_GetFunctionList)dlsym(ctx->module, "C_GetFunctionList");
-  if(!func) rb_raise(ePKCS11Error, "%s", dlerror());
+  if(!func) rb_raise(ePKCS11Error, "dlsym(): %s", dlerror());
 #endif
   CallFunction(C_GetFunctionList, func, rv, &(ctx->functions));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetFunctionList");
 
   return self;
 }
@@ -225,7 +240,7 @@ pkcs11_C_Initialize(int argc, VALUE *argv, VALUE self)
   }
   GetFunction(self, C_Initialize, func);
   CallFunction(C_Initialize, func, rv, args);
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_Initialize");
 
   return self;
 }
@@ -255,7 +270,7 @@ pkcs11_C_GetInfo(VALUE self)
   GetFunction(self, C_GetInfo, func);
   info = pkcs11_new_struct(cCK_INFO);
   CallFunction(C_GetInfo, func, rv, (CK_INFO_PTR)DATA_PTR(info));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetInfo");
 
   return info;
 }
@@ -272,12 +287,12 @@ pkcs11_C_GetSlotList(VALUE self, VALUE presented)
 
   GetFunction(self, C_GetSlotList, func);
   CallFunction(C_GetSlotList, func, rv, CK_FALSE, NULL_PTR, &ulSlotCount);
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetSlotList 1st call");
   pSlotList = (CK_SLOT_ID_PTR)malloc(ulSlotCount*sizeof(CK_SLOT_ID));
   CallFunction(C_GetSlotList, func, rv, RTEST(presented) ? CK_TRUE : CK_FALSE, pSlotList, &ulSlotCount);
   if (rv != CKR_OK) {
     free(pSlotList);
-    pkcs11_raise(self,rv);
+    pkcs11_raise(self, rv, "C_GetSlotList 2nd call");
   }
   for (i = 0; i < ulSlotCount; i++)
     rb_ary_push(ary, HANDLE2NUM(pSlotList[i]));
@@ -296,7 +311,7 @@ pkcs11_C_GetSlotInfo(VALUE self, VALUE slot_id)
   GetFunction(self, C_GetSlotInfo, func);
   info = pkcs11_new_struct(cCK_SLOT_INFO);
   CallFunction(C_GetSlotInfo, func, rv, NUM2HANDLE(slot_id), DATA_PTR(info));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetSlotInfo");
 
   return info;
 }
@@ -311,7 +326,7 @@ pkcs11_C_GetTokenInfo(VALUE self, VALUE slot_id)
   GetFunction(self, C_GetTokenInfo, func);
   info = pkcs11_new_struct(cCK_TOKEN_INFO);
   CallFunction(C_GetTokenInfo, func, rv, NUM2HANDLE(slot_id), DATA_PTR(info));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetTokenInfo");
 
   return info;
 }
@@ -329,7 +344,7 @@ pkcs11_C_GetMechanismList(VALUE self, VALUE slot_id)
   ary = rb_ary_new();
   GetFunction(self, C_GetMechanismList, func);
   CallFunction(C_GetMechanismList, func, rv, NUM2HANDLE(slot_id), NULL_PTR, &count);
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetMechanismList 1st call");
   if (count == 0) return ary;
 
   types = (CK_MECHANISM_TYPE_PTR)malloc(sizeof(CK_MECHANISM_TYPE)*count);
@@ -337,7 +352,7 @@ pkcs11_C_GetMechanismList(VALUE self, VALUE slot_id)
   CallFunction(C_GetMechanismList, func, rv, NUM2HANDLE(slot_id), types, &count);
   if (rv != CKR_OK){
     free(types);
-    pkcs11_raise(self,rv);
+    pkcs11_raise(self, rv, "C_GetMechanismList 2nd call");
   }
   for (i = 0; i < count; i++)
     rb_ary_push(ary, HANDLE2NUM(*(types+i)));
@@ -356,7 +371,7 @@ pkcs11_C_GetMechanismInfo(VALUE self, VALUE slot_id, VALUE type)
   info = pkcs11_new_struct(cCK_MECHANISM_INFO);
   GetFunction(self, C_GetMechanismInfo, func);
   CallFunction(C_GetMechanismInfo, func, rv, NUM2HANDLE(slot_id), NUM2HANDLE(type), DATA_PTR(info));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetMechanismInfo");
 
   return info;
 }
@@ -373,7 +388,7 @@ pkcs11_C_InitToken(VALUE self, VALUE slot_id, VALUE pin, VALUE label)
   CallFunction(C_InitToken, func, rv, NUM2HANDLE(slot_id),
             (CK_UTF8CHAR_PTR)RSTRING_PTR(pin), RSTRING_LEN(pin),
             (CK_UTF8CHAR_PTR)RSTRING_PTR(label));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_InitToken");
 
   return self;
 }
@@ -388,7 +403,7 @@ pkcs11_C_InitPIN(VALUE self, VALUE session, VALUE pin)
   GetFunction(self, C_InitPIN, func);
   CallFunction(C_InitPIN, func, rv, NUM2HANDLE(session),
             (CK_UTF8CHAR_PTR)RSTRING_PTR(pin), RSTRING_LEN(pin));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_InitPIN");
 
   return self;
 }
@@ -402,7 +417,7 @@ pkcs11_C_OpenSession(VALUE self, VALUE slot_id, VALUE flags)
 
   GetFunction(self, C_OpenSession, func);
   CallFunction(C_OpenSession, func, rv, NUM2HANDLE(slot_id), NUM2ULONG(flags), 0, 0, &handle);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_OpenSession");
 
   return HANDLE2NUM(handle);
 }
@@ -417,7 +432,7 @@ pkcs11_C_Login(VALUE self, VALUE session, VALUE user_type, VALUE pin)
   GetFunction(self, C_Login, func);
   CallFunction(C_Login, func, rv, NUM2HANDLE(session), NUM2ULONG(user_type),
             (CK_UTF8CHAR_PTR)RSTRING_PTR(pin), RSTRING_LEN(pin));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_Login");
 
   return self;
 }
@@ -430,7 +445,7 @@ pkcs11_C_Logout(VALUE self, VALUE session)
 
   GetFunction(self, C_Logout, func);
   CallFunction(C_Logout, func, rv, NUM2HANDLE(session));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_Logout");
 
   return self;
 }
@@ -443,7 +458,7 @@ pkcs11_C_CloseSession(VALUE self, VALUE session)
 
   GetFunction(self, C_CloseSession, func);
   CallFunction(C_CloseSession, func, rv, NUM2HANDLE(session));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_CloseSession");
 
   return self;
 }
@@ -456,7 +471,7 @@ pkcs11_C_CloseAllSessions(VALUE self, VALUE slot_id)
 
   GetFunction(self, C_CloseAllSessions, func);
   CallFunction(C_CloseAllSessions, func, rv, NUM2HANDLE(slot_id));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_CloseAllSessions");
 
   return self;
 }
@@ -471,7 +486,7 @@ pkcs11_C_GetSessionInfo(VALUE self, VALUE session)
   info = pkcs11_new_struct(cCK_SESSION_INFO);
   GetFunction(self, C_GetSessionInfo, func);
   CallFunction(C_GetSessionInfo, func, rv, NUM2HANDLE(session), DATA_PTR(info));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetSessionInfo");
 
   return info;
 }
@@ -486,10 +501,10 @@ pkcs11_C_GetOperationState(VALUE self, VALUE session)
 
   GetFunction(self, C_GetOperationState, func);
   CallFunction(C_GetOperationState, func, rv, NUM2HANDLE(session), NULL_PTR, &size);
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetOperationState 1st call");
   state = rb_str_new(0, size);
   CallFunction(C_GetOperationState, func, rv, NUM2HANDLE(session), (CK_BYTE_PTR)RSTRING_PTR(state), &size);
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_GetOperationState 2nd call");
   rb_str_set_len(state, size);
 
   return state;
@@ -506,7 +521,7 @@ pkcs11_C_SetOperationState(VALUE self, VALUE session, VALUE state, VALUE enc_key
   CallFunction(C_SetOperationState, func, rv, NUM2HANDLE(session),
             (CK_BYTE_PTR)RSTRING_PTR(state), RSTRING_LEN(state),
             NUM2HANDLE(enc_key), NUM2HANDLE(auth_key));
-  if (rv != CKR_OK) pkcs11_raise(self,rv);
+  if (rv != CKR_OK) pkcs11_raise(self, rv, "C_SetOperationState");
 
   return self;
 }
@@ -523,7 +538,7 @@ pkcs11_C_SetPIN(VALUE self, VALUE session, VALUE old_pin, VALUE new_pin)
   CallFunction(C_SetPIN, func, rv, NUM2HANDLE(session),
             (CK_UTF8CHAR_PTR)RSTRING_PTR(old_pin), RSTRING_LEN(old_pin),
             (CK_UTF8CHAR_PTR)RSTRING_PTR(new_pin), RSTRING_LEN(new_pin));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_SetPIN");
 
   return self;
 }
@@ -562,7 +577,7 @@ pkcs11_C_CreateObject(VALUE self, VALUE session, VALUE template)
   GetFunction(self, C_CreateObject, func);
   CallFunction(C_CreateObject, func, rv, NUM2HANDLE(session), tmp, RARRAY_LEN(template), &handle);
   free(tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_CreateObject");
 
   return HANDLE2NUM(handle);
 }
@@ -579,7 +594,7 @@ pkcs11_C_CopyObject(VALUE self, VALUE session, VALUE object, VALUE template)
   GetFunction(self, C_CopyObject, func);
   CallFunction(C_CopyObject, func, rv, NUM2HANDLE(session), NUM2HANDLE(object), tmp, RARRAY_LEN(template), &handle);
   free(tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_CopyObject");
 
   return HANDLE2NUM(handle);
 }
@@ -592,7 +607,7 @@ pkcs11_C_DestroyObject(VALUE self, VALUE session, VALUE handle)
 
   GetFunction(self, C_DestroyObject, func);
   CallFunction(C_DestroyObject, func, rv, NUM2HANDLE(session), NUM2HANDLE(handle));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_DestroyObject");
 
   return self;
 }
@@ -606,7 +621,7 @@ pkcs11_C_GetObjectSize(VALUE self, VALUE session, VALUE handle)
 
   GetFunction(self, C_GetObjectSize, func);
   CallFunction(C_GetObjectSize, func, rv, NUM2HANDLE(session), NUM2HANDLE(handle), &size);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_GetObjectSize");
 
   return ULONG2NUM(size);
 }
@@ -626,7 +641,7 @@ pkcs11_C_FindObjectsInit(VALUE self, VALUE session, VALUE template)
   GetFunction(self, C_FindObjectsInit, func);
   CallFunction(C_FindObjectsInit, func, rv, NUM2HANDLE(session), tmp, tmp_size);
   free(tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_FindObjectsInit");
 
   return self;
 }
@@ -639,7 +654,7 @@ pkcs11_C_FindObjectsFinal(VALUE self, VALUE session)
 
   GetFunction(self, C_FindObjectsFinal, func);
   CallFunction(C_FindObjectsFinal, func, rv, NUM2HANDLE(session));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_FindObjectsFinal");
 
   return self;
 }
@@ -660,7 +675,7 @@ pkcs11_C_FindObjects(VALUE self, VALUE session, VALUE max_count)
   CallFunction(C_FindObjects, func, rv, NUM2HANDLE(session), handles, NUM2ULONG(max_count), &count);
   if(rv != CKR_OK){
     free(handles);
-    pkcs11_raise(self,rv);
+    pkcs11_raise(self, rv, "C_FindObjects");
   }
   ary = rb_ary_new();
   for(i = 0; i < count; i++)
@@ -688,7 +703,7 @@ pkcs11_C_GetAttributeValue(VALUE self, VALUE session, VALUE handle, VALUE templa
   CallFunction(C_GetAttributeValue, func, rv, NUM2HANDLE(session), NUM2HANDLE(handle), tmp, template_size);
   if(rv != CKR_OK){
     free(tmp);
-    pkcs11_raise(self,rv);
+    pkcs11_raise(self, rv, "C_GetAttributeValue 1st call");
   }
 
   for (i = 0; i < template_size; i++){
@@ -703,7 +718,7 @@ pkcs11_C_GetAttributeValue(VALUE self, VALUE session, VALUE handle, VALUE templa
       if (attr->pValue) free(attr->pValue);
     }
     free(tmp);
-    pkcs11_raise(self,rv);
+    pkcs11_raise(self, rv, "C_GetAttributeValue 2nd call");
   }
   ary = rb_ary_new();
   for (i = 0; i < template_size; i++){
@@ -732,7 +747,7 @@ pkcs11_C_SetAttributeValue(VALUE self, VALUE session, VALUE handle, VALUE templa
   GetFunction(self, C_SetAttributeValue, func);
   CallFunction(C_SetAttributeValue, func, rv, NUM2HANDLE(session), NUM2HANDLE(handle), tmp, template_size);
   free(tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_SetAttributeValue");
 
   return self;
 }
@@ -746,7 +761,7 @@ pkcs11_C_SeedRandom(VALUE self, VALUE session, VALUE seed)
   GetFunction(self, C_SeedRandom, func);
   CallFunction(C_SeedRandom, func, rv, NUM2HANDLE(session),
             (CK_BYTE_PTR)RSTRING_PTR(seed), RSTRING_LEN(seed));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_SeedRandom");
 
   return self;
 }
@@ -761,7 +776,7 @@ pkcs11_C_GenerateRandom(VALUE self, VALUE session, VALUE size)
 
   GetFunction(self, C_GenerateRandom, func);
   CallFunction(C_GenerateRandom, func, rv, NUM2HANDLE(session), (CK_BYTE_PTR)RSTRING_PTR(buf), sz);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_GenerateRandom");
 
   return buf;
 }
@@ -776,7 +791,7 @@ pkcs11_C_WaitForSlotEvent(VALUE self, VALUE flags)
   GetFunction(self, C_WaitForSlotEvent, func);
   CallFunction(C_WaitForSlotEvent, func, rv, NUM2ULONG(flags), &slot_id, NULL_PTR);
   if(rv == CKR_NO_EVENT) return Qnil;
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_WaitForSlotEvent");
 
   return HANDLE2NUM(slot_id);
 }
@@ -811,7 +826,7 @@ common_init(VALUE self, VALUE session, VALUE mechanism, VALUE key, init_func fun
   m = DATA_PTR(mechanism);
   /* Use the function signature of any of the various C_*Init functions. */
   CallFunction(C_EncryptInit, func, rv, NUM2HANDLE(session), m, NUM2HANDLE(key));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_EncryptInit");
 
   return Qnil;
 }
@@ -828,16 +843,19 @@ common_crypt_update(VALUE self, VALUE session, VALUE data, VALUE size, crypt_upd
     CallFunction(C_EncryptUpdate, func, rv, NUM2HANDLE(session),
               (CK_BYTE_PTR)RSTRING_PTR(data), RSTRING_LEN(data),
               NULL_PTR, &sz);
-    if(rv != CKR_OK) pkcs11_raise(self,rv);
+    if(rv != CKR_OK) pkcs11_raise(self, rv, "C_EncryptUpdate 1st call");
   }else{
     sz = NUM2ULONG(size);
   }
+
+  /* softokn3 with CKM_AES_GCM requests 16 bytes less then needed. */
+  sz += 16;
   buf = rb_str_new(0, sz);
 
   CallFunction(C_EncryptUpdate, func, rv, NUM2HANDLE(session),
             (CK_BYTE_PTR)RSTRING_PTR(data), RSTRING_LEN(data),
             (CK_BYTE_PTR)RSTRING_PTR(buf), &sz);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_EncryptUpdate 2nd call");
   rb_str_set_len(buf, sz);
 
   return buf;
@@ -852,14 +870,14 @@ common_crypt_final(VALUE self, VALUE session, VALUE size, crypt_final_func func)
 
   if (NIL_P(size)){
     CallFunction(C_EncryptFinal, func, rv, NUM2HANDLE(session), NULL_PTR, &sz);
-    if(rv != CKR_OK) pkcs11_raise(self,rv);
+    if(rv != CKR_OK) pkcs11_raise(self, rv, "C_EncryptFinal 1st call");
   }else{
     sz = NUM2ULONG(size);
   }
   buf = rb_str_new(0, sz);
 
   CallFunction(C_EncryptFinal, func, rv, NUM2HANDLE(session), (CK_BYTE_PTR)RSTRING_PTR(buf), &sz);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_EncryptFinal 2nd call");
   rb_str_set_len(buf, sz);
 
   return buf;
@@ -873,7 +891,7 @@ common_sign_update(VALUE self, VALUE session, VALUE data, sign_update_func func)
   StringValue(data);
   CallFunction(C_SignUpdate, func, rv, NUM2HANDLE(session),
             (CK_BYTE_PTR)RSTRING_PTR(data), RSTRING_LEN(data));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_SignUpdate");
 
   return Qnil;
 }
@@ -889,7 +907,7 @@ common_verify(VALUE self, VALUE session, VALUE data, VALUE sig, verify_func func
   CallFunction(C_Verify, func, rv, NUM2HANDLE(session),
             (CK_BYTE_PTR)RSTRING_PTR(data), RSTRING_LEN(data),
             (CK_BYTE_PTR)RSTRING_PTR(sig), RSTRING_LEN(sig));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_Verify");
 
   return Qnil;
 }
@@ -1089,7 +1107,7 @@ pkcs11_C_DigestInit(VALUE self, VALUE session, VALUE mechanism)
       rb_raise(rb_eArgError, "2nd arg must be a PKCS11::CK_MECHANISM");
   m = DATA_PTR(mechanism);
   CallFunction(C_DigestInit, func, rv, NUM2HANDLE(session), m);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_DigestInit");
 
   return self;
 }
@@ -1119,7 +1137,7 @@ pkcs11_C_DigestKey(VALUE self, VALUE session, VALUE handle)
 
   GetFunction(self, C_DigestKey, func);
   CallFunction(C_DigestKey, func, rv, NUM2HANDLE(session), NUM2HANDLE(handle));
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_DigestKey");
 
   return self;
 }
@@ -1179,7 +1197,7 @@ pkcs11_C_GenerateKey(VALUE self, VALUE session, VALUE mechanism, VALUE template)
   tmp = pkcs11_attr_ary2buf(template);
   CallFunction(C_GenerateKey, func, rv, NUM2HANDLE(session), m, tmp, RARRAY_LEN(template), &handle);
   free(tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_GenerateKey");
 
   return HANDLE2NUM(handle);
 }
@@ -1207,7 +1225,7 @@ pkcs11_C_GenerateKeyPair(VALUE self, VALUE session, VALUE mechanism, VALUE pubke
             &pubkey_handle, &privkey_handle);
   free(pubkey_tmp);
   free(privkey_tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_GenerateKeyPair");
   ary = rb_ary_new();
   rb_ary_push(ary, HANDLE2NUM(pubkey_handle));
   rb_ary_push(ary, HANDLE2NUM(privkey_handle));
@@ -1232,7 +1250,7 @@ pkcs11_C_WrapKey(VALUE self, VALUE session, VALUE mechanism, VALUE wrapping, VAL
     CallFunction(C_WrapKey, func, rv, NUM2HANDLE(session), m,
               NUM2HANDLE(wrapping), NUM2HANDLE(wrapped),
               (CK_BYTE_PTR)NULL_PTR, &sz);
-    if(rv != CKR_OK) pkcs11_raise(self,rv);
+    if(rv != CKR_OK) pkcs11_raise(self, rv, "C_WrapKey 1st call");
   }else{
     sz = NUM2ULONG(size);
   }
@@ -1241,7 +1259,7 @@ pkcs11_C_WrapKey(VALUE self, VALUE session, VALUE mechanism, VALUE wrapping, VAL
   CallFunction(C_WrapKey, func, rv, NUM2HANDLE(session), m,
             NUM2HANDLE(wrapping), NUM2HANDLE(wrapped),
             (CK_BYTE_PTR)RSTRING_PTR(buf), &sz);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_WrapKey 2nd call");
   rb_str_set_len(buf, sz);
 
   return buf;
@@ -1265,7 +1283,7 @@ pkcs11_C_UnwrapKey(VALUE self, VALUE session, VALUE mechanism, VALUE wrapping, V
             (CK_BYTE_PTR)RSTRING_PTR(wrapped), RSTRING_LEN(wrapped),
             tmp, RARRAY_LEN(template), &h);
   free(tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_UnwrapKey");
 
   return HANDLE2NUM(h);
 }
@@ -1287,7 +1305,7 @@ pkcs11_C_DeriveKey(VALUE self, VALUE session, VALUE mechanism, VALUE base, VALUE
   CallFunction(C_DeriveKey, func, rv, NUM2HANDLE(session), m, NUM2HANDLE(base),
             tmp, RARRAY_LEN(template), &h);
   free(tmp);
-  if(rv != CKR_OK) pkcs11_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_raise(self, rv, "C_DeriveKey");
 
   return HANDLE2NUM(h);
 }
@@ -1300,12 +1318,12 @@ pkcs11_C_DeriveKey(VALUE self, VALUE session, VALUE mechanism, VALUE base, VALUE
  * @param [Integer] rv return value of the latest operation
  */
 static VALUE
-pkcs11_vendor_raise_on_return_value(VALUE self, VALUE rv_value)
+pkcs11_vendor_raise_on_return_value(VALUE self, VALUE rv_value, VALUE func)
 {
   VALUE class;
   CK_RV rv = NUM2ULONG(rv_value);
   class = pkcs11_return_value_to_class(rv, ePKCS11Error);
-  rb_raise(class, "%lu", rv);
+  rb_raise(class, "%s returned %lu", StringValuePtr(func), rv);
 
   return Qnil;
 }
@@ -1327,18 +1345,32 @@ pkcs11_vendor_class_CK_ATTRIBUTE(VALUE self)
 ///////////////////////////////////////
 
 static void
-ck_attr_free(CK_ATTRIBUTE *attr)
+ck_attr_free(void *_ptr)
 {
+  CK_ATTRIBUTE *attr = (CK_ATTRIBUTE *)_ptr;
   if (attr->pValue) free(attr->pValue);
   free(attr);
 }
 
+static size_t
+ck_attr_memsize(const void *_ptr)
+{
+  return sizeof(CK_ATTRIBUTE);
+}
+
+static const rb_data_type_t ck_attr_obj_type = {
+    "PKCS11::CK_ATTRIBUTE",
+    {0, ck_attr_free, ck_attr_memsize,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE
 ck_attr_s_alloc(VALUE self)
 {
   VALUE obj;
   CK_ATTRIBUTE *attr;
-  obj = Data_Make_Struct(self, CK_ATTRIBUTE, 0, ck_attr_free, attr);
+  obj = TypedData_Make_Struct(self, CK_ATTRIBUTE, &ck_attr_obj_type, attr);
   return obj;
 }
 
@@ -1349,7 +1381,8 @@ ck_attr_initialize(int argc, VALUE *argv, VALUE self)
   CK_ATTRIBUTE *attr;
 
   rb_scan_args(argc, argv, "02", &type, &value);
-  Data_Get_Struct(self, CK_ATTRIBUTE, attr);
+  if(!RB_TYPE_P(self, RUBY_T_DATA)) rb_check_typeddata(self, &ck_attr_obj_type);
+  attr = (CK_ATTRIBUTE*)DATA_PTR(self);
   if (argc == 0) return self;
   attr->type = NUM2HANDLE(type);
   attr->pValue = NULL;
@@ -1392,7 +1425,8 @@ static VALUE
 ck_attr_type(VALUE self)
 {
   CK_ATTRIBUTE *attr;
-  Data_Get_Struct(self, CK_ATTRIBUTE, attr);
+  if(!RB_TYPE_P(self, RUBY_T_DATA)) rb_check_typeddata(self, &ck_attr_obj_type);
+  attr = (CK_ATTRIBUTE*)DATA_PTR(self);
   return ULONG2NUM(attr->type);
 }
 
@@ -1405,7 +1439,8 @@ static VALUE
 ck_attr_value(VALUE self)
 {
   CK_ATTRIBUTE *attr;
-  Data_Get_Struct(self, CK_ATTRIBUTE, attr);
+  if(!RB_TYPE_P(self, RUBY_T_DATA)) rb_check_typeddata(self, &ck_attr_obj_type);
+  attr = (CK_ATTRIBUTE*)DATA_PTR(self);
   if (attr->ulValueLen == 0) return Qnil;
   switch(attr->type){
   case CKA_ALWAYS_AUTHENTICATE:
@@ -1559,6 +1594,10 @@ Init_pkcs11_ext(void)
   sNEW = rb_intern("new");
   cPKCS11 = rb_define_class_under(mPKCS11, "Library", rb_cObject);
 
+  /* Expose the pointer of the pkcs11_ctx type struct.
+   * Because on Windows it's not possible to link directly into pkcs11_ext.so from pkcs11_luna_ext.so */
+  rb_define_const( cPKCS11, "PKCS11_CTX_TYPE", RB_ULL2NUM((unsigned long long)&pkcs11_ctx_type) );
+
 /* Document-method: PKCS11.open
  *
  * Alias function for {PKCS11::Library#initialize}
@@ -1647,7 +1686,7 @@ Init_pkcs11_ext(void)
   PKCS11_DEFINE_METHOD(C_WaitForSlotEvent, 1);
   PKCS11_DEFINE_METHOD(C_Finalize, 0);
   PKCS11_DEFINE_METHOD(unload_library, 0);
-  PKCS11_DEFINE_METHOD(vendor_raise_on_return_value, 1);
+  PKCS11_DEFINE_METHOD(vendor_raise_on_return_value, 2);
   PKCS11_DEFINE_METHOD(vendor_class_CK_ATTRIBUTE, 0);
 
   ///////////////////////////////////////