pkcs11 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbbe79ed675ee3a36557da0c1daf8c57301fe4feefe884d2de01c6548bc5066b
-  data.tar.gz: 52d77be573adf0373a715448aefead6abcb988b53c614b2835ae7b5a0a5ce896
+  metadata.gz: 4a3c70f36b7a77052520a767fbdcc3d482fa7977ef139f4aa9c5ae975497d1b7
+  data.tar.gz: 3c1b495fff8cdde8e218908a3cdf21eda4dff38e921f514b26a5ea29ecf98eaa
 SHA512:
-  metadata.gz: 4fa068e4e856d6861eeb11b302d753e19be00b04f245bdada1e322b8067f7dc7704c506a7eab66a026af6ea08dbf6633ccf283a8cf6f82aaf1017e2685bd46f3
-  data.tar.gz: 55523644e465ac7f4eebf4c3b649189127828e9ea7924d026506261b8827c0be5400ada65e57214035f8cd1657d07fd0b21880004c0b1d819d17e7c8683ff79c
+  metadata.gz: b3daa751de0f9b9cf2b6b3a87a821b5822d0cc268cc1886e17ef033155b1ddf4bf834552bdb5c81c4d5a0e4fc6145a25e4e31c1d2ec9aabd1052eae01bfbcaad
+  data.tar.gz: 5ae2565b6d539f04cfebebb50caf1f8f73e97e3268785241056bce99bcedfb42ea95c74a06b64cadf05793a869403354902f12669e7d95f6de7c1bf2b464f946

data/.appveyor.yml

@@ -0,0 +1,40 @@
+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')
+        cmd /c "C:/firefox-setup.exe" -ms
+        $env:SOFTOKN_PATH = 'C:/Program Files/Mozilla Firefox/softokn3.dll'
+        $env:PATH = 'C:/Program Files/Mozilla Firefox;' + $env:PATH
+      }
+
+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,17 @@
+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_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/pk11s_const_def.inc
+pkcs11_protect_server/ext/pk11s_struct.doc
+pkcs11_protect_server/ext/pk11s_struct_def.inc
+pkcs11_protect_server/ext/pk11s_struct_impl.inc
+*.so
+Gemfile.lock
+tmp
+Manifest.txt

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 sudo: false
 rvm:
-  - "2.0"
-  - "2.5.0"
+  - "2.2"
+  - "2.5.7"
   - "ruby-head"
-  - rbx
+  - 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.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.20", :group => [:development, :test]
 
 # vim: syntax=ruby

data/History.txt

@@ -1,3 +1,13 @@
+=== 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.

data/README.rdoc

@@ -3,8 +3,8 @@
 
 = 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
 
 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
 
@@ -65,12 +65,11 @@ Browsable HTML can be found at http://www.cryptsoft.com/pkcs11doc.
 Some vendors extend their libraries beyond the standard, in it's own way.
 This can be used by vendor specific packages:
 * Safenet ProtectServer: {http://www.rubydoc.info/gems/pkcs11_protect_server/}
-* Safenet Luna: {file:pkcs11_luna/README_LUNA.rdoc}
+* 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

@@ -28,13 +28,12 @@ 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.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 +42,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 +99,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_structs.rb

@@ -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);
 }
@@ -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");

data/ext/pk11.h

@@ -1,28 +1,13 @@
 #ifndef RUBY_PK11_H
 #define RUBY_PK11_H
 #include <ruby.h>
+#include <ruby/thread.h>
+#include <ruby/encoding.h>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
   #define compile_for_windows
 #endif
 
-#if !defined(RARRAY_LEN)
-# define RARRAY_LEN(ary) (RARRAY(ary)->len)
-#endif
-#if !defined(RSTRING_LEN)
-# define RSTRING_LEN(str) (RSTRING(str)->len)
-#endif
-#if !defined(RSTRING_PTR)
-# define RSTRING_PTR(str) (RSTRING(str)->ptr)
-#endif
-
-#ifndef HAVE_RB_STR_SET_LEN
-#define rb_str_set_len(str, length) do { \
-  RSTRING(str)->ptr[length] = 0; \
-  RSTRING(str)->len = length; \
-} while(0)
-#endif
-
 void Init_pkcs11_ext();
 void Init_pkcs11_const(VALUE, VALUE);
 

data/ext/pk11_struct.doc

@@ -19,11 +19,11 @@ def to_s; end
 def members; end
 # @return [PKCS11::CK_VERSION] inline struct
 attr_accessor :cryptokiVersion
-# @return [String] accessor for manufacturerID (max 32 bytes)
+# @return [UTF8-String] accessor for manufacturerID (max 32 bytes)
 attr_accessor :manufacturerID
 # @return [Integer] accessor for flags (CK_ULONG)
 attr_accessor :flags
-# @return [String] accessor for libraryDescription (max 32 bytes)
+# @return [UTF8-String] accessor for libraryDescription (max 32 bytes)
 attr_accessor :libraryDescription
 # @return [PKCS11::CK_VERSION] inline struct
 attr_accessor :libraryVersion
@@ -35,9 +35,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for slotDescription (max 64 bytes)
+# @return [UTF8-String] accessor for slotDescription (max 64 bytes)
 attr_accessor :slotDescription
-# @return [String] accessor for manufacturerID (max 32 bytes)
+# @return [UTF8-String] accessor for manufacturerID (max 32 bytes)
 attr_accessor :manufacturerID
 # @return [Integer] accessor for flags (CK_ULONG)
 attr_accessor :flags
@@ -53,13 +53,13 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for label (max 32 bytes)
+# @return [UTF8-String] accessor for label (max 32 bytes)
 attr_accessor :label
-# @return [String] accessor for manufacturerID (max 32 bytes)
+# @return [UTF8-String] accessor for manufacturerID (max 32 bytes)
 attr_accessor :manufacturerID
-# @return [String] accessor for model (max 16 bytes)
+# @return [UTF8-String] accessor for model (max 16 bytes)
 attr_accessor :model
-# @return [String] accessor for serialNumber (max 16 bytes)
+# @return [USASCII-String] accessor for serialNumber (max 16 bytes)
 attr_accessor :serialNumber
 # @return [Integer] accessor for flags (CK_ULONG)
 attr_accessor :flags
@@ -87,7 +87,7 @@ attr_accessor :ulFreePrivateMemory
 attr_accessor :hardwareVersion
 # @return [PKCS11::CK_VERSION] inline struct
 attr_accessor :firmwareVersion
-# @return [String] accessor for utcTime (max 16 bytes)
+# @return [USASCII-String] accessor for utcTime (max 16 bytes)
 attr_accessor :utcTime
 end
 class PKCS11::CK_SESSION_INFO < PKCS11::CStruct
@@ -113,11 +113,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for year (max 4 bytes)
+# @return [USASCII-String] accessor for year (max 4 bytes)
 attr_accessor :year
-# @return [String] accessor for month (max 2 bytes)
+# @return [USASCII-String] accessor for month (max 2 bytes)
 attr_accessor :month
-# @return [String] accessor for day (max 2 bytes)
+# @return [USASCII-String] accessor for day (max 2 bytes)
 attr_accessor :day
 end
 class PKCS11::CK_MECHANISM_INFO < PKCS11::CStruct
@@ -141,7 +141,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pReserved
+# @return [ASCII8BIT-String, nil] accessor for pReserved
 attr_accessor :pReserved
 # @return [Integer] accessor for flags (CK_ULONG)
 attr_accessor :flags
@@ -153,7 +153,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSourceData and ulSourceDataLen
+# @return [ASCII8BIT-String, nil] accessor for pSourceData and ulSourceDataLen
 attr_accessor :pSourceData
 # @return [Integer] accessor for hashAlg (CK_ULONG)
 attr_accessor :hashAlg
@@ -183,9 +183,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSharedData and ulSharedDataLen
+# @return [ASCII8BIT-String, nil] accessor for pSharedData and ulSharedDataLen
 attr_accessor :pSharedData
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
 # @return [Integer] accessor for kdf (CK_ULONG)
 attr_accessor :kdf
@@ -197,11 +197,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSharedData and ulSharedDataLen
+# @return [ASCII8BIT-String, nil] accessor for pSharedData and ulSharedDataLen
 attr_accessor :pSharedData
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
-# @return [String, nil] accessor for pPublicData2
+# @return [ASCII8BIT-String, nil] accessor for pPublicData2
 attr_accessor :pPublicData2
 # @return [Integer] accessor for kdf (CK_ULONG)
 attr_accessor :kdf
@@ -221,9 +221,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pOtherInfo and ulOtherInfoLen
+# @return [ASCII8BIT-String, nil] accessor for pOtherInfo and ulOtherInfoLen
 attr_accessor :pOtherInfo
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
 # @return [Integer] accessor for kdf (CK_ULONG)
 attr_accessor :kdf
@@ -235,11 +235,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pOtherInfo and ulOtherInfoLen
+# @return [ASCII8BIT-String, nil] accessor for pOtherInfo and ulOtherInfoLen
 attr_accessor :pOtherInfo
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
-# @return [String, nil] accessor for pPublicData2
+# @return [ASCII8BIT-String, nil] accessor for pPublicData2
 attr_accessor :pPublicData2
 # @return [Integer] accessor for kdf (CK_ULONG)
 attr_accessor :kdf
@@ -257,11 +257,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pOtherInfo and ulOtherInfoLen
+# @return [ASCII8BIT-String, nil] accessor for pOtherInfo and ulOtherInfoLen
 attr_accessor :pOtherInfo
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
-# @return [String, nil] accessor for pPublicData2
+# @return [ASCII8BIT-String, nil] accessor for pPublicData2
 attr_accessor :pPublicData2
 # @return [Integer] accessor for kdf (CK_ULONG)
 attr_accessor :kdf
@@ -281,11 +281,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pRandomA
+# @return [ASCII8BIT-String, nil] accessor for pRandomA
 attr_accessor :pRandomA
-# @return [String, nil] accessor for pRandomB
+# @return [ASCII8BIT-String, nil] accessor for pRandomB
 attr_accessor :pRandomB
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
 # @return [Boolean]  Bool value
 attr_accessor :isSender
@@ -301,7 +301,7 @@ def to_s; end
 def members; end
 # @return [Integer] accessor for ulEffectiveBits (CK_ULONG)
 attr_accessor :ulEffectiveBits
-# @return [String] accessor for iv (max 8 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 8 bytes)
 attr_accessor :iv
 end
 class PKCS11::CK_RC2_MAC_GENERAL_PARAMS < PKCS11::CStruct
@@ -335,7 +335,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pIv and ulIvLen
+# @return [ASCII8BIT-String, nil] accessor for pIv and ulIvLen
 attr_accessor :pIv
 # @return [Integer] accessor for ulWordsize (CK_ULONG)
 attr_accessor :ulWordsize
@@ -363,9 +363,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pData and length
+# @return [ASCII8BIT-String, nil] accessor for pData and length
 attr_accessor :pData
-# @return [String] accessor for iv (max 8 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 8 bytes)
 attr_accessor :iv
 end
 class PKCS11::CK_AES_CBC_ENCRYPT_DATA_PARAMS < PKCS11::CStruct
@@ -375,9 +375,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pData and length
+# @return [ASCII8BIT-String, nil] accessor for pData and length
 attr_accessor :pData
-# @return [String] accessor for iv (max 16 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 16 bytes)
 attr_accessor :iv
 end
 class PKCS11::CK_SKIPJACK_PRIVATE_WRAP_PARAMS < PKCS11::CStruct
@@ -387,17 +387,17 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pPassword and ulPasswordLen
+# @return [ASCII8BIT-String, nil] accessor for pPassword and ulPasswordLen
 attr_accessor :pPassword
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
-# @return [String, nil] accessor for pRandomA
+# @return [ASCII8BIT-String, nil] accessor for pRandomA
 attr_accessor :pRandomA
-# @return [String, nil] accessor for pPrimeP
+# @return [ASCII8BIT-String, nil] accessor for pPrimeP
 attr_accessor :pPrimeP
-# @return [String, nil] accessor for pBaseG
+# @return [ASCII8BIT-String, nil] accessor for pBaseG
 attr_accessor :pBaseG
-# @return [String, nil] accessor for pSubprimeQ
+# @return [ASCII8BIT-String, nil] accessor for pSubprimeQ
 attr_accessor :pSubprimeQ
 # @return [Integer] accessor for ulPAndGLen (CK_ULONG)
 attr_accessor :ulPAndGLen
@@ -413,19 +413,19 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pOldWrappedX and ulOldWrappedXLen
+# @return [ASCII8BIT-String, nil] accessor for pOldWrappedX and ulOldWrappedXLen
 attr_accessor :pOldWrappedX
-# @return [String, nil] accessor for pOldPassword and ulOldPasswordLen
+# @return [ASCII8BIT-String, nil] accessor for pOldPassword and ulOldPasswordLen
 attr_accessor :pOldPassword
-# @return [String, nil] accessor for pOldPublicData and ulOldPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pOldPublicData and ulOldPublicDataLen
 attr_accessor :pOldPublicData
-# @return [String, nil] accessor for pOldRandomA
+# @return [ASCII8BIT-String, nil] accessor for pOldRandomA
 attr_accessor :pOldRandomA
-# @return [String, nil] accessor for pNewPassword and ulNewPasswordLen
+# @return [ASCII8BIT-String, nil] accessor for pNewPassword and ulNewPasswordLen
 attr_accessor :pNewPassword
-# @return [String, nil] accessor for pNewPublicData and ulNewPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pNewPublicData and ulNewPublicDataLen
 attr_accessor :pNewPublicData
-# @return [String, nil] accessor for pNewRandomA
+# @return [ASCII8BIT-String, nil] accessor for pNewRandomA
 attr_accessor :pNewRandomA
 # @return [Integer] accessor for ulOldRandomLen (CK_ULONG)
 attr_accessor :ulOldRandomLen
@@ -439,11 +439,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pInitVector
+# @return [ASCII8BIT-String, nil] accessor for pInitVector
 attr_accessor :pInitVector
-# @return [String, nil] accessor for pPassword and ulPasswordLen
+# @return [UTF8-String, nil] accessor for pPassword and ulPasswordLen
 attr_accessor :pPassword
-# @return [String, nil] accessor for pSalt and ulSaltLen
+# @return [ASCII8BIT-String, nil] accessor for pSalt and ulSaltLen
 attr_accessor :pSalt
 # @return [Integer] accessor for ulIteration (CK_ULONG)
 attr_accessor :ulIteration
@@ -455,7 +455,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pX and ulXLen
+# @return [ASCII8BIT-String, nil] accessor for pX and ulXLen
 attr_accessor :pX
 # @return [Integer] accessor for bBC (CK_BYTE)
 attr_accessor :bBC
@@ -467,9 +467,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pClientRandom and ulClientRandomLen
+# @return [ASCII8BIT-String, nil] accessor for pClientRandom and ulClientRandomLen
 attr_accessor :pClientRandom
-# @return [String, nil] accessor for pServerRandom and ulServerRandomLen
+# @return [ASCII8BIT-String, nil] accessor for pServerRandom and ulServerRandomLen
 attr_accessor :pServerRandom
 end
 class PKCS11::CK_SSL3_MASTER_KEY_DERIVE_PARAMS < PKCS11::CStruct
@@ -491,9 +491,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pIVClient
+# @return [ASCII8BIT-String, nil] accessor for pIVClient
 attr_accessor :pIVClient
-# @return [String, nil] accessor for pIVServer
+# @return [ASCII8BIT-String, nil] accessor for pIVServer
 attr_accessor :pIVServer
 # @return [Integer, PKCS11::Object] Object handle (CK_ULONG)
 attr_accessor :hClientMacSecret
@@ -531,9 +531,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pClientRandom and ulClientRandomLen
+# @return [ASCII8BIT-String, nil] accessor for pClientRandom and ulClientRandomLen
 attr_accessor :pClientRandom
-# @return [String, nil] accessor for pServerRandom and ulServerRandomLen
+# @return [ASCII8BIT-String, nil] accessor for pServerRandom and ulServerRandomLen
 attr_accessor :pServerRandom
 end
 class PKCS11::CK_WTLS_MASTER_KEY_DERIVE_PARAMS < PKCS11::CStruct
@@ -543,7 +543,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pVersion
+# @return [ASCII8BIT-String, nil] accessor for pVersion
 attr_accessor :pVersion
 # @return [Integer] accessor for DigestMechanism (CK_ULONG)
 attr_accessor :DigestMechanism
@@ -557,11 +557,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSeed and ulSeedLen
+# @return [ASCII8BIT-String, nil] accessor for pSeed and ulSeedLen
 attr_accessor :pSeed
-# @return [String, nil] accessor for pLabel and ulLabelLen
+# @return [ASCII8BIT-String, nil] accessor for pLabel and ulLabelLen
 attr_accessor :pLabel
-# @return [String, nil] accessor for pOutput
+# @return [ASCII8BIT-String, nil] accessor for pOutput
 attr_accessor :pOutput
 # @return [Integer] accessor for DigestMechanism (CK_ULONG)
 attr_accessor :DigestMechanism
@@ -575,7 +575,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pIV
+# @return [ASCII8BIT-String, nil] accessor for pIV
 attr_accessor :pIV
 # @return [Integer, PKCS11::Object] Object handle (CK_ULONG)
 attr_accessor :hMacSecret
@@ -613,11 +613,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pContentType
+# @return [UTF8-String, nil] accessor for pContentType
 attr_accessor :pContentType
-# @return [String, nil] accessor for pRequestedAttributes and ulRequestedAttributesLen
+# @return [ASCII8BIT-String, nil] accessor for pRequestedAttributes and ulRequestedAttributesLen
 attr_accessor :pRequestedAttributes
-# @return [String, nil] accessor for pRequiredAttributes and ulRequiredAttributesLen
+# @return [ASCII8BIT-String, nil] accessor for pRequiredAttributes and ulRequiredAttributesLen
 attr_accessor :pRequiredAttributes
 # @return [Integer, PKCS11::Object] Object handle (CK_ULONG)
 attr_accessor :certificateHandle
@@ -633,7 +633,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pData and ulLen
+# @return [ASCII8BIT-String, nil] accessor for pData and ulLen
 attr_accessor :pData
 end
 class PKCS11::CK_PKCS5_PBKD2_PARAMS < PKCS11::CStruct
@@ -643,11 +643,11 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSaltSourceData and ulSaltSourceDataLen
+# @return [ASCII8BIT-String, nil] accessor for pSaltSourceData and ulSaltSourceDataLen
 attr_accessor :pSaltSourceData
-# @return [String, nil] accessor for pPrfData and ulPrfDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPrfData and ulPrfDataLen
 attr_accessor :pPrfData
-# @return [String, nil] accessor for pPassword
+# @return [UTF8-String, nil] accessor for pPassword
 attr_accessor :pPassword
 # @return [Integer] accessor for saltSource (CK_ULONG)
 attr_accessor :saltSource
@@ -665,7 +665,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pValue and ulValueLen
+# @return [ASCII8BIT-String, nil] accessor for pValue and ulValueLen
 attr_accessor :pValue
 # @return [Integer] accessor for type (CK_ULONG)
 attr_accessor :type
@@ -697,7 +697,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSeed and ulSeedLen
+# @return [ASCII8BIT-String, nil] accessor for pSeed and ulSeedLen
 attr_accessor :pSeed
 # @return [PKCS11::CK_MECHANISM, nil] pointer to struct
 attr_accessor :pMechanism
@@ -713,7 +713,7 @@ def to_s; end
 def members; end
 # @return [Integer] accessor for ulCounterBits (CK_ULONG)
 attr_accessor :ulCounterBits
-# @return [String] accessor for cb (max 16 bytes)
+# @return [ASCII8BIT-String] accessor for cb (max 16 bytes)
 attr_accessor :cb
 end
 class PKCS11::CK_GCM_PARAMS < PKCS11::CStruct
@@ -723,9 +723,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pIv and ulIvLen
+# @return [ASCII8BIT-String, nil] accessor for pIv and ulIvLen
 attr_accessor :pIv
-# @return [String, nil] accessor for pAAD and ulAADLen
+# @return [ASCII8BIT-String, nil] accessor for pAAD and ulAADLen
 attr_accessor :pAAD
 # @return [Integer] accessor for ulIvBits (CK_ULONG)
 attr_accessor :ulIvBits
@@ -739,9 +739,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pNonce and ulNonceLen
+# @return [ASCII8BIT-String, nil] accessor for pNonce and ulNonceLen
 attr_accessor :pNonce
-# @return [String, nil] accessor for pAAD and ulAADLen
+# @return [ASCII8BIT-String, nil] accessor for pAAD and ulAADLen
 attr_accessor :pAAD
 # @return [Integer] accessor for ulDataLen (CK_ULONG)
 attr_accessor :ulDataLen
@@ -755,9 +755,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pData and length
+# @return [ASCII8BIT-String, nil] accessor for pData and length
 attr_accessor :pData
-# @return [String] accessor for iv (max 16 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 16 bytes)
 attr_accessor :iv
 end
 class PKCS11::CK_ARIA_CBC_ENCRYPT_DATA_PARAMS < PKCS11::CStruct
@@ -767,9 +767,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pData and length
+# @return [ASCII8BIT-String, nil] accessor for pData and length
 attr_accessor :pData
-# @return [String] accessor for iv (max 16 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 16 bytes)
 attr_accessor :iv
 end
 class PKCS11::CK_DSA_PARAMETER_GEN_PARAM < PKCS11::CStruct
@@ -779,7 +779,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSeed and ulSeedLen
+# @return [ASCII8BIT-String, nil] accessor for pSeed and ulSeedLen
 attr_accessor :pSeed
 # @return [Integer] accessor for hash (CK_ULONG)
 attr_accessor :hash
@@ -793,7 +793,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSharedData and ulSharedDataLen
+# @return [ASCII8BIT-String, nil] accessor for pSharedData and ulSharedDataLen
 attr_accessor :pSharedData
 # @return [Integer] accessor for ulAESKeyBits (CK_ULONG)
 attr_accessor :ulAESKeyBits
@@ -855,9 +855,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pLabel
+# @return [ASCII8BIT-String, nil] accessor for pLabel
 attr_accessor :pLabel
-# @return [String, nil] accessor for pContextData
+# @return [ASCII8BIT-String, nil] accessor for pContextData
 attr_accessor :pContextData
 # @return [Integer] accessor for prfMechanism (CK_ULONG)
 attr_accessor :prfMechanism
@@ -889,9 +889,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pPublicData and ulPublicDataLen
+# @return [ASCII8BIT-String, nil] accessor for pPublicData and ulPublicDataLen
 attr_accessor :pPublicData
-# @return [String, nil] accessor for pUKM and ulUKMLen
+# @return [ASCII8BIT-String, nil] accessor for pUKM and ulUKMLen
 attr_accessor :pUKM
 # @return [Integer] accessor for kdf (CK_ULONG)
 attr_accessor :kdf
@@ -903,9 +903,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pWrapOID and ulWrapOIDLen
+# @return [ASCII8BIT-String, nil] accessor for pWrapOID and ulWrapOIDLen
 attr_accessor :pWrapOID
-# @return [String, nil] accessor for pUKM and ulUKMLen
+# @return [ASCII8BIT-String, nil] accessor for pUKM and ulUKMLen
 attr_accessor :pUKM
 # @return [Integer, PKCS11::Object] Object handle (CK_ULONG)
 attr_accessor :hKey