pkcs11 0.2.6 → 0.3.3

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_const.c

@@ -170,14 +170,15 @@ Init_pkcs11_const(VALUE cPKCS11, VALUE ePKCS11Error)
   PKCS11_DEFINE_CONST(CKZ_DATA_SPECIFIED);
   PKCS11_DEFINE_CONST(CKZ_SALT_SPECIFIED);
 
-  vOBJECT_CLASSES = rb_hash_new();
-  vATTRIBUTES = rb_hash_new();
-  vMECHANISMS = rb_hash_new();
-  vRETURN_VALUES = rb_hash_new();
-  rb_define_const(cPKCS11, "OBJECT_CLASSES", vOBJECT_CLASSES);
-  rb_define_const(cPKCS11, "ATTRIBUTES", vATTRIBUTES);
-  rb_define_const(cPKCS11, "MECHANISMS", vMECHANISMS);
-  rb_define_const(cPKCS11, "RETURN_VALUES", vRETURN_VALUES);
+#define DEFINE_GLOBAL_HASH(h) \
+  rb_global_variable(&v##h); \
+  v##h = rb_hash_new(); \
+  rb_define_const(cPKCS11, #h, v##h);
+
+  DEFINE_GLOBAL_HASH(OBJECT_CLASSES)
+  DEFINE_GLOBAL_HASH(ATTRIBUTES)
+  DEFINE_GLOBAL_HASH(MECHANISMS)
+  DEFINE_GLOBAL_HASH(RETURN_VALUES)
 
   #include "pk11_const_def.inc"
 

data/ext/pk11_const_macros.h

@@ -6,7 +6,7 @@
 /**************************************************/
 
 #define PKCS11_DEFINE_CONST(constant) \
-  rb_define_const(MODULE_FOR_CONSTS, #constant, INT2NUM(constant))
+  rb_define_const(MODULE_FOR_CONSTS, #constant, LONG2NUM(constant))
 
 #define PKCS11_DEFINE_CONST_GROUP(group, name, value) \
   do { \
@@ -17,6 +17,7 @@
     old = rb_hash_aref(group, rvalue); \
     if (!NIL_P(old)) rb_warning("%s is equal to %s", RSTRING_PTR(old), name); \
     rb_hash_aset(group, rvalue, str); \
+    RB_GC_GUARD(str); \
   } while(0)
 
 #define PKCS11_DEFINE_OBJECT_CLASS(constant) \

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