pkcs11 0.2.6 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20e09104f3d3d4612707a80a370726b048de1c78
-  data.tar.gz: 423e7a843678a770b76d486478a18925ff428ee0
+SHA256:
+  metadata.gz: 0fb60ecaa0300930499d7783396ff4f471174f6bca63a97082208baaa9d3521b
+  data.tar.gz: c3019089cd8d0a8c2aed6d11f8a3f3b55d688c199ea62fb85b385e195e98494c
 SHA512:
-  metadata.gz: d4dae807594372b47a5b006619936630c63e07c55f9fc0f7d82db5a4d4a2b1c5f4e23e3eab4c219f5a10ee65a485f1e428c796f4009c35507c37a84b33798667
-  data.tar.gz: 297c34351e2014ea8f9416a84f7c3b9a9b1843bc579ef6e40b89f6fe23318de20c5d58ce5c0f9498af3a3dde08a540bef24f25d84960968d67574e65b357acde
+  metadata.gz: d3f00f7d6fa0b386477b06de8e1fe30257f0fb4e625c7661ca90bad46fee20449d3f2b17ce71c132f11c3f2d11ed2aa8e27cbfb8c6000cb33d23c4a10d6a2aee
+  data.tar.gz: af86c163e05b8d7e850563fa724901bad4a6ed395a712b2c7f6a0a5dfc1c65352bd729d0f722d00b52db33f19bd8e4884d3ac26cbf5eda8f3c6db0c2bdfb6d73

data/.appveyor.yml

@@ -0,0 +1,44 @@
+install:
+  - SET PATH=C:/Ruby%ruby_version%/bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - ps: |
+      if ($env:ruby_version -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
+      }
+  - ruby --version
+  - gem --version
+  - bundle install
+
+  # When running ruby-x86, we make use of the softokn3.dll that is part of the
+  # pre-installed firefox. The test helper will find it automatically.
+  # When running ruby-x64, we equally need a 64 bit softokn3.dll to test against.
+  # However it is not part of any installed software on Appveyor,
+  # so we download and install a 64 bit firefox version and use it's softokn3.dll.
+  - ps: |
+      if ($env:ruby_version -like "*x64*") {
+        $(new-object net.webclient).DownloadFile('http://ftp.mozilla.org/pub/firefox/releases/68.3.0esr/win64/en-US/Firefox%20Setup%2068.3.0esr.exe', 'C:/firefox-setup.exe')
+        $env:SOFTOKN_PATH = 'C:/Program Files/Mozilla Firefox/softokn3.dll'
+        $env:PATH = 'C:/Program Files/Mozilla Firefox;' + $env:PATH
+      } else {
+        $(new-object net.webclient).DownloadFile('http://ftp.mozilla.org/pub/firefox/releases/68.3.0esr/win32/en-US/Firefox%20Setup%2068.3.0esr.exe', 'C:/firefox-setup.exe')
+        $env:SOFTOKN_PATH = 'C:/Program Files (x86)/Mozilla Firefox/softokn3.dll'
+        $env:PATH = 'C:/Program Files (x86)/Mozilla Firefox;' + $env:PATH
+      }
+      cmd /c "C:/firefox-setup.exe" -ms
+
+build: off
+
+test_script:
+  - bundle exec rake compile test gem
+
+environment:
+  matrix:
+    - ruby_version: head-x64
+      RUBY_DLL_PATH: "C:/Program Files/Mozilla Firefox"
+    - ruby_version: "25"
+      RUBY_DLL_PATH: "C:/Program Files (x86)/Mozilla Firefox"
+    - ruby_version: "24-x64"
+      RUBY_DLL_PATH: "C:/Program Files/Mozilla Firefox"
+    - ruby_version: "22"
+    - ruby_version: "23-x64"

data/.gitignore

@@ -0,0 +1,25 @@
+ext/pk11_const_def.inc
+ext/pk11_struct.doc
+ext/pk11_struct_def.inc
+ext/pk11_struct_impl.inc
+ext/pk11_thread_funcs.c
+ext/pk11_thread_funcs.h
+pkcs11_luna/ext/generate_constants.rb
+pkcs11_luna/ext/generate_structs.rb
+pkcs11_luna/ext/pk11_const_macros.h
+pkcs11_luna/ext/pk11_struct_macros.h
+pkcs11_luna/ext/pk11_version.h
+pkcs11_luna/ext/std_structs.rb
+pkcs11_luna/pkg/
+pkcs11_protect_server/ext/generate_constants.rb
+pkcs11_protect_server/ext/generate_structs.rb
+pkcs11_protect_server/ext/pk11_const_macros.h
+pkcs11_protect_server/ext/pk11_struct_macros.h
+pkcs11_protect_server/ext/pk11_version.h
+pkcs11_protect_server/ext/std_structs.rb
+pkcs11_protect_server/pkg/
+*.so
+Gemfile.lock
+tmp
+Manifest.txt
+pkg/

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 sudo: false
 rvm:
-  - "1.9.3"
-  - "2.2.0"
-  - rbx
+  - "2.2"
+  - "2.5.7"
+  - "ruby-head"
+  - truffleruby
 matrix:
   allow_failures:
-    - rvm: rbx
+    - rvm: truffleruby
 script: bundle exec rake compile test gem

data/Gemfile

@@ -5,12 +5,12 @@
 source "https://rubygems.org/"
 
 
-gem "yard", ">=0.6", :group => [:development, :test]
+gem "yard", "~>0.6", :group => [:development, :test]
 gem "rake-compiler", "~>1.0", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.6.0", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.6.2", :group => [:development, :test]
 gem "minitest", "~>5.7", :group => [:development, :test]
 gem "hoe-bundler", "~>1.0", :group => [:development, :test]
-gem "rdoc", "~>4.0", :group => [:development, :test]
-gem "hoe", "~>3.16", :group => [:development, :test]
+gem "rdoc", ">=4.0", "<7", :group => [:development, :test]
+gem "hoe", "~>3.22", :group => [:development, :test]
 
 # vim: syntax=ruby

data/History.txt

@@ -1,3 +1,35 @@
+=== 0.3.3 / 2020-11-07
+
+* Fix possible segfault on GC pressure at startup
+* Move CI from http://travis-ci.org to https://travis-ci.com
+
+=== 0.3.2 / 2020-01-12
+
+* pkcs11_protect_server, pkcs11_luna: Move parsing of vendor header files to gem installation.
+  This fixes possible compile errors, if the version of vendor header files differ between gem build and gem install.
+* pkcs11_luna: Workaround invalid UTF-8 encoding in cryptoki_v2.h of some Luna Client versions.
+
+=== 0.3.1 / 2020-01-07
+
+* Fix compilation issue with newer Luna client library. #11
+
+=== 0.3.0 / 2019-12-05
+
+* Change hash style in documentation and tests.
+  It was kind of {:LABEL => value} and is now {LABEL: value}
+* Implement proper String encoding support.
+  Now strings retrieved as attribute values and from struct members
+  are tagged with binary, ASCII or UTF8 encoding.
+* Remove compatibility to rubies < 2.2.
+* Add support for TruffleRuby
+
+=== 0.2.7 / 2018-01-05
+
+* Add vendor extension for Safenet Luna called pkcs11_luna.
+* Fix warnings to Fixnum/Bignum in Ruby-2.4+.
+* Add binary Windows gems for Ruby-2.5.
+* Add a note about RUBY_DLL_PATH on Windows.
+
 === 0.2.6 / 2017-06-07
 
 * Update pkcs11 header files to PKCS11-v2.4.

data/README.rdoc

@@ -1,10 +1,10 @@
-{<img src="https://travis-ci.org/larskanis/pkcs11.png?branch=master" alt="Build Status" />}[https://travis-ci.org/larskanis/pkcs11]
-{<img src="https://ci.appveyor.com/api/projects/status/8m7ugl1ogijw1c8c?svg=true" alt="Build Status" />}[https://ci.appveyor.com/project/larskanis/pkcs11]
-
 = PKCS #11/Ruby Interface
 
-* Homepage: http://github.com/larskanis/pkcs11
-* API documentation: http://rubydoc.info/gems/pkcs11/frames
+home :: http://github.com/larskanis/pkcs11
+API documentation :: http://rubydoc.info/gems/pkcs11/frames
+
+{<img src="https://travis-ci.com/larskanis/pkcs11.svg?branch=master" alt="Build Status" />}[https://travis-ci.com/larskanis/pkcs11]
+{<img src="https://ci.appveyor.com/api/projects/status/8m7ugl1ogijw1c8c?svg=true" alt="Build Status" />}[https://ci.appveyor.com/project/larskanis/pkcs11]
 
 This module allows Ruby programs to interface with "RSA Security Inc.
 PKCS #11 Cryptographic Token Interface (Cryptoki)".
@@ -43,8 +43,8 @@ While this seems to be true for C, it shouldn't for Ruby.
   pkcs11.active_slots.first.open do |session|
     session.login(:USER, "1234")
     secret_key = session.generate_key(:DES2_KEY_GEN,
-      :ENCRYPT=>true, :DECRYPT=>true, :SENSITIVE=>true, :TOKEN=>true, :LABEL=>'my key')
-    cryptogram = session.encrypt( {:DES3_CBC_PAD=>"\0"*8}, secret_key, "some plaintext")
+      ENCRYPT: true, DECRYPT: true, SENSITIVE: true, TOKEN: true, LABEL: 'my key')
+    cryptogram = session.encrypt( {DES3_CBC_PAD: "\0"*8}, secret_key, "some plaintext")
     session.logout
   end
 
@@ -64,13 +64,12 @@ Browsable HTML can be found at http://www.cryptsoft.com/pkcs11doc.
 === Vendor extensions
 Some vendors extend their libraries beyond the standard, in it's own way.
 This can be used by vendor specific packages:
-* Safenet ProtectServer: {file:pkcs11_protect_server/README_PROTECT_SERVER.rdoc}
-* Safenet Luna: {file:pkcs11_luna/README_LUNA.rdoc}
+* Safenet ProtectServer: {http://www.rubydoc.info/gems/pkcs11_protect_server/}
+* Safenet Luna: {http://www.rubydoc.info/gems/pkcs11_luna/}
 
 === Threading
 
-The pkcs11 binding fully supports native, background Ruby threads.
-This of course only applies to Rubinius and Ruby 1.9 or higher since earlier versions of Ruby do not support native threads.
+The pkcs11 binding fully supports background Ruby threads while calls to PKCS#11 functions.
 
 According to the standard, calling the Cryptoki library from multiple threads simultaneously, requires to open it with flag PKCS11::CKF_OS_LOCKING_OK.
 Application-supplied synchronization primitives (CreateMutex, DestroyMutex, LockMutex, UnlockMutex) are not supported.
@@ -78,7 +77,7 @@ Application-supplied synchronization primitives (CreateMutex, DestroyMutex, Lock
 
 == Compiling for Windows
 
-The pkcs11 source gem can be built on Windows (with help of the RubyInstaller's DevKit[http://rubyinstaller.org/add-ons/devkit/] ) .
+The pkcs11 source gem can be built on Windows (with help of the RubyInstaller's DevKit[http://rubyinstaller.org/add-ons/devkit] ) .
 Use
 
     $ gem install pkcs11 --platform=ruby
@@ -96,9 +95,7 @@ If everything works, there should be some files kind of pkcs11-VERSION-ARCH-ming
 
 == ToDo
 
-* encoding support for Ruby 1.9+
 * support for proprietary extensions of other vendors
-* full support for PKCS#11 v2.40
 
 == Development Status
 

data/Rakefile

@@ -24,17 +24,22 @@ Hoe.plugin :bundler
 # Build a Manifest file to satisfy hoe.
 IO.write("Manifest.txt", `git ls-files`)
 
+# Ensure pkg is rebuilt
+task :remove_pkg do
+  rm_rf 'pkg'
+end
+task :gem => [:remove_pkg]
+
 hoe = Hoe.spec 'pkcs11' do
   developer('Ryosuke Kutsuna', 'ryosuke@deer-n-horse.jp')
   developer('GOTOU Yuuzou', 'gotoyuzo@notwork.org')
   developer('Lars Kanis', 'kanis@comcard.de')
-  extra_dev_deps << ['yard', '>= 0.6']
+  extra_dev_deps << ['yard', '~> 0.6']
   extra_dev_deps << ['rake-compiler', '~> 1.0']
-  extra_dev_deps << ['rake-compiler-dock', '~> 0.6.0']
+  extra_dev_deps << ['rake-compiler-dock', '~> 0.6.2']
   extra_dev_deps << ['minitest', '~> 5.7']
   extra_dev_deps << ['hoe-bundler', '~> 1.0']
 
-  self.urls = ['http://github.com/larskanis/pkcs11']
   self.summary = 'PKCS#11 binding for Ruby'
   self.description = 'This module allows Ruby programs to interface with "RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki)".'
 
@@ -43,7 +48,7 @@ hoe = Hoe.spec 'pkcs11' do
   spec_extras[:extensions] = 'ext/extconf.rb'
   spec_extras[:files] = `git ls-files`.split("\n").reject{|f| f=~/^pkcs11_/ }
   spec_extras[:files] += GENERATED_FILES
-  spec_extras[:has_rdoc] = 'yard'
+  spec_extras[:required_ruby_version] = '>= 2.2.0'
   self.rdoc_locations << "http://www.rubydoc.info/gems/pkcs11"
 end
 
@@ -100,13 +105,13 @@ task :docs_of_vendor_extensions do
 end
 
 desc "Generate static HTML documentation with YARD"
-task :yardoc=>['ext/pk11_struct.doc', :docs_of_vendor_extensions] do
+task yardoc: ['ext/pk11_struct.doc', :docs_of_vendor_extensions] do
   luna_docs = "pkcs11_luna/lib/**/*.rb pkcs11_luna/ext/*.c pkcs11_luna/ext/*.doc"
   sh "yardoc --title \"PKCS#11/Ruby Interface\" --no-private lib/**/*.rb ext/*.c ext/*.doc pkcs11_protect_server/lib/**/*.rb pkcs11_protect_server/ext/*.c pkcs11_protect_server/ext/*.doc #{luna_docs} - pkcs11_protect_server/README_PROTECT_SERVER.rdoc pkcs11_luna/README_LUNA.rdoc"
 end
 
 desc "Publish YARD to wherever you want."
-task :publish_yard => [:yardoc] do
+task publish_yard:  [:yardoc] do
   rdoc_locations = hoe.rdoc_locations
   warn "no rdoc_location values" if rdoc_locations.empty?
   rdoc_locations.each do |dest|

data/ext/extconf.rb

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

data/ext/generate_constants.rb

@@ -12,7 +12,7 @@ class ConstantParser
   def self.run(argv)
     s = self.new
     options = Struct.new(:verbose, :const, :files).new
-    OptionParser.new(argv) do |opts|
+    OptionParser.new do |opts|
       opts.banner = "Usage: #{$0} [options] <header-file.h>*"
 
       opts.on("-v", "--[no-]verbose", "Run verbosely", &options.method(:verbose=))
@@ -21,7 +21,7 @@ class ConstantParser
         puts opts
         exit
       end
-    end.parse!
+    end.parse!(argv)
     options.files = argv
     s.options = options
     s.start!

data/ext/generate_structs.rb

@@ -15,7 +15,7 @@ class StructParser
   def self.run(argv)
     s = self.new
     options = Struct.new(:verbose, :def, :impl, :doc, :files).new
-    OptionParser.new(argv) do |opts|
+    OptionParser.new do |opts|
       opts.banner = "Usage: #{$0} [options] <header-file.h>*"
 
       opts.on("-v", "--[no-]verbose", "Run verbosely", &options.method(:verbose=))
@@ -26,7 +26,7 @@ class StructParser
         puts opts
         exit
       end
-    end.parse!
+    end.parse!(argv)
     options.files = argv
     s.options = options
     s.start!
@@ -111,20 +111,26 @@ class StructParser
       end
       # find string attributes belonging together
       struct.attrs.select{|attr| ['CK_BYTE_PTR', 'CK_VOID_PTR', 'CK_UTF8CHAR_PTR', 'CK_CHAR_PTR'].include?(attr.type) }.each do |attr|
+        enco = case attr.type
+          when 'CK_UTF8CHAR_PTR' then 'utf8'
+          when 'CK_CHAR_PTR' then 'usascii'
+          when 'CK_BYTE_PTR', 'CK_VOID_PTR' then 'ascii8bit'
+          else raise "unexpected type #{attr.type.inspect}"
+        end
         if len_attr=struct.attr_by_sign("CK_ULONG #{attr.name.gsub(/^p([A-Z])/){ "ul"+$1 }}Len")
-          fd_impl.puts "PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(#{struct.name}, #{attr.name}, #{len_attr.name});"
+          fd_impl.puts "PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(#{struct.name}, #{attr.name}, #{len_attr.name}, #{enco});"
           fd_def.puts "PKCS11_DEFINE_MEMBER(#{struct.name}, #{attr.name});"
-          fd_doc.puts"# @return [String, nil] accessor for #{attr.name} and #{len_attr.name}\nattr_accessor :#{attr.name}"
+          fd_doc.puts"# @return [#{enco.upcase}-String, nil] accessor for #{attr.name} and #{len_attr.name}\nattr_accessor :#{attr.name}"
           len_attr.mark = true
         elsif attr.name=='pData' && (len_attr = struct.attr_by_sign("CK_ULONG length") || struct.attr_by_sign("CK_ULONG ulLen"))
-          fd_impl.puts "PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(#{struct.name}, #{attr.name}, #{len_attr.name});"
+          fd_impl.puts "PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(#{struct.name}, #{attr.name}, #{len_attr.name}, #{enco});"
           fd_def.puts "PKCS11_DEFINE_MEMBER(#{struct.name}, #{attr.name});"
-          fd_doc.puts"# @return [String, nil] accessor for #{attr.name} and #{len_attr.name}\nattr_accessor :#{attr.name}"
+          fd_doc.puts"# @return [#{enco.upcase}-String, nil] accessor for #{attr.name} and #{len_attr.name}\nattr_accessor :#{attr.name}"
           len_attr.mark = true
         else
-          fd_impl.puts "PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(#{struct.name}, #{attr.name});"
+          fd_impl.puts "PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(#{struct.name}, #{attr.name}, #{enco});"
           fd_def.puts "PKCS11_DEFINE_MEMBER(#{struct.name}, #{attr.name});"
-          fd_doc.puts"# @return [String, nil] accessor for #{attr.name}\nattr_accessor :#{attr.name}"
+          fd_doc.puts"# @return [#{enco.upcase}-String, nil] accessor for #{attr.name}\nattr_accessor :#{attr.name}"
         end
         attr.mark = true
       end
@@ -133,11 +139,16 @@ class StructParser
       struct.attrs.reject{|a| a.mark }.each do |attr|
         if attr.qual
           # Attributes with qualifier
+          enco = case attr.type
+            when 'CK_BYTE' then 'ascii8bit'
+            when 'CK_UTF8CHAR' then 'utf8'
+            when 'CK_CHAR' then 'usascii'
+          end
           case attr.type
           when 'CK_BYTE', 'CK_UTF8CHAR', 'CK_CHAR'
-            fd_impl.puts "PKCS11_IMPLEMENT_STRING_ACCESSOR(#{struct.name}, #{attr.name});"
+            fd_impl.puts "PKCS11_IMPLEMENT_STRING_ACCESSOR(#{struct.name}, #{attr.name}, #{enco});"
             fd_def.puts "PKCS11_DEFINE_MEMBER(#{struct.name}, #{attr.name});"
-            fd_doc.puts"# @return [String] accessor for #{attr.name} (max #{attr.qual} bytes)\nattr_accessor :#{attr.name}"
+            fd_doc.puts"# @return [#{enco.upcase}-String] accessor for #{attr.name} (max #{attr.qual} bytes)\nattr_accessor :#{attr.name}"
           else
             fd_impl.puts "/* unimplemented attr #{attr.type} #{attr.name} #{attr.qual} */"
             fd_def.puts "/* unimplemented attr #{attr.type} #{attr.name} #{attr.qual} */"

data/ext/generate_thread_funcs.rb

@@ -26,11 +26,9 @@ fd_decl.puts <<-EOT
   #ifndef #{options.decl.gsub(/[^\w]/, "_").upcase}
   #define #{options.decl.gsub(/[^\w]/, "_").upcase}
   #include "pk11.h"
-  #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
 EOT
 fd_impl.puts <<-EOT
   #include #{File.basename(options.decl).inspect}
-  #ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
 EOT
 ARGV.each do |file_h|
   c_src = IO.read(file_h)
@@ -61,12 +59,8 @@ ARGV.each do |file_h|
     EOT
   end
 end
-fd_impl.puts <<-EOT
-  #endif
-EOT
 fd_decl.puts <<-EOT
   #endif
-  #endif
 EOT
 end
 end

data/ext/pk11.c

@@ -39,11 +39,6 @@ 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)
 {
@@ -67,21 +62,14 @@ typedef struct {
   if (!sval) rb_raise(ePKCS11Error, #name " is not supported."); \
 }
 
-#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_call_without_gvl(tbf_##name, &params, RUBY_UBF_PROCESS, NULL); \
-    rv = params.retval; \
-  }
-
-#else
-  #define CallFunction(name, func, rv, ...) \
-    rv = func(__VA_ARGS__)
-
-#endif
+#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)
@@ -1476,6 +1464,13 @@ ck_attr_value(VALUE self)
   if (attr->ulValueLen == sizeof(CK_ULONG))
       return ULONG2NUM(*(CK_ULONG_PTR)(attr->pValue));
     break;
+  case CKA_LABEL:
+  case CKA_APPLICATION:
+  case CKA_URL:
+  case CKA_CHAR_SETS:
+  case CKA_ENCODING_METHODS:
+  case CKA_MIME_TYPES:
+    return rb_enc_str_new(attr->pValue, attr->ulValueLen, rb_utf8_encoding());
   }
   return rb_str_new(attr->pValue, attr->ulValueLen);
 }
@@ -1506,11 +1501,11 @@ cCK_MECHANISM_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 /* rb_define_method(cCK_MECHANISM, "mechanism", cCK_MECHANISM_get_mechanism, 0); */
-/* rb_define_method(cCK_MECHANISM, "mechanism=", cCK_MECHANISM_set_mechanism, 0); */
+/* rb_define_method(cCK_MECHANISM, "mechanism=", cCK_MECHANISM_set_mechanism, 1); */
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_MECHANISM, mechanism);
 
 /* rb_define_method(cCK_MECHANISM, "pParameter", cCK_MECHANISM_get_pParameter, 0); */
-/* rb_define_method(cCK_MECHANISM, "pParameter=", cCK_MECHANISM_set_pParameter, 0); */
+/* rb_define_method(cCK_MECHANISM, "pParameter=", cCK_MECHANISM_set_pParameter, 1); */
 /* @see PKCS11::CK_MECHANISM#initialize */
 static VALUE
 cCK_MECHANISM_get_pParameter(VALUE self)
@@ -1544,8 +1539,8 @@ cCK_MECHANISM_set_pParameter(VALUE self, VALUE value)
     m->ulParameterLen = RSTRING_LEN(value);
     break;
   case T_DATA:
-    m->pParameter = DATA_PTR(value);
     m->ulParameterLen = NUM2LONG(rb_const_get(rb_funcall(value, rb_intern("class"), 0), rb_intern("SIZEOF_STRUCT")));
+    m->pParameter = DATA_PTR(value);
     break;
   default:
     rb_raise(rb_eArgError, "invalid argument");