pkcs11 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0786837e9f9aeabeba59200bdfd2b8d4a4f4b1e1
+  data.tar.gz: c2f566795dfa8e5128f55c4a7605a13301d43228
+SHA512:
+  metadata.gz: 2a24a6e185e6831c53b12ef3c44fc1ee24e1ffbcac718067c1ed767e495873c50a94c3f1620f226474e936b16c34dffaa1255757ad8542e0eb2f20e2317f28a4
+  data.tar.gz: df9bed272288404d35b8aa9fccb62545712e8ed49ec4f07476701cd68cb5fa29d56fb49fb8faa61da17b8d77704f77c50dbfc7ebf1c9a8506fdd24cc6c7e0ccd

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.5 / 2015-01-26
+
+* Fix compatibility with Ruby-2.2
+* Add Ruby-2.1 and 2.2 to binary Windows gems.
+
 === 0.2.4 / 2013-04-05
 
 * Build and package binary x64 version for Windows in addition to x86.

data/README.rdoc

@@ -3,7 +3,7 @@
 = PKCS #11/Ruby Interface
 
 * Homepage: http://github.com/larskanis/pkcs11
-* API documentation: http://pkcs11.rubyforge.org/pkcs11/frames.html
+* API documentation: http://rubydoc.info/gems/pkcs11/frames
 
 This module allows Ruby programs to interface with "RSA Security Inc.
 PKCS #11 Cryptographic Token Interface (Cryptoki)".

data/Rakefile

@@ -39,7 +39,7 @@ hoe = Hoe.spec 'pkcs11' do
   self.rdoc_locations << "larskanis@rack.rubyforge.org:/var/www/gforge-projects/pkcs11/pkcs11/"
 end
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0'
+ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0:2.1.1:2.2.0'
 
 Rake::ExtensionTask.new('pkcs11_ext', hoe.spec) do |ext|
   ext.ext_dir = 'ext'
@@ -66,16 +66,16 @@ end
 file 'ext/pk11_thread_funcs.c' => 'ext/pk11_thread_funcs.h'
 file 'ext/pk11.h' => 'ext/pk11_thread_funcs.h'
 
-task 'copy:pkcs11_ext:i386-mingw32:1.9.3' do |t|
-  sh "i686-w64-mingw32-strip -S tmp/i386-mingw32/stage/lib/1.9/pkcs11_ext.so"
-end
-task 'copy:pkcs11_ext:i386-mingw32:2.0.0' do |t|
-  sh "i686-w64-mingw32-strip -S tmp/i386-mingw32/stage/lib/2.0/pkcs11_ext.so"
-end
-task 'copy:pkcs11_ext:x64-mingw32:2.0.0' do |t|
-  sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/2.0/pkcs11_ext.so"
-end
+# To reduce the gem file size strip mingw32 dlls before packaging
+ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
+  task "tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pkcs11_ext.so" do |t|
+    sh "i686-w64-mingw32-strip -S tmp/x86-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pkcs11_ext.so"
+  end
 
+  task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pkcs11_ext.so" do |t|
+    sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pkcs11_ext.so"
+  end
+end
 
 task :docs_of_vendor_extensions do
   Dir['pkcs11_*'].each do |dir|

data/ext/extconf.rb

@@ -3,5 +3,5 @@ require "mkmf"
 basedir = File.dirname(__FILE__)
 $CPPFLAGS += " -I \"#{basedir}/include\""
 have_func("rb_str_set_len")
-have_func("rb_thread_blocking_region")
+have_func("rb_thread_call_without_gvl")
 create_makefile("pkcs11_ext");

data/ext/generate_thread_funcs.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # This quick and dirty parser for PKCS#11 functions generates
-# wrapper functions for using rb_thread_blocking_region()
-# of Ruby 1.9.
+# wrapper functions for using rb_thread_call_without_gvl()
+# of Ruby 1.9+
 
 require 'optparse'
 
@@ -26,11 +26,11 @@ fd_decl.puts <<-EOT
   #ifndef #{options.decl.gsub(/[^\w]/, "_").upcase}
   #define #{options.decl.gsub(/[^\w]/, "_").upcase}
   #include "pk11.h"
-  #ifdef HAVE_RB_THREAD_BLOCKING_REGION
+  #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
 EOT
 fd_impl.puts <<-EOT
   #include #{File.basename(options.decl).inspect}
-  #ifdef HAVE_RB_THREAD_BLOCKING_REGION
+  #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
 EOT
 ARGV.each do |file_h|
   c_src = IO.read(file_h)
@@ -48,14 +48,14 @@ ARGV.each do |file_h|
         struct { #{ func_params.map{|f| f.type+" "+f.name+";"}.join } } params;
         CK_RV retval;
       };
-      VALUE tbf_#{func_name}( void *data );
-      
+      void * tbf_#{func_name}( void *data );
+
     EOT
     fd_impl.puts <<-EOT
-      VALUE tbf_#{func_name}( void *data ){
+      void * tbf_#{func_name}( void *data ){
         struct tbr_#{func_name}_params *p = (struct tbr_#{func_name}_params*)data;
         p->retval = p->func( #{func_params.map{|f| "p->params."+f.name}.join(",") } );
-        return Qnil;
+        return NULL;
       }
 
     EOT

data/ext/pk11.c

@@ -39,6 +39,11 @@ static VALUE aCK_MECHANISM_members;
 
 VALUE pkcs11_return_value_to_class(CK_RV, VALUE);
 
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
+         rb_unblock_function_t *ubf, void *data2);
+#endif
+
 static void
 pkcs11_raise(VALUE self, CK_RV rv)
 {
@@ -62,13 +67,13 @@ typedef struct {
   if (!sval) rb_raise(ePKCS11Error, #name " is not supported."); \
 }
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
   #define CallFunction(name, func, rv, ...) \
   { \
     struct tbr_##name##_params params = { \
       func, {__VA_ARGS__}, CKR_FUNCTION_FAILED \
     }; \
-    rb_thread_blocking_region(tbf_##name, &params, RUBY_UBF_PROCESS, 0); \
+    rb_thread_call_without_gvl(tbf_##name, &params, RUBY_UBF_PROCESS, NULL); \
     rv = params.retval; \
   }
 
@@ -158,7 +163,7 @@ pkcs11_load_library(VALUE self, VALUE path)
   const char *so_path;
   pkcs11_ctx *ctx;
 
-  so_path = StringValuePtr(path);
+  so_path = StringValueCStr(path);
   Data_Get_Struct(self, pkcs11_ctx, ctx);
 #ifdef compile_for_windows
   if((ctx->module = LoadLibrary(so_path)) == NULL) {
@@ -166,7 +171,7 @@ pkcs11_load_library(VALUE self, VALUE path)
     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, error_text);
+    rb_raise(ePKCS11Error, "%s", error_text);
   }
 #else
   if((ctx->module = dlopen(so_path, RTLD_NOW)) == NULL) {
@@ -199,7 +204,7 @@ pkcs11_C_GetFunctionList(VALUE self)
     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, error_text);
+    rb_raise(ePKCS11Error, "%s", error_text);
   }
 #else
   func = (CK_C_GetFunctionList)dlsym(ctx->module, "C_GetFunctionList");
@@ -375,7 +380,7 @@ pkcs11_C_InitToken(VALUE self, VALUE slot_id, VALUE pin, VALUE label)
   CK_C_InitToken func;
 
   StringValue(pin);
-  StringValue(label);
+  StringValueCStr(label);
   GetFunction(self, C_InitToken, func);
   CallFunction(C_InitToken, func, rv, NUM2HANDLE(slot_id),
             (CK_UTF8CHAR_PTR)RSTRING_PTR(pin), RSTRING_LEN(pin),

data/ext/pk11_thread_funcs.c

@@ -1,411 +1,411 @@
   #include "pk11_thread_funcs.h"
-  #ifdef HAVE_RB_THREAD_BLOCKING_REGION
-      VALUE tbf_C_Initialize( void *data ){
+  #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+      void * tbf_C_Initialize( void *data ){
         struct tbr_C_Initialize_params *p = (struct tbr_C_Initialize_params*)data;
         p->retval = p->func( p->params.pInitArgs );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Finalize( void *data ){
+      void * tbf_C_Finalize( void *data ){
         struct tbr_C_Finalize_params *p = (struct tbr_C_Finalize_params*)data;
         p->retval = p->func( p->params.pReserved );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetInfo( void *data ){
+      void * tbf_C_GetInfo( void *data ){
         struct tbr_C_GetInfo_params *p = (struct tbr_C_GetInfo_params*)data;
         p->retval = p->func( p->params.pInfo );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetFunctionList( void *data ){
+      void * tbf_C_GetFunctionList( void *data ){
         struct tbr_C_GetFunctionList_params *p = (struct tbr_C_GetFunctionList_params*)data;
         p->retval = p->func( p->params.ppFunctionList );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetSlotList( void *data ){
+      void * tbf_C_GetSlotList( void *data ){
         struct tbr_C_GetSlotList_params *p = (struct tbr_C_GetSlotList_params*)data;
         p->retval = p->func( p->params.tokenPresent,p->params.pSlotList,p->params.pulCount );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetSlotInfo( void *data ){
+      void * tbf_C_GetSlotInfo( void *data ){
         struct tbr_C_GetSlotInfo_params *p = (struct tbr_C_GetSlotInfo_params*)data;
         p->retval = p->func( p->params.slotID,p->params.pInfo );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetTokenInfo( void *data ){
+      void * tbf_C_GetTokenInfo( void *data ){
         struct tbr_C_GetTokenInfo_params *p = (struct tbr_C_GetTokenInfo_params*)data;
         p->retval = p->func( p->params.slotID,p->params.pInfo );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetMechanismList( void *data ){
+      void * tbf_C_GetMechanismList( void *data ){
         struct tbr_C_GetMechanismList_params *p = (struct tbr_C_GetMechanismList_params*)data;
         p->retval = p->func( p->params.slotID,p->params.pMechanismList,p->params.pulCount );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetMechanismInfo( void *data ){
+      void * tbf_C_GetMechanismInfo( void *data ){
         struct tbr_C_GetMechanismInfo_params *p = (struct tbr_C_GetMechanismInfo_params*)data;
         p->retval = p->func( p->params.slotID,p->params.type,p->params.pInfo );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_InitToken( void *data ){
+      void * tbf_C_InitToken( void *data ){
         struct tbr_C_InitToken_params *p = (struct tbr_C_InitToken_params*)data;
         p->retval = p->func( p->params.slotID,p->params.pPin,p->params.ulPinLen,p->params.pLabel );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_InitPIN( void *data ){
+      void * tbf_C_InitPIN( void *data ){
         struct tbr_C_InitPIN_params *p = (struct tbr_C_InitPIN_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pPin,p->params.ulPinLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SetPIN( void *data ){
+      void * tbf_C_SetPIN( void *data ){
         struct tbr_C_SetPIN_params *p = (struct tbr_C_SetPIN_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pOldPin,p->params.ulOldLen,p->params.pNewPin,p->params.ulNewLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_OpenSession( void *data ){
+      void * tbf_C_OpenSession( void *data ){
         struct tbr_C_OpenSession_params *p = (struct tbr_C_OpenSession_params*)data;
         p->retval = p->func( p->params.slotID,p->params.flags,p->params.pApplication,p->params.Notify,p->params.phSession );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_CloseSession( void *data ){
+      void * tbf_C_CloseSession( void *data ){
         struct tbr_C_CloseSession_params *p = (struct tbr_C_CloseSession_params*)data;
         p->retval = p->func( p->params.hSession );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_CloseAllSessions( void *data ){
+      void * tbf_C_CloseAllSessions( void *data ){
         struct tbr_C_CloseAllSessions_params *p = (struct tbr_C_CloseAllSessions_params*)data;
         p->retval = p->func( p->params.slotID );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetSessionInfo( void *data ){
+      void * tbf_C_GetSessionInfo( void *data ){
         struct tbr_C_GetSessionInfo_params *p = (struct tbr_C_GetSessionInfo_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pInfo );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetOperationState( void *data ){
+      void * tbf_C_GetOperationState( void *data ){
         struct tbr_C_GetOperationState_params *p = (struct tbr_C_GetOperationState_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pOperationState,p->params.pulOperationStateLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SetOperationState( void *data ){
+      void * tbf_C_SetOperationState( void *data ){
         struct tbr_C_SetOperationState_params *p = (struct tbr_C_SetOperationState_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pOperationState,p->params.ulOperationStateLen,p->params.hEncryptionKey,p->params.hAuthenticationKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Login( void *data ){
+      void * tbf_C_Login( void *data ){
         struct tbr_C_Login_params *p = (struct tbr_C_Login_params*)data;
         p->retval = p->func( p->params.hSession,p->params.userType,p->params.pPin,p->params.ulPinLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Logout( void *data ){
+      void * tbf_C_Logout( void *data ){
         struct tbr_C_Logout_params *p = (struct tbr_C_Logout_params*)data;
         p->retval = p->func( p->params.hSession );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_CreateObject( void *data ){
+      void * tbf_C_CreateObject( void *data ){
         struct tbr_C_CreateObject_params *p = (struct tbr_C_CreateObject_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pTemplate,p->params.ulCount,p->params.phObject );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_CopyObject( void *data ){
+      void * tbf_C_CopyObject( void *data ){
         struct tbr_C_CopyObject_params *p = (struct tbr_C_CopyObject_params*)data;
         p->retval = p->func( p->params.hSession,p->params.hObject,p->params.pTemplate,p->params.ulCount,p->params.phNewObject );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DestroyObject( void *data ){
+      void * tbf_C_DestroyObject( void *data ){
         struct tbr_C_DestroyObject_params *p = (struct tbr_C_DestroyObject_params*)data;
         p->retval = p->func( p->params.hSession,p->params.hObject );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetObjectSize( void *data ){
+      void * tbf_C_GetObjectSize( void *data ){
         struct tbr_C_GetObjectSize_params *p = (struct tbr_C_GetObjectSize_params*)data;
         p->retval = p->func( p->params.hSession,p->params.hObject,p->params.pulSize );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetAttributeValue( void *data ){
+      void * tbf_C_GetAttributeValue( void *data ){
         struct tbr_C_GetAttributeValue_params *p = (struct tbr_C_GetAttributeValue_params*)data;
         p->retval = p->func( p->params.hSession,p->params.hObject,p->params.pTemplate,p->params.ulCount );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SetAttributeValue( void *data ){
+      void * tbf_C_SetAttributeValue( void *data ){
         struct tbr_C_SetAttributeValue_params *p = (struct tbr_C_SetAttributeValue_params*)data;
         p->retval = p->func( p->params.hSession,p->params.hObject,p->params.pTemplate,p->params.ulCount );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_FindObjectsInit( void *data ){
+      void * tbf_C_FindObjectsInit( void *data ){
         struct tbr_C_FindObjectsInit_params *p = (struct tbr_C_FindObjectsInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pTemplate,p->params.ulCount );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_FindObjects( void *data ){
+      void * tbf_C_FindObjects( void *data ){
         struct tbr_C_FindObjects_params *p = (struct tbr_C_FindObjects_params*)data;
         p->retval = p->func( p->params.hSession,p->params.phObject,p->params.ulMaxObjectCount,p->params.pulObjectCount );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_FindObjectsFinal( void *data ){
+      void * tbf_C_FindObjectsFinal( void *data ){
         struct tbr_C_FindObjectsFinal_params *p = (struct tbr_C_FindObjectsFinal_params*)data;
         p->retval = p->func( p->params.hSession );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_EncryptInit( void *data ){
+      void * tbf_C_EncryptInit( void *data ){
         struct tbr_C_EncryptInit_params *p = (struct tbr_C_EncryptInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Encrypt( void *data ){
+      void * tbf_C_Encrypt( void *data ){
         struct tbr_C_Encrypt_params *p = (struct tbr_C_Encrypt_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pData,p->params.ulDataLen,p->params.pEncryptedData,p->params.pulEncryptedDataLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_EncryptUpdate( void *data ){
+      void * tbf_C_EncryptUpdate( void *data ){
         struct tbr_C_EncryptUpdate_params *p = (struct tbr_C_EncryptUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pPart,p->params.ulPartLen,p->params.pEncryptedPart,p->params.pulEncryptedPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_EncryptFinal( void *data ){
+      void * tbf_C_EncryptFinal( void *data ){
         struct tbr_C_EncryptFinal_params *p = (struct tbr_C_EncryptFinal_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pLastEncryptedPart,p->params.pulLastEncryptedPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DecryptInit( void *data ){
+      void * tbf_C_DecryptInit( void *data ){
         struct tbr_C_DecryptInit_params *p = (struct tbr_C_DecryptInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Decrypt( void *data ){
+      void * tbf_C_Decrypt( void *data ){
         struct tbr_C_Decrypt_params *p = (struct tbr_C_Decrypt_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pEncryptedData,p->params.ulEncryptedDataLen,p->params.pData,p->params.pulDataLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DecryptUpdate( void *data ){
+      void * tbf_C_DecryptUpdate( void *data ){
         struct tbr_C_DecryptUpdate_params *p = (struct tbr_C_DecryptUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pEncryptedPart,p->params.ulEncryptedPartLen,p->params.pPart,p->params.pulPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DecryptFinal( void *data ){
+      void * tbf_C_DecryptFinal( void *data ){
         struct tbr_C_DecryptFinal_params *p = (struct tbr_C_DecryptFinal_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pLastPart,p->params.pulLastPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DigestInit( void *data ){
+      void * tbf_C_DigestInit( void *data ){
         struct tbr_C_DigestInit_params *p = (struct tbr_C_DigestInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Digest( void *data ){
+      void * tbf_C_Digest( void *data ){
         struct tbr_C_Digest_params *p = (struct tbr_C_Digest_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pData,p->params.ulDataLen,p->params.pDigest,p->params.pulDigestLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DigestUpdate( void *data ){
+      void * tbf_C_DigestUpdate( void *data ){
         struct tbr_C_DigestUpdate_params *p = (struct tbr_C_DigestUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pPart,p->params.ulPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DigestKey( void *data ){
+      void * tbf_C_DigestKey( void *data ){
         struct tbr_C_DigestKey_params *p = (struct tbr_C_DigestKey_params*)data;
         p->retval = p->func( p->params.hSession,p->params.hKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DigestFinal( void *data ){
+      void * tbf_C_DigestFinal( void *data ){
         struct tbr_C_DigestFinal_params *p = (struct tbr_C_DigestFinal_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pDigest,p->params.pulDigestLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SignInit( void *data ){
+      void * tbf_C_SignInit( void *data ){
         struct tbr_C_SignInit_params *p = (struct tbr_C_SignInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Sign( void *data ){
+      void * tbf_C_Sign( void *data ){
         struct tbr_C_Sign_params *p = (struct tbr_C_Sign_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pData,p->params.ulDataLen,p->params.pSignature,p->params.pulSignatureLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SignUpdate( void *data ){
+      void * tbf_C_SignUpdate( void *data ){
         struct tbr_C_SignUpdate_params *p = (struct tbr_C_SignUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pPart,p->params.ulPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SignFinal( void *data ){
+      void * tbf_C_SignFinal( void *data ){
         struct tbr_C_SignFinal_params *p = (struct tbr_C_SignFinal_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pSignature,p->params.pulSignatureLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SignRecoverInit( void *data ){
+      void * tbf_C_SignRecoverInit( void *data ){
         struct tbr_C_SignRecoverInit_params *p = (struct tbr_C_SignRecoverInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SignRecover( void *data ){
+      void * tbf_C_SignRecover( void *data ){
         struct tbr_C_SignRecover_params *p = (struct tbr_C_SignRecover_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pData,p->params.ulDataLen,p->params.pSignature,p->params.pulSignatureLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_VerifyInit( void *data ){
+      void * tbf_C_VerifyInit( void *data ){
         struct tbr_C_VerifyInit_params *p = (struct tbr_C_VerifyInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_Verify( void *data ){
+      void * tbf_C_Verify( void *data ){
         struct tbr_C_Verify_params *p = (struct tbr_C_Verify_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pData,p->params.ulDataLen,p->params.pSignature,p->params.ulSignatureLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_VerifyUpdate( void *data ){
+      void * tbf_C_VerifyUpdate( void *data ){
         struct tbr_C_VerifyUpdate_params *p = (struct tbr_C_VerifyUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pPart,p->params.ulPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_VerifyFinal( void *data ){
+      void * tbf_C_VerifyFinal( void *data ){
         struct tbr_C_VerifyFinal_params *p = (struct tbr_C_VerifyFinal_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pSignature,p->params.ulSignatureLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_VerifyRecoverInit( void *data ){
+      void * tbf_C_VerifyRecoverInit( void *data ){
         struct tbr_C_VerifyRecoverInit_params *p = (struct tbr_C_VerifyRecoverInit_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_VerifyRecover( void *data ){
+      void * tbf_C_VerifyRecover( void *data ){
         struct tbr_C_VerifyRecover_params *p = (struct tbr_C_VerifyRecover_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pSignature,p->params.ulSignatureLen,p->params.pData,p->params.pulDataLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DigestEncryptUpdate( void *data ){
+      void * tbf_C_DigestEncryptUpdate( void *data ){
         struct tbr_C_DigestEncryptUpdate_params *p = (struct tbr_C_DigestEncryptUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pPart,p->params.ulPartLen,p->params.pEncryptedPart,p->params.pulEncryptedPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DecryptDigestUpdate( void *data ){
+      void * tbf_C_DecryptDigestUpdate( void *data ){
         struct tbr_C_DecryptDigestUpdate_params *p = (struct tbr_C_DecryptDigestUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pEncryptedPart,p->params.ulEncryptedPartLen,p->params.pPart,p->params.pulPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SignEncryptUpdate( void *data ){
+      void * tbf_C_SignEncryptUpdate( void *data ){
         struct tbr_C_SignEncryptUpdate_params *p = (struct tbr_C_SignEncryptUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pPart,p->params.ulPartLen,p->params.pEncryptedPart,p->params.pulEncryptedPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DecryptVerifyUpdate( void *data ){
+      void * tbf_C_DecryptVerifyUpdate( void *data ){
         struct tbr_C_DecryptVerifyUpdate_params *p = (struct tbr_C_DecryptVerifyUpdate_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pEncryptedPart,p->params.ulEncryptedPartLen,p->params.pPart,p->params.pulPartLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GenerateKey( void *data ){
+      void * tbf_C_GenerateKey( void *data ){
         struct tbr_C_GenerateKey_params *p = (struct tbr_C_GenerateKey_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.pTemplate,p->params.ulCount,p->params.phKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GenerateKeyPair( void *data ){
+      void * tbf_C_GenerateKeyPair( void *data ){
         struct tbr_C_GenerateKeyPair_params *p = (struct tbr_C_GenerateKeyPair_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.pPublicKeyTemplate,p->params.ulPublicKeyAttributeCount,p->params.pPrivateKeyTemplate,p->params.ulPrivateKeyAttributeCount,p->params.phPublicKey,p->params.phPrivateKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_WrapKey( void *data ){
+      void * tbf_C_WrapKey( void *data ){
         struct tbr_C_WrapKey_params *p = (struct tbr_C_WrapKey_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hWrappingKey,p->params.hKey,p->params.pWrappedKey,p->params.pulWrappedKeyLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_UnwrapKey( void *data ){
+      void * tbf_C_UnwrapKey( void *data ){
         struct tbr_C_UnwrapKey_params *p = (struct tbr_C_UnwrapKey_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hUnwrappingKey,p->params.pWrappedKey,p->params.ulWrappedKeyLen,p->params.pTemplate,p->params.ulAttributeCount,p->params.phKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_DeriveKey( void *data ){
+      void * tbf_C_DeriveKey( void *data ){
         struct tbr_C_DeriveKey_params *p = (struct tbr_C_DeriveKey_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pMechanism,p->params.hBaseKey,p->params.pTemplate,p->params.ulAttributeCount,p->params.phKey );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_SeedRandom( void *data ){
+      void * tbf_C_SeedRandom( void *data ){
         struct tbr_C_SeedRandom_params *p = (struct tbr_C_SeedRandom_params*)data;
         p->retval = p->func( p->params.hSession,p->params.pSeed,p->params.ulSeedLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GenerateRandom( void *data ){
+      void * tbf_C_GenerateRandom( void *data ){
         struct tbr_C_GenerateRandom_params *p = (struct tbr_C_GenerateRandom_params*)data;
         p->retval = p->func( p->params.hSession,p->params.RandomData,p->params.ulRandomLen );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_GetFunctionStatus( void *data ){
+      void * tbf_C_GetFunctionStatus( void *data ){
         struct tbr_C_GetFunctionStatus_params *p = (struct tbr_C_GetFunctionStatus_params*)data;
         p->retval = p->func( p->params.hSession );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_CancelFunction( void *data ){
+      void * tbf_C_CancelFunction( void *data ){
         struct tbr_C_CancelFunction_params *p = (struct tbr_C_CancelFunction_params*)data;
         p->retval = p->func( p->params.hSession );
-        return Qnil;
+        return NULL;
       }
 
-      VALUE tbf_C_WaitForSlotEvent( void *data ){
+      void * tbf_C_WaitForSlotEvent( void *data ){
         struct tbr_C_WaitForSlotEvent_params *p = (struct tbr_C_WaitForSlotEvent_params*)data;
         p->retval = p->func( p->params.flags,p->params.pSlot,p->params.pRserved );
-        return Qnil;
+        return NULL;
       }
 
   #endif