pkcs11_luna 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f007d18d5f49caf66e19ddab17ad58e19f19acb55eeb3fb6368c71d1e8bda78
-  data.tar.gz: b310d64297dd288efab80d20dd116529ddba1f8b381cc24f0d099d78c4595838
+  metadata.gz: 4893d05a079040c1ac2d4cbae3fb2516284c8d8e33ffe7217ee5f5f1abcb4897
+  data.tar.gz: 16c6839104dd05d9b45b771accd5db685416cd18a5da4248686d64508801590f
 SHA512:
-  metadata.gz: 44f4725a406129a6882c1d84fdd7b4d22b083f369e3038c0997daa222a667de68f54750262b01ea50f328156354d9eb8e4d91a2345184df2af0b53fe1c6e48f8
-  data.tar.gz: e18586bbf26f9b89e35701ab4e71e779963ced7f2583d158a975b64763a991825bf5b5eaa33a0672cd6895131c95f3dd14351f672cc4eb43d391ecbe0d2e0872
+  metadata.gz: e34db14604bb7d771223b03e57c23bd03922e7d5919780717fd2dd51e619db4e7455ee968c451b5a60fb2a9dceb8b210c149a19f0133dd029eb7938425b5316e
+  data.tar.gz: 5889f38a3420ae3c124f5fe3991d627bf3922af763c419e15ca876df50a06481cec67b159d4d6ea27707e259dd52581376b9eb1c26b1e232509193d659df78b0

data/ext/extconf.rb

@@ -2,6 +2,7 @@ require "mkmf"
 require "rubygems"
 
 inc, lib = dir_config('luna-dir', '/usr/safenet/lunaclient/samples')
+inc = inc.split(":", 2).first
 puts "using Luna Client include:#{inc}"
 
 require_relative "generate_luna_constants"

data/ext/generate_constants.rb

@@ -26,7 +26,7 @@ class ConstantParser
     s.options = options
     s.start!
   end
-  
+
   ConstTemplate = Struct.new :regexp, :def
   ConstGroups = [
     ConstTemplate.new(/#define\s+(CKM_[A-Z_0-9]+)\s+(\w+)/, 'PKCS11_DEFINE_MECHANISM'),
@@ -38,11 +38,11 @@ class ConstantParser
   def start!
     File.open(options.const, "w") do |fd_const|
       options.files.each do |file_h|
-        c_src = IO.read(file_h)
+        c_src = File.read(file_h)
         ConstGroups.each do |const_group|
           c_src.scan(const_group.regexp) do
             const_name, const_value = $1, $2
-            
+
             fd_const.puts "#{const_group.def}(#{const_name}); /* #{const_value} */"
           end
         end

data/ext/generate_structs.rb

@@ -56,7 +56,7 @@ class StructParser
   def parse_files(files)
     structs = []
     files.each do |file_h|
-      c_src = IO.read(file_h)
+      c_src = File.read(file_h)
       c_src.scan(/struct\s+([A-Z_0-9]+)\s*\{(.*?)\}/m) do |struct|
         struct_text = $2
         struct = CStruct.new( $1, [] )

data/ext/pk11_struct_macros.h

@@ -77,7 +77,7 @@ get_ulong_ptr(VALUE obj, off_t offset)
 }
 
 static VALUE
-set_ulong_ptr(VALUE obj, VALUE value, const char *name, off_t offset)
+set_ulong_ptr(VALUE obj, VALUE value, const char *name, off_t offset, const rb_data_type_t *objtype)
 {
   VALUE new_obj;
   CK_ULONG_PTR *ptr = (CK_ULONG_PTR *)((char*)DATA_PTR(obj) + offset);
@@ -86,7 +86,7 @@ set_ulong_ptr(VALUE obj, VALUE value, const char *name, off_t offset)
     *ptr = NULL_PTR;
     return value;
   }
-  new_obj = Data_Make_Struct(rb_cObject, CK_ULONG, 0, -1, *ptr);
+  new_obj = TypedData_Make_Struct(rb_cObject, CK_ULONG, objtype, *ptr);
   rb_iv_set(obj, name, new_obj);
   **ptr = NUM2ULONG(value);
   return value;
@@ -180,10 +180,10 @@ set_string_ptr_len(VALUE obj, VALUE value, const char *name, off_t offset, off_t
 }
 
 static VALUE
-get_struct_inline(VALUE obj, VALUE klass, const char *name, off_t offset)
+get_struct_inline(VALUE obj, VALUE klass, const char *name, off_t offset, const rb_data_type_t *objtype)
 {
   char *ptr = (char*)DATA_PTR(obj) + offset;
-  VALUE inline_obj = Data_Wrap_Struct(klass, 0, 0, ptr);
+  VALUE inline_obj = TypedData_Wrap_Struct(klass, objtype, ptr);
   rb_iv_set(inline_obj, name, obj);
   return inline_obj;
 }
@@ -199,7 +199,7 @@ set_struct_inline(VALUE obj, VALUE klass, const char *struct_name, VALUE value,
 }
 
 static VALUE
-get_struct_ptr(VALUE obj, VALUE klass, const char *name, off_t offset, int sizeofstruct)
+get_struct_ptr(VALUE obj, VALUE klass, const char *name, off_t offset, int sizeofstruct, const rb_data_type_t *objtype)
 {
   char *ptr = (char*)DATA_PTR(obj);
   char *p = *(char**)(ptr+offset);
@@ -208,7 +208,7 @@ get_struct_ptr(VALUE obj, VALUE klass, const char *name, off_t offset, int sizeo
   if (!p) return Qnil;
   mem = xmalloc(sizeofstruct);
   memcpy(mem, p, sizeofstruct);
-  new_obj = Data_Wrap_Struct(klass, 0, -1, mem);
+  new_obj = TypedData_Wrap_Struct(klass, objtype, mem);
   return new_obj;
 }
 
@@ -229,7 +229,7 @@ set_struct_ptr(VALUE obj, VALUE klass, const char *struct_name, VALUE value, con
 }
 
 static VALUE
-get_struct_ptr_array(VALUE obj, VALUE klass, off_t offset, off_t offset_len, int sizeofstruct)
+get_struct_ptr_array(VALUE obj, VALUE klass, off_t offset, off_t offset_len, int sizeofstruct, const rb_data_type_t *objtype)
 {
   unsigned long i;
   char *ptr = DATA_PTR(obj);
@@ -240,7 +240,7 @@ get_struct_ptr_array(VALUE obj, VALUE klass, off_t offset, off_t offset_len, int
     VALUE new_obj;
     void *mem = xmalloc(sizeofstruct);
     memcpy(mem, p + sizeofstruct * i, sizeofstruct);
-    new_obj = Data_Wrap_Struct(klass, 0, -1, mem);
+    new_obj = TypedData_Wrap_Struct(klass, objtype, mem);
     rb_ary_push(ary, new_obj);
   }
   return ary;
@@ -273,9 +273,15 @@ set_struct_ptr_array(VALUE obj, VALUE klass, const char *struct_name, VALUE valu
 #define SIZE_OF(s, f) (sizeof(((s*)0)->f))
 
 #define PKCS11_IMPLEMENT_ALLOCATOR(s) \
+static const rb_data_type_t struct_##s##_obj_type = { \
+    "PKCS11::" #s, \
+    {0, RUBY_DEFAULT_FREE, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
 static VALUE s##_s_alloc(VALUE self){ \
   s *info; \
-  VALUE obj = Data_Make_Struct(self, s, 0, -1, info); \
+  VALUE obj = TypedData_Make_Struct(self, s, &struct_##s##_obj_type, info); \
   return obj; \
 } \
 static VALUE c##s##_to_s(VALUE self){ \
@@ -315,11 +321,18 @@ static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
 }
 
 #define PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(s, f) \
+static const rb_data_type_t struct_##s##_##f##_obj_type = { \
+    "PKCS11::" #s "." #f, \
+    {0, RUBY_DEFAULT_FREE, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
+\
 static VALUE c##s##_get_##f(VALUE o){ \
   return get_ulong_ptr(o, OFFSET_OF(s, f)); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_ulong_ptr(o, v, #f, OFFSET_OF(s, f)); \
+  return set_ulong_ptr(o, v, #f, OFFSET_OF(s, f), &struct_##s##_##f##_obj_type); \
 }
 
 #define PKCS11_IMPLEMENT_HANDLE_ACCESSOR(s, f) \
@@ -355,17 +368,29 @@ static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
 }
 
 #define PKCS11_IMPLEMENT_STRUCT_ACCESSOR(s, k, f) \
+static const rb_data_type_t struct_##s##_##f##_obj_type = { \
+    "PKCS11::" #s "." #f, \
+    {0, 0, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
 static VALUE c##s##_get_##f(VALUE o){ \
-  return get_struct_inline(o, c##k, #f, OFFSET_OF(s, f)); \
+  return get_struct_inline(o, c##k, #f, OFFSET_OF(s, f), &struct_##s##_##f##_obj_type); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   return set_struct_inline(o, c##k, #k, v, #f, OFFSET_OF(s, f), sizeof(k)); \
 }
 
 #define PKCS11_IMPLEMENT_PKCS11_STRUCT_ACCESSOR(s, k, f) \
+static const rb_data_type_t struct_##s##_##f##_obj_type = { \
+    "PKCS11::" #s "." #f, \
+    {0, 0, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
 static VALUE c##s##_get_##f(VALUE o){ \
   VALUE klass = rb_const_get(rb_const_get(rb_cObject, rb_intern("PKCS11")), rb_intern(#k)); \
-  return get_struct_inline(o, klass, #f, OFFSET_OF(s, f)); \
+  return get_struct_inline(o, klass, #f, OFFSET_OF(s, f), &struct_##s##_##f##_obj_type); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   VALUE klass = rb_const_get(rb_const_get(rb_cObject, rb_intern("PKCS11")), rb_intern(#k)); \
@@ -373,17 +398,29 @@ static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
 }
 
 #define PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(s, k, f) \
+static const rb_data_type_t struct_##s##_##f##_obj_type = { \
+    "PKCS11::" #s "." #f, \
+    {0, RUBY_DEFAULT_FREE, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
 static VALUE c##s##_get_##f(VALUE o){ \
-  return get_struct_ptr(o, c##k, #f, OFFSET_OF(s, f), sizeof(k)); \
+  return get_struct_ptr(o, c##k, #f, OFFSET_OF(s, f), sizeof(k), &struct_##s##_##f##_obj_type); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   return set_struct_ptr(o, c##k, #k, v, #f, OFFSET_OF(s, f)); \
 }
 
 #define PKCS11_IMPLEMENT_PKCS11_STRUCT_PTR_ACCESSOR(s, k, f) \
+static const rb_data_type_t struct_##s##_##f##_obj_type = { \
+    "PKCS11::" #s "." #f, \
+    {0, RUBY_DEFAULT_FREE, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
 static VALUE c##s##_get_##f(VALUE o){ \
   VALUE klass = rb_const_get(rb_const_get(rb_cObject, rb_intern("PKCS11")), rb_intern(#k)); \
-  return get_struct_ptr(o, klass, #f, OFFSET_OF(s, f), sizeof(k)); \
+  return get_struct_ptr(o, klass, #f, OFFSET_OF(s, f), sizeof(k), &struct_##s##_##f##_obj_type); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   VALUE klass = rb_const_get(rb_const_get(rb_cObject, rb_intern("PKCS11")), rb_intern(#k)); \
@@ -391,17 +428,29 @@ static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
 }
 
 #define PKCS11_IMPLEMENT_STRUCT_PTR_ARRAY_ACCESSOR(s, k, f, l) \
+static const rb_data_type_t struct_##s##_##f##_obj_type = { \
+    "PKCS11::" #s "." #f, \
+    {0, RUBY_DEFAULT_FREE, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
 static VALUE c##s##_get_##f(VALUE o){ \
-  return get_struct_ptr_array(o, c##k, OFFSET_OF(s, f), OFFSET_OF(s, l), sizeof(k)); \
+  return get_struct_ptr_array(o, c##k, OFFSET_OF(s, f), OFFSET_OF(s, l), sizeof(k), &struct_##s##_##f##_obj_type); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   return set_struct_ptr_array(o, c##k, #k, v, #f, OFFSET_OF(s, f), OFFSET_OF(s, l), sizeof(k)); \
 }
 
 #define PKCS11_IMPLEMENT_PKCS11_STRUCT_PTR_ARRAY_ACCESSOR(s, k, f, l) \
+static const rb_data_type_t struct_##s##_##f##_obj_type = { \
+    "PKCS11::" #s "." #f, \
+    {0, RUBY_DEFAULT_FREE, 0,}, \
+    0, 0, \
+    RUBY_TYPED_FREE_IMMEDIATELY, \
+}; \
 static VALUE c##s##_get_##f(VALUE o){ \
   VALUE klass = rb_const_get(rb_const_get(rb_cObject, rb_intern("PKCS11")), rb_intern(#k)); \
-  return get_struct_ptr_array(o, klass, OFFSET_OF(s, f), OFFSET_OF(s, l), sizeof(k)); \
+  return get_struct_ptr_array(o, klass, OFFSET_OF(s, f), OFFSET_OF(s, l), sizeof(k), &struct_##s##_##f##_obj_type); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   VALUE klass = rb_const_get(rb_const_get(rb_cObject, rb_intern("PKCS11")), rb_intern(#k)); \

data/ext/pk11_version.h

@@ -1,6 +1,6 @@
 #ifndef RUBY_PK11_VERSION_H
 #define RUBY_PK11_VERSION_H
 
-static const char *VERSION = "0.3.4";
+static const char *VERSION = "0.4.0";
 
 #endif

data/ext/pk11l.c

@@ -18,6 +18,8 @@
   #include <dlfcn.h>
 #endif
 
+#include "cryptoki_v2.h"
+
 
 ///////////////////////////////////////
 
@@ -55,11 +57,37 @@ static VALUE vRETURN_VALUES;
 
 #define PKCS11_DEFINE_METHOD(name, args) \
   rb_define_method(cPKCS11, #name, pkcs11_luna_##name, args);
-  
+
+typedef struct {
+  void *module;
+  CK_FUNCTION_LIST_PTR functions;
+  CK_SFNT_CA_FUNCTION_LIST_PTR sfnt_functions;
+} pkcs11_luna_ctx;
+
+static void
+pkcs11_luna_ctx_free(void *_ptr)
+{
+  pkcs11_luna_ctx *ctx = (pkcs11_luna_ctx *)_ptr;
+  free(ctx);
+}
+
+static size_t
+pkcs11_luna_ctx_memsize(const void *_ptr)
+{
+  return sizeof(pkcs11_luna_ctx);
+}
+
+static rb_data_type_t pkcs11_luna_ctx_type = {
+    "PKCS11::Luna::Library",
+    {0, pkcs11_luna_ctx_free, pkcs11_luna_ctx_memsize,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 #define GetFunction(obj, name, sval) \
 { \
   pkcs11_luna_ctx *ctx; \
-  Data_Get_Struct(obj, pkcs11_luna_ctx, ctx); \
+  TypedData_Get_Struct(obj, pkcs11_luna_ctx, &pkcs11_luna_ctx_type, ctx); \
   if (!ctx->sfnt_functions) rb_raise(eLunaError, "no function list"); \
   sval = (CK_##name)ctx->sfnt_functions->name; \
   if (!sval) rb_raise(eLunaError, #name " is not supported."); \
@@ -74,24 +102,17 @@ static VALUE vRETURN_VALUES;
   rv = params.retval; \
 }
 
-#include "cryptoki_v2.h"
-
 #include "pk11_struct_macros.h"
 #include "pk11_const_macros.h"
 #include "pk11_version.h"
 
 #include "pk11l_struct_impl.inc"
 
-typedef struct {
-  void *module;
-  CK_FUNCTION_LIST_PTR functions;
-  CK_SFNT_CA_FUNCTION_LIST_PTR sfnt_functions;
-} pkcs11_luna_ctx;
-
+NORETURN()
 static void
-pkcs11_luna_raise(VALUE self, CK_RV rv)
+pkcs11_luna_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(eLunaError, "method vendor_raise_on_return_value should never return");
 }
 
@@ -157,12 +178,6 @@ void * tbf_CA_LogExternal( void *data ){
 
 
 
-static void
-pkcs11_luna_ctx_free(pkcs11_luna_ctx *ctx)
-{
-  free(ctx);
-}
-
 //NOTE: Code commented out as it was decided to only support standard pkcs11 initially.l
 
 /*static VALUE
@@ -173,8 +188,8 @@ pkcs11_luna_CA_SetApplicationID(VALUE self, VALUE major, VALUE minor)
 
   GetFunction(self, CA_SetApplicationID, func);
   CallFunction(CA_SetApplicationID, func, rv, NUM2ULONG(major), NUM2ULONG(minor));
-  if(rv != CKR_OK) 
-  	pkcs11_luna_raise(self,rv);
+  if(rv != CKR_OK)
+  	pkcs11_luna_raise(self, rv, "CA_SetApplicationID");
   return self;
 }
 
@@ -187,7 +202,7 @@ pkcs11_luna_CA_OpenApplicationID(VALUE self, VALUE slot_id, VALUE major, VALUE m
   GetFunction(self, CA_OpenApplicationID, func);
   CallFunction(CA_OpenApplicationID, func, rv, NUM2ULONG(slot_id), NUM2ULONG(major), NUM2ULONG(minor));
   if(rv != CKR_OK)
-  	pkcs11_luna_raise(self,rv);
+  	pkcs11_luna_raise(self, rv, "CA_OpenApplicationID");
   return self;
 }
 
@@ -200,7 +215,7 @@ pkcs11_luna_CA_CloseApplicationID(VALUE self, VALUE slot_id, VALUE major, VALUE
   GetFunction(self, CA_CloseApplicationID, func);
   CallFunction(CA_CloseApplicationID, func, rv, NUM2ULONG(slot_id), NUM2ULONG(major), NUM2ULONG(minor));
   if(rv != CKR_OK)
-  	pkcs11_luna_raise(self,rv);
+  	pkcs11_luna_raise(self, rv, "CA_CloseApplicationID");
   return self;
 }*/
 
@@ -212,7 +227,7 @@ pkcs11_luna_CA_LogExternal(VALUE self, VALUE slot_id, VALUE session, VALUE messa
   GetFunction(self, CA_LogExternal, func);
   CallFunction(CA_LogExternal, func, rv, NUM2HANDLE(slot_id), NUM2HANDLE(session),
 			(CK_CHAR_PTR)RSTRING_PTR(message), RSTRING_LEN(message));
-  if(rv != CKR_OK) pkcs11_luna_raise(self,rv);
+  if(rv != CKR_OK) pkcs11_luna_raise(self, rv, "CA_LogExternal");
 
   return self;
 }*/
@@ -232,7 +247,7 @@ pkcs11_luna_CA_GetFunctionList(VALUE self)
   CK_RV rv;
   CK_CA_GetFunctionList func;
 
-  Data_Get_Struct(self, pkcs11_luna_ctx, ctx);
+  TypedData_Get_Struct(self, pkcs11_luna_ctx, &pkcs11_luna_ctx_type, ctx);
 #ifdef compile_for_windows
   func = (CK_CA_GetFunctionList)GetProcAddress(ctx->module, "CA_GetFunctionList");
   if(!func){
@@ -247,8 +262,8 @@ pkcs11_luna_CA_GetFunctionList(VALUE self)
   if(!func) rb_raise(eLunaError, "%sHERE", dlerror());
 #endif
   CallFunction(CA_GetFunctionList, func, rv, &(ctx->sfnt_functions));
-  if (rv != CKR_OK) 
-   	pkcs11_luna_raise(self, rv);
+  if (rv != CKR_OK)
+   	pkcs11_luna_raise(self, rv, "CA_GetFunctionList");
 
   return self;
 }
@@ -258,7 +273,7 @@ pkcs11_luna_s_alloc(VALUE self)
 {
   VALUE obj;
   pkcs11_luna_ctx *ctx;
-  obj = Data_Make_Struct(self, pkcs11_luna_ctx, 0, pkcs11_luna_ctx_free, ctx);
+  obj = TypedData_Make_Struct(self, pkcs11_luna_ctx, &pkcs11_luna_ctx_type, ctx);
   return obj;
 }
 
@@ -290,23 +305,26 @@ Init_pkcs11_luna_ext()
    *
    * Module to provide functionality for SafeNet's Luna HSMs  */
   mLuna = rb_define_module_under(mPKCS11, "Luna");
-  
+
   /* Document-class: PKCS11::Luna::Library
    *
    * Derived class for Luna Library  */
   cLibrary = rb_const_get(mPKCS11, rb_intern("Library"));
-  
+
   cPKCS11 = rb_define_class_under(mLuna, "Library", cLibrary);
-  
+
+  /* fetch parent struct for correct type checks of pkcs11_luna_ctx_type */
+  pkcs11_luna_ctx_type.parent = (const rb_data_type_t*)RB_NUM2ULL( rb_const_get( cPKCS11, rb_intern("PKCS11_CTX_TYPE") ));
+
   rb_define_alloc_func(cPKCS11, pkcs11_luna_s_alloc);
   rb_define_method(cPKCS11, "initialize", pkcs11_luna_initialize, -1);
-  
+
   PKCS11_DEFINE_METHOD(CA_GetFunctionList, 0);
   //PKCS11_DEFINE_METHOD(CA_LogExternal, 3);
   //PKCS11_DEFINE_METHOD(CA_SetApplicationID, 2);
   //PKCS11_DEFINE_METHOD(CA_OpenApplicationID, 3);
   //PKCS11_DEFINE_METHOD(CA_CloseApplicationID, 3);
-  
+
 
   /* Library version */
   rb_define_const( mLuna, "VERSION", rb_str_new2(VERSION) );

data/ext/std_structs.rb

@@ -1 +1 @@
-PKCS11_STD_STRUCTS = [:CStruct, :CK_ATTRIBUTE, :CK_MECHANISM, :CK_VERSION, :CK_INFO, :CK_SLOT_INFO, :CK_TOKEN_INFO, :CK_SESSION_INFO, :CK_DATE, :CK_MECHANISM_INFO, :CK_C_INITIALIZE_ARGS, :CK_RSA_PKCS_OAEP_PARAMS, :CK_RSA_PKCS_PSS_PARAMS, :CK_ECDH1_DERIVE_PARAMS, :CK_ECMQV_DERIVE_PARAMS, :CK_X9_42_DH1_DERIVE_PARAMS, :CK_X9_42_DH2_DERIVE_PARAMS, :CK_X9_42_MQV_DERIVE_PARAMS, :CK_KEA_DERIVE_PARAMS, :CK_RC2_CBC_PARAMS, :CK_RC2_MAC_GENERAL_PARAMS, :CK_RC5_PARAMS, :CK_RC5_CBC_PARAMS, :CK_RC5_MAC_GENERAL_PARAMS, :CK_DES_CBC_ENCRYPT_DATA_PARAMS, :CK_AES_CBC_ENCRYPT_DATA_PARAMS, :CK_SKIPJACK_PRIVATE_WRAP_PARAMS, :CK_SKIPJACK_RELAYX_PARAMS, :CK_PBE_PARAMS, :CK_KEY_WRAP_SET_OAEP_PARAMS, :CK_SSL3_RANDOM_DATA, :CK_SSL3_MASTER_KEY_DERIVE_PARAMS, :CK_SSL3_KEY_MAT_OUT, :CK_SSL3_KEY_MAT_PARAMS, :CK_WTLS_RANDOM_DATA, :CK_WTLS_MASTER_KEY_DERIVE_PARAMS, :CK_WTLS_PRF_PARAMS, :CK_WTLS_KEY_MAT_OUT, :CK_WTLS_KEY_MAT_PARAMS, :CK_CMS_SIG_PARAMS, :CK_KEY_DERIVATION_STRING_DATA, :CK_PKCS5_PBKD2_PARAMS, :CK_OTP_PARAM, :CK_OTP_PARAMS, :CK_OTP_SIGNATURE_INFO, :CK_KIP_PARAMS, :CK_AES_CTR_PARAMS, :CK_GCM_PARAMS, :CK_CCM_PARAMS, :CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS, :CK_ARIA_CBC_ENCRYPT_DATA_PARAMS, :CK_DSA_PARAMETER_GEN_PARAM, :CK_ECDH_AES_KEY_WRAP_PARAMS, :CK_RSA_AES_KEY_WRAP_PARAMS, :CK_TLS12_MASTER_KEY_DERIVE_PARAMS, :CK_TLS12_KEY_MAT_PARAMS, :CK_TLS_KDF_PARAMS, :CK_TLS_MAC_PARAMS, :CK_GOSTR3410_DERIVE_PARAMS, :CK_GOSTR3410_KEY_WRAP_PARAMS]
+PKCS11_STD_STRUCTS = [:CK_MECHANISM, :CK_VERSION, :CK_INFO, :CK_SLOT_INFO, :CK_TOKEN_INFO, :CK_SESSION_INFO, :CK_DATE, :CK_MECHANISM_INFO, :CK_C_INITIALIZE_ARGS, :CK_RSA_PKCS_OAEP_PARAMS, :CK_RSA_PKCS_PSS_PARAMS, :CK_ECDH1_DERIVE_PARAMS, :CK_ECMQV_DERIVE_PARAMS, :CK_X9_42_DH1_DERIVE_PARAMS, :CK_X9_42_DH2_DERIVE_PARAMS, :CK_X9_42_MQV_DERIVE_PARAMS, :CK_KEA_DERIVE_PARAMS, :CK_RC2_CBC_PARAMS, :CK_RC2_MAC_GENERAL_PARAMS, :CK_RC5_PARAMS, :CK_RC5_CBC_PARAMS, :CK_RC5_MAC_GENERAL_PARAMS, :CK_DES_CBC_ENCRYPT_DATA_PARAMS, :CK_AES_CBC_ENCRYPT_DATA_PARAMS, :CK_SKIPJACK_PRIVATE_WRAP_PARAMS, :CStruct, :CK_ATTRIBUTE, :CK_SKIPJACK_RELAYX_PARAMS, :CK_PBE_PARAMS, :CK_KEY_WRAP_SET_OAEP_PARAMS, :CK_SSL3_RANDOM_DATA, :CK_SSL3_MASTER_KEY_DERIVE_PARAMS, :CK_SSL3_KEY_MAT_OUT, :CK_SSL3_KEY_MAT_PARAMS, :CK_WTLS_RANDOM_DATA, :CK_WTLS_MASTER_KEY_DERIVE_PARAMS, :CK_WTLS_PRF_PARAMS, :CK_WTLS_KEY_MAT_OUT, :CK_WTLS_KEY_MAT_PARAMS, :CK_CMS_SIG_PARAMS, :CK_KEY_DERIVATION_STRING_DATA, :CK_PKCS5_PBKD2_PARAMS, :CK_OTP_PARAM, :CK_OTP_PARAMS, :CK_OTP_SIGNATURE_INFO, :CK_KIP_PARAMS, :CK_AES_CTR_PARAMS, :CK_GCM_PARAMS, :CK_CCM_PARAMS, :CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS, :CK_ARIA_CBC_ENCRYPT_DATA_PARAMS, :CK_DSA_PARAMETER_GEN_PARAM, :CK_ECDH_AES_KEY_WRAP_PARAMS, :CK_RSA_AES_KEY_WRAP_PARAMS, :CK_TLS12_MASTER_KEY_DERIVE_PARAMS, :CK_TLS12_KEY_MAT_PARAMS, :CK_TLS_KDF_PARAMS, :CK_TLS_MAC_PARAMS, :CK_GOSTR3410_DERIVE_PARAMS, :CK_GOSTR3410_KEY_WRAP_PARAMS]

data/lib/pkcs11_luna/extensions.rb

@@ -112,12 +112,12 @@ module Luna
       MechanismParameters[mech] || super
     end
 
-    def vendor_raise_on_return_value(rv)
+    def vendor_raise_on_return_value(rv, func)
       if ex=PKCS11::RETURN_VALUES[rv]
-        raise(ex, rv.to_s)
+        raise(ex, "#{func} returned #{rv}")
       end
       if ex=Luna::RETURN_VALUES[rv]
-        raise(ex, rv.to_s)
+        raise(ex, "#{func} returned #{rv}")
       end
       super
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkcs11_luna
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - SafeNet
@@ -10,26 +10,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBCjANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
-  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0yMjA0MTExMTMwNTNaFw0yMzA0MTExMTMwNTNaMD0xDjAMBgNVBAMMBWthbmlz
-  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
-  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
-  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
-  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
-  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
-  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBAILiaB/unSVBfX5n7uL8
-  veGGCOHuGYhCGqspb6mYiCx0dmV3RPRiEfGDLfzcXbHNx/3AjygcxH4Slr+pmaxr
-  04Xli3WurocnjoANSWqCwpHH3OhSVxFgBNrCa3OMWcIr0xKH+I7PXA80SXe0pzfg
-  ePjpzTY71j+rcyRJqWiU5/zwdUaCCelBJscxh/0IaNcz67ocCEMRj0n4m5HFEmZL
-  9zKkMZFoOjxRQjcL84QU7ZXnnFR5HG8nLw+NqWjo49W6MBQ9HGFda2tk3OpBhyWS
-  sc3NyOkGUGdfiee5VRG31Sh3LLON3YGED+zZAS+ZF6598y4vhv8MBLa1Oy357byC
-  tTg=
+  MIIDPDCCAiSgAwIBAgIBCTANBgkqhkiG9w0BAQsFADBEMQ0wCwYDVQQDDARsYXJz
+  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
+  GRYCZGUwHhcNMjYwNDAxMTg0ODAwWhcNMjcwNDAxMTg0ODAwWjBEMQ0wCwYDVQQD
+  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
+  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
+  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
+  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
+  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
+  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
+  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
+  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
+  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQsFAAOCAQEA
+  EjU6iOXhPs6VyCWOEzQvH0qFsS9bvSO6kAY/tiiM1GoMmrFf5aJcJwVGo5dUawAO
+  MtPRglzAXUg2PBjXMvdcbcmFVrx86WEtrpt4/VrRg+Sw10A5wwb/7gsmec7CPs5j
+  t40augLjTJVe2L+8vVEGXyhI33qGiQv6CFWrMhShdfRxLkEedCE/CS/xsbiOYidf
+  VeRnDP4Xd/mWfvi0E8t+OybXpljhmsElg/X9E3Ckr3I/U8xgtCUbfmWrGXXVG6+V
+  tJgAY1NWb91NFLi8hIuvg0jUtg6bVkw/m67U70Je/O+qMayhGi/lvdSicZL0y4Ly
+  lM5sbwRVBbcM4hV2A0XuHA==
   -----END CERTIFICATE-----
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkcs11
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '3.25'
 description: This module allows Ruby programs to use vendor extensions for SafeNet
   Luna.
 email:

metadata.gz.sig

@@ -1,3 +1,3 @@
-B�Y�����^LJyz7�u'�`�����q;d�g��i&E���f�*r�݆
,'H��S�ǧ�6������Cm"[l�v
-]�B�-v�v����
-*|�VL���a}���N1y1�@�7�/���K�-�PA�?���\�dr�G�����'���i����(���е#(o\m��8aܰ���p=�C`����}�(,�9I/���>���?������Mr����;�Gۍ�	h�aժ��	�B�f��+ӌ
+s�s�C�
+X -(WZ�
�&rp�Y���r�%|�����&n@V…]�d�j���^c�?�(��g�O�k�^tA�����K�a�A�VS��9�S�x��:��%�^�i�\�� �5o�:�j�K�������Ş��E����"��U�Zj,�	v�����$�ҷ 	��
+Umx*��
b��8\D���H��.�_�<�c-O���5t���Vv���U|