pkcs11_luna 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b7907ea48bf9a5fb15a2fa46add0ed2461160acef2d77413eb04fe97f53e12
-  data.tar.gz: 2347677ddef0eedc4128f7ee9612c4c8d6b8e15fd714348b05b8e630f8b0ed48
+  metadata.gz: f10e59800f3676a72f46239ff5c3926830a08e6f8e10a04b2d5f7db451461f83
+  data.tar.gz: 5dda0058b290db3c96e11dd34179ac40e25818334335510ad2c7bf76b0b2192b
 SHA512:
-  metadata.gz: 27b8951067b2c8116284fa5e1d4ee07b0217158d9b2151a8d8ccd4f409729f4702bf71a3eff1ad4e51128d55f556561d49694e122b93f1b75bbde4d252e3dfd6
-  data.tar.gz: 6e5186e12d5709c138e283a6e34a1b87fbe508e7f91508e6a81676b5dd075b3c76a555a49629b3ab86775db52c75097ce086cdd22b08f4f7d952185de729bdd1
+  metadata.gz: 8af055cb2caf442863d8f995c862079ad80c5301a2fb18dc4d66f3675919770ce0ba5ca0a9d65d2a4e06aa9cd92bdba6906b60d138cc8d2548676582759ccd9e
+  data.tar.gz: 13f0379e0ffcd23cb95aa9e8e93c3caf47412b43c1800fd0ab09433c9a333b98932a68ee18f3a30e96bbdcfa6c9240101324d454fd59866ed2e0f045cc888ba5

data/README_LUNA.rdoc

@@ -1,8 +1,8 @@
 = PKCS #11/Ruby Interface for Safenet Luna HSM
 
-* Homepage: http://github.com/larskanis/pkcs11
-* API documentation: http://pkcs11.rubyforge.org/pkcs11/
-* Safenet[http://www.safenet-inc.com] - Luna HSM
+home :: http://github.com/larskanis/pkcs11
+API documentation :: http://pkcs11.rubyforge.org/pkcs11/
+Safenet Luna HSM :: http://www.safenet-inc.com
 
 This ruby gem is an add-on to ruby-pkcs11[http://github.com/larskanis/pkcs11] .
 It allows to use Luna specific extensions, which are beyond the PKCS#11 standard.

data/Rakefile

@@ -34,10 +34,9 @@ end
 hoe = Hoe.spec 'pkcs11_luna' do
   developer('SafeNet', 'support@safenet-inc.com')
   extra_deps << ['pkcs11', "= #{pkcs11_version}"]
-  extra_dev_deps << ['yard', '>= 0.6']
-  extra_dev_deps << ['rake-compiler', '>= 0.7']
+  extra_dev_deps << ['yard', '~> 0.6']
+  extra_dev_deps << ['rake-compiler', '~> 0.7']
 
-  self.url = 'http://github.com/larskanis/pkcs11'
   self.summary = 'SafeNet-Luna extensions for PKCS#11-Ruby'
   self.description = 'This module allows Ruby programs to use vendor extensions for SafeNet Luna.'
   self.version = pkcs11_version
@@ -48,7 +47,7 @@ hoe = Hoe.spec 'pkcs11_luna' do
   spec_extras[:extensions] = 'ext/extconf.rb'
   spec_extras[:files] = File.read_utf("Manifest.txt").split(/\r?\n\r?/)
   spec_extras[:files] += GENERATED_FILES
-  spec_extras[:has_rdoc] = 'yard'
+  spec_extras[:required_ruby_version] = '>= 2.2.0'
 end
 
 Rake::ExtensionTask.new('pkcs11_luna_ext', hoe.spec) do |ext|
@@ -61,7 +60,7 @@ end
 
 def copy_from_base_task(filename)
   file File.join('ext', filename) => File.join(RUBY_PKCS11_EXT_DIR, filename) do |t|
-    cp t.prerequisites.first, t.name, :verbose=>true
+    cp t.prerequisites.first, t.name, verbose: true
   end
 end
 
@@ -83,6 +82,6 @@ file 'ext/pk11l_const_def.inc' => 'ext/generate_constants.rb' do
 end
 file 'ext/pk11l.c' => ['ext/pk11l_struct_def.inc', 'ext/pk11l_struct_impl.inc', 'ext/pk11l_const_def.inc']
 
-task :doc_files => 'ext/pk11l_struct.doc'
+task doc_files:  'ext/pk11l_struct.doc'
 
 # vim: syntax=ruby

data/ext/extconf.rb

@@ -8,7 +8,4 @@ puts "using Luna Client include:#{inc}"
 find_header('pk11_struct_macros.h')
 find_header('pk11_const_macros.h')
 
-have_func("rb_thread_call_without_gvl")
-have_func("rb_str_set_len")
-
 create_makefile("pkcs11_luna_ext");

data/ext/pk11_struct_macros.h

@@ -19,10 +19,10 @@ pkcs11_num2ulong(VALUE val)
 }
 
 static VALUE
-get_string(VALUE obj, off_t offset, size_t size)
+get_string(VALUE obj, off_t offset, size_t size, rb_encoding *enc)
 {
   char *ptr = (char*)DATA_PTR(obj);
-  return rb_str_new(ptr+offset, size);
+  return rb_enc_str_new(ptr+offset, size, enc);
 }
 
 static VALUE
@@ -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_cInteger, CK_ULONG, 0, free, *ptr);
+  new_obj = Data_Make_Struct(rb_cData, CK_ULONG, 0, -1, *ptr);
   rb_iv_set(obj, name, new_obj);
   **ptr = NUM2ULONG(value);
   return value;
@@ -126,12 +126,12 @@ set_bool(VALUE obj, VALUE value, off_t offset)
 }
 
 static VALUE
-get_string_ptr(VALUE obj, const char *name, off_t offset)
+get_string_ptr(VALUE obj, const char *name, off_t offset, rb_encoding *enc)
 {
   char *ptr = (char*)DATA_PTR(obj);
   char *p = *(char**)(ptr+offset);
   if (!p) return Qnil;
-  return rb_str_new2(p);
+  return rb_enc_str_new_cstr(p, enc);
 }
 
 static VALUE
@@ -151,14 +151,14 @@ set_string_ptr(VALUE obj, VALUE value, const char *name, off_t offset)
 }
 
 static VALUE
-get_string_ptr_len(VALUE obj, const char *name, off_t offset, off_t offset_len)
+get_string_ptr_len(VALUE obj, const char *name, off_t offset, off_t offset_len, rb_encoding *enc)
 {
   unsigned long l;
   char *ptr = (char*)DATA_PTR(obj);
   char *p = *(char**)(ptr+offset);
   if (!p) return Qnil;
   l = *(unsigned long*)(ptr+offset_len);
-  return rb_str_new(p, l);
+  return rb_enc_str_new(p, l, enc);
 }
 
 static VALUE
@@ -290,9 +290,9 @@ static VALUE c##s;\
 static VALUE a##s##_members;\
 PKCS11_IMPLEMENT_ALLOCATOR(s);
 
-#define PKCS11_IMPLEMENT_STRING_ACCESSOR(s, f) \
+#define PKCS11_IMPLEMENT_STRING_ACCESSOR(s, f, enco) \
 static VALUE c##s##_get_##f(VALUE o){ \
-  return get_string(o, OFFSET_OF(s, f), SIZE_OF(s, f)); \
+  return get_string(o, OFFSET_OF(s, f), SIZE_OF(s, f), rb_##enco##_encoding()); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   return set_string(o, v, OFFSET_OF(s, f), SIZE_OF(s, f)); \
@@ -338,17 +338,17 @@ static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   return set_bool(o, v, OFFSET_OF(s, f)); \
 }
 
-#define PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(s, f) \
+#define PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(s, f, enco) \
 static VALUE c##s##_get_##f(VALUE o){ \
-  return get_string_ptr(o, #f, OFFSET_OF(s, f)); \
+  return get_string_ptr(o, #f, OFFSET_OF(s, f), rb_##enco##_encoding()); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   return set_string_ptr(o, v, #f, OFFSET_OF(s, f)); \
 }
 
-#define PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(s, f, l) \
+#define PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(s, f, l, enco) \
 static VALUE c##s##_get_##f(VALUE o){ \
-  return get_string_ptr_len(o, #f, OFFSET_OF(s, f), OFFSET_OF(s, l)); \
+  return get_string_ptr_len(o, #f, OFFSET_OF(s, f), OFFSET_OF(s, l), rb_##enco##_encoding()); \
 } \
 static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
   return set_string_ptr_len(o, v, #f, OFFSET_OF(s, f), OFFSET_OF(s, l)); \

data/ext/pk11_version.h

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

data/ext/pk11l.c

@@ -1,4 +1,6 @@
 #include <ruby.h>
+#include <ruby/thread.h>
+#include <ruby/encoding.h>
 
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
@@ -50,11 +52,6 @@ static VALUE vRETURN_VALUES;
 #define BASECLASS_FOR_ERRORS eLunaError
 #define BASECLASS_FOR_STRUCTS cLunaCStruct
 
-#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
-
 #define PKCS11_DEFINE_METHOD(name, args) \
   rb_define_method(cPKCS11, #name, pkcs11_luna_##name, args);
   
@@ -67,19 +64,14 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
   if (!sval) rb_raise(eLunaError, #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; \
+}
 
 #include "cryptoki_v2.h"
 
@@ -102,69 +94,65 @@ pkcs11_luna_raise(VALUE self, CK_RV rv)
   rb_raise(eLunaError, "method vendor_raise_on_return_value should never return");
 }
 
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-
-  struct tbr_CA_GetFunctionList_params {
-    CK_CA_GetFunctionList func;
-    struct { CK_SFNT_CA_FUNCTION_LIST_PTR_PTR ppSfntFunctionList; } params;
-    CK_RV retval;
-  };
- 
-  void * tbf_CA_GetFunctionList( void *data ){
-    struct tbr_CA_GetFunctionList_params *p = (struct tbr_CA_GetFunctionList_params*)data;
-    p->retval = p->func( p->params.ppSfntFunctionList );
-    return NULL;
-  }
+struct tbr_CA_GetFunctionList_params {
+  CK_CA_GetFunctionList func;
+  struct { CK_SFNT_CA_FUNCTION_LIST_PTR_PTR ppSfntFunctionList; } params;
+  CK_RV retval;
+};
+
+void * tbf_CA_GetFunctionList( void *data ){
+  struct tbr_CA_GetFunctionList_params *p = (struct tbr_CA_GetFunctionList_params*)data;
+  p->retval = p->func( p->params.ppSfntFunctionList );
+  return NULL;
+}
 
-  /*struct tbr_CA_SetApplicationID_params {
-    CK_CA_SetApplicationID func;
-    struct { CK_ULONG major; CK_ULONG minor; } params;l
-    CK_RV retval;
-  };
- 
-  void * tbf_CA_SetApplicationID( void *data ){
-    struct tbr_CA_SetApplicationID_params *p = (struct tbr_CA_SetApplicationID_params*)data;
-    p->retval = p->func( p->params.major, p->params.minor );
-    return NULL;
-  }
-  
-  struct tbr_CA_OpenApplicationID_params {
-    CK_CA_OpenApplicationID func;
-    struct { CK_SLOT_ID slot_id;	 CK_ULONG major; CK_ULONG minor; } params;
-    CK_RV retval;
-  };
- 
-  void * tbf_CA_OpenApplicationID( void *data ){
-    struct tbr_CA_OpenApplicationID_params *p = (struct tbr_CA_OpenApplicationID_params*)data;
-    p->retval = p->func( p->params.slot_id, p->params.major, p->params.minor );
-    return NULL;
-  }
-  
-  struct tbr_CA_CloseApplicationID_params {
-    CK_CA_CloseApplicationID func;
-    struct { CK_SLOT_ID slot_id; CK_ULONG major; CK_ULONG minor; } params;
-    CK_RV retval;
-  };
- 
-  void * tbf_CA_CloseApplicationID( void *data ){
-    struct tbr_CA_CloseApplicationID_params *p = (struct tbr_CA_CloseApplicationID_params*)data;
-    p->retval = p->func( p->params.slot_id, p->params.major, p->params.minor);
-    return NULL;
-  }
+/*struct tbr_CA_SetApplicationID_params {
+  CK_CA_SetApplicationID func;
+  struct { CK_ULONG major; CK_ULONG minor; } params;l
+  CK_RV retval;
+};
+
+void * tbf_CA_SetApplicationID( void *data ){
+  struct tbr_CA_SetApplicationID_params *p = (struct tbr_CA_SetApplicationID_params*)data;
+  p->retval = p->func( p->params.major, p->params.minor );
+  return NULL;
+}
 
-  struct tbr_CA_LogExternal_params {
-    CK_CA_LogExternal func;
-    struct { CK_SLOT_ID slot_id; CK_SESSION_HANDLE hSession; CK_CHAR_PTR pString; CK_ULONG ulLen;} params;
-    CK_RV retval;
-  };
-
-  void * tbf_CA_LogExternal( void *data ){
-    struct tbr_CA_LogExternal_params *p = (struct tbr_CA_LogExternal_params*)data;
-    p->retval = p->func( p->params.slot_id, p->params.hSession, p->params.pString, p->params.ulLen);
-    return NULL;
-  }*/
-  
-#endif
+struct tbr_CA_OpenApplicationID_params {
+  CK_CA_OpenApplicationID func;
+  struct { CK_SLOT_ID slot_id;	 CK_ULONG major; CK_ULONG minor; } params;
+  CK_RV retval;
+};
+
+void * tbf_CA_OpenApplicationID( void *data ){
+  struct tbr_CA_OpenApplicationID_params *p = (struct tbr_CA_OpenApplicationID_params*)data;
+  p->retval = p->func( p->params.slot_id, p->params.major, p->params.minor );
+  return NULL;
+}
+
+struct tbr_CA_CloseApplicationID_params {
+  CK_CA_CloseApplicationID func;
+  struct { CK_SLOT_ID slot_id; CK_ULONG major; CK_ULONG minor; } params;
+  CK_RV retval;
+};
+
+void * tbf_CA_CloseApplicationID( void *data ){
+  struct tbr_CA_CloseApplicationID_params *p = (struct tbr_CA_CloseApplicationID_params*)data;
+  p->retval = p->func( p->params.slot_id, p->params.major, p->params.minor);
+  return NULL;
+}
+
+struct tbr_CA_LogExternal_params {
+  CK_CA_LogExternal func;
+  struct { CK_SLOT_ID slot_id; CK_SESSION_HANDLE hSession; CK_CHAR_PTR pString; CK_ULONG ulLen;} params;
+  CK_RV retval;
+};
+
+void * tbf_CA_LogExternal( void *data ){
+  struct tbr_CA_LogExternal_params *p = (struct tbr_CA_LogExternal_params*)data;
+  p->retval = p->func( p->params.slot_id, p->params.hSession, p->params.pString, p->params.ulLen);
+  return NULL;
+}*/
 
 
 

data/ext/pk11l_struct.doc

@@ -19,11 +19,11 @@ def to_s; end
 def members; end
 # @return [PKCS11::Luna::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::Luna::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::Luna::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::Luna::CK_SESSION_INFO < PKCS11::Luna::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::Luna::CK_MECHANISM_INFO < PKCS11::Luna::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
@@ -219,11 +219,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
@@ -243,9 +243,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
@@ -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
@@ -279,11 +279,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
@@ -303,11 +303,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
@@ -323,7 +323,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::Luna::CK_RC2_MAC_GENERAL_PARAMS < PKCS11::Luna::CStruct
@@ -357,7 +357,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
@@ -385,9 +385,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::Luna::CK_AES_CBC_ENCRYPT_DATA_PARAMS < PKCS11::Luna::CStruct
@@ -397,9 +397,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::Luna::CK_SKIPJACK_PRIVATE_WRAP_PARAMS < PKCS11::Luna::CStruct
@@ -409,17 +409,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
@@ -435,19 +435,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
@@ -461,11 +461,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
@@ -477,7 +477,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
@@ -489,9 +489,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::Luna::CK_SSL3_MASTER_KEY_DERIVE_PARAMS < PKCS11::Luna::CStruct
@@ -513,9 +513,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
@@ -553,11 +553,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, nil] accessor for pulOutputLen (CK_ULONG_PTR)
 attr_accessor :pulOutputLen
@@ -569,9 +569,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::Luna::CK_WTLS_MASTER_KEY_DERIVE_PARAMS < PKCS11::Luna::CStruct
@@ -581,7 +581,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
@@ -595,11 +595,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
@@ -613,7 +613,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
@@ -651,11 +651,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
@@ -671,7 +671,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::Luna::CK_PKCS5_PBKD2_PARAMS < PKCS11::Luna::CStruct
@@ -681,11 +681,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 and ulPasswordLen
+# @return [UTF8-String, nil] accessor for pPassword and ulPasswordLen
 attr_accessor :pPassword
 # @return [Integer] accessor for saltSource (CK_ULONG)
 attr_accessor :saltSource
@@ -701,7 +701,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
@@ -737,7 +737,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::Luna::CK_MECHANISM, nil] pointer to struct
 attr_accessor :pMechanism
@@ -753,7 +753,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::Luna::CK_CAMELLIA_CTR_PARAMS < PKCS11::Luna::CStruct
@@ -765,7 +765,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::Luna::CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS < PKCS11::Luna::CStruct
@@ -775,9 +775,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::Luna::CK_ARIA_CBC_ENCRYPT_DATA_PARAMS < PKCS11::Luna::CStruct
@@ -787,9 +787,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::Luna::CK_AES_GCM_PARAMS < PKCS11::Luna::CStruct
@@ -799,9 +799,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
@@ -815,7 +815,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 kdf (CK_ULONG)
 attr_accessor :kdf
@@ -827,9 +827,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pSharedData1
+# @return [ASCII8BIT-String, nil] accessor for pSharedData1
 attr_accessor :pSharedData1
-# @return [String, nil] accessor for pSharedData2
+# @return [ASCII8BIT-String, nil] accessor for pSharedData2
 attr_accessor :pSharedData2
 # @return [Integer] accessor for dhPrimitive (CK_ULONG)
 attr_accessor :dhPrimitive
@@ -857,9 +857,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @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 pContext and ulContextLen
+# @return [ASCII8BIT-String, nil] accessor for pContext and ulContextLen
 attr_accessor :pContext
 # @return [Integer] accessor for prfType (CK_ULONG)
 attr_accessor :prfType
@@ -877,7 +877,7 @@ def to_s; end
 def members; end
 # @return [Integer] accessor for ulCounterBits (CK_ULONG)
 attr_accessor :ulCounterBits
-# @return [String] accessor for cb (max 8 bytes)
+# @return [ASCII8BIT-String] accessor for cb (max 8 bytes)
 attr_accessor :cb
 end
 class PKCS11::Luna::CA_MOFN_STATUS < PKCS11::Luna::CStruct
@@ -907,9 +907,9 @@ def to_s; end
 def members; end
 # @return [Integer] accessor for ulModuleSize (CK_ULONG)
 attr_accessor :ulModuleSize
-# @return [String] accessor for developerName (max 32 bytes)
+# @return [USASCII-String] accessor for developerName (max 32 bytes)
 attr_accessor :developerName
-# @return [String] accessor for moduleDescription (max 32 bytes)
+# @return [USASCII-String] accessor for moduleDescription (max 32 bytes)
 attr_accessor :moduleDescription
 # @return [PKCS11::Luna::CK_VERSION] inline struct
 attr_accessor :moduleVersion
@@ -945,9 +945,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pBuffer
+# @return [ASCII8BIT-String, nil] accessor for pBuffer
 attr_accessor :pBuffer
-# @return [String, nil] accessor for pbFileName
+# @return [ASCII8BIT-String, nil] accessor for pbFileName
 attr_accessor :pbFileName
 # @return [Integer] accessor for ulType (CK_ULONG)
 attr_accessor :ulType
@@ -971,9 +971,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for pBuffer and ulBufferLen
+# @return [ASCII8BIT-String, nil] accessor for pBuffer and ulBufferLen
 attr_accessor :pBuffer
-# @return [String, nil] accessor for pbFileName
+# @return [ASCII8BIT-String, nil] accessor for pbFileName
 attr_accessor :pbFileName
 # @return [Integer] accessor for ulStorageType (CK_ULONG)
 attr_accessor :ulStorageType
@@ -997,7 +997,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for bMembers (max CK_MAX_CLUSTER_MEMBERS bytes)
+# @return [ASCII8BIT-String] accessor for bMembers (max CK_MAX_CLUSTER_MEMBERS bytes)
 attr_accessor :bMembers
 end
 class PKCS11::Luna::CK_LKM_TOKEN_ID < PKCS11::Luna::CStruct
@@ -1007,6 +1007,6 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for id (max AKEP2_NID_SIZE bytes)
+# @return [ASCII8BIT-String] accessor for id (max AKEP2_NID_SIZE bytes)
 attr_accessor :id
 end