pkcs11_protect_server 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 7a5fe3b3e7e2b4371955d63d571b32a889cb5cc4ded9c5f4407c7e248a77e373
+  data.tar.gz: 152bcff476fe55a9a288eff56341d1013492d2aad40b48283d6629ca06bb2bb2
+SHA512:
+  metadata.gz: 260fdae7245c78b951906b3e586e64cbf038540f15833c376c49f1fa3f895fa51169aa30b63c1e7e2fafa8feb5701a68056362553cb0cec1ddddbf791130b168
+  data.tar.gz: da7604086b3b6145add4f76290c016bc959a8a18ed4f9dbdbbd82a60d589998271f1654d68f5fba780b3958a4d05cfa5fc37c912f6b4adba19ddae4f2aecb887

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+�����5���"����(V}2T�j��%�5�^W���|ַ=�z�p�if@Dk#7�.��;�*��n�����~��?5o�5Ǹ�vB:��F3�i��X�(Zn��m�&J5V�b�/u�6v�S

data.tar.gz.sig

@@ -0,0 +1 @@
+Х�S��i���:@7��J1ی�gL�N:���U��Ö��*���&Ɔ�XI5DSI�3Z�V<�֣�ZB]*��l�����U���IVi��/�A1��Yhk$���aj]����!�{���A%���8#��.0�D��v�EK��3�ĭ�Vx��Y�z}�c*�f�rð��J1�SPڗ�/>�F0j<or֭�8�J�m����x�~ c

data/README_PROTECT_SERVER.rdoc

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

data/Rakefile

@@ -32,10 +32,9 @@ end
 hoe = Hoe.spec 'pkcs11_protect_server' do
   developer('Lars Kanis', 'kanis@comcard.de')
   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-ProtectServer extensions for PKCS#11-Ruby'
   self.description = 'This module allows Ruby programs to use vendor extensions for Safenet Protect Server.'
   self.version = pkcs11_version
@@ -46,11 +45,9 @@ hoe = Hoe.spec 'pkcs11_protect_server' 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
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2'
-
 Rake::ExtensionTask.new('pkcs11_protect_server_ext', hoe.spec) do |ext|
   ext.ext_dir = 'ext'
   ext.cross_compile = true                # enable cross compilation (requires cross compile toolchain)
@@ -61,7 +58,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
 
@@ -71,16 +68,16 @@ copy_from_base_task 'pk11_version.h'
 
 file 'ext/extconf.rb' => ['ext/pk11s_struct_def.inc', 'ext/pk11s_const_def.inc', 'ext/pk11_struct_macros.h', 'ext/pk11_const_macros.h', 'ext/pk11_version.h']
 file 'ext/pk11s_struct_def.inc' => 'ext/generate_structs.rb' do
-  sh "#{RbConfig::CONFIG['ruby_install_name']} ext/generate_structs.rb --def ext/pk11s_struct_def.inc --impl ext/pk11s_struct_impl.inc --doc ext/pk11s_struct.doc #{File.join(PROTECT_SERVER_SDK_DIR, 'include/ctvdef.h').inspect}"
+  sh "#{RbConfig::CONFIG['ruby_install_name']} -I../lib ext/generate_structs.rb --def ext/pk11s_struct_def.inc --impl ext/pk11s_struct_impl.inc --doc ext/pk11s_struct.doc #{File.join(PROTECT_SERVER_SDK_DIR, 'include/ctvdef.h').inspect}"
 end
 file 'ext/pk11s_struct_impl.inc' => 'ext/pk11s_struct_def.inc'
 file 'ext/pk11s_struct.doc' => 'ext/pk11s_struct_def.inc'
 
 file 'ext/pk11s_const_def.inc' => 'ext/generate_constants.rb' do
-  sh "#{RbConfig::CONFIG['ruby_install_name']} ext/generate_constants.rb --const ext/pk11s_const_def.inc #{File.join(PROTECT_SERVER_SDK_DIR, 'include/ctvdef.h').inspect}"
+  sh "#{RbConfig::CONFIG['ruby_install_name']} -I../lib ext/generate_constants.rb --const ext/pk11s_const_def.inc #{File.join(PROTECT_SERVER_SDK_DIR, 'include/ctvdef.h').inspect}"
 end
 file 'ext/pk11s.c' => ['ext/pk11s_struct_def.inc', 'ext/pk11s_struct_impl.inc', 'ext/pk11s_const_def.inc']
 
-task :doc_files => 'ext/pk11s_struct.doc'
+task doc_files:  'ext/pk11s_struct.doc'
 
 # vim: syntax=ruby

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.2";
+static const char *VERSION = "0.3.0";
 
 #endif

data/ext/pk11s.c

@@ -1,4 +1,5 @@
 #include <ruby.h>
+#include <ruby/encoding.h>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
   #define _WINDOWS

data/ext/pk11s_struct.doc

@@ -5,9 +5,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for iv (max 8 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 8 bytes)
 attr_accessor :iv
-# @return [String] accessor for data (max 8 bytes)
+# @return [ASCII8BIT-String] accessor for data (max 8 bytes)
 attr_accessor :data
 end
 class PKCS11::ProtectServer::CK_DES2_CBC_PARAMS < PKCS11::ProtectServer::CStruct
@@ -17,9 +17,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for iv (max 8 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 8 bytes)
 attr_accessor :iv
-# @return [String] accessor for data (max 16 bytes)
+# @return [ASCII8BIT-String] accessor for data (max 16 bytes)
 attr_accessor :data
 end
 class PKCS11::ProtectServer::CK_DES3_CBC_PARAMS < PKCS11::ProtectServer::CStruct
@@ -29,9 +29,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for iv (max 8 bytes)
+# @return [ASCII8BIT-String] accessor for iv (max 8 bytes)
 attr_accessor :iv
-# @return [String] accessor for data (max 24 bytes)
+# @return [ASCII8BIT-String] accessor for data (max 24 bytes)
 attr_accessor :data
 end
 class PKCS11::ProtectServer::CK_TIMESTAMP_PARAMS < PKCS11::ProtectServer::CStruct
@@ -115,7 +115,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for prompt
+# @return [USASCII-String, nil] accessor for prompt
 attr_accessor :prompt
 # @return [Boolean]  Bool value
 attr_accessor :bMaskInput
@@ -129,7 +129,7 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String] accessor for peerId (max 16 bytes)
+# @return [USASCII-String] accessor for peerId (max 16 bytes)
 attr_accessor :peerId
 end
 class PKCS11::ProtectServer::CK_SECRET_SHARE_PARAMS < PKCS11::ProtectServer::CStruct
@@ -151,9 +151,9 @@ SIZEOF_STRUCT=Integer
 def to_s; end
 # @return [Array<String>] Attributes of this struct
 def members; end
-# @return [String, nil] accessor for passwordAuthSafe and passwordAuthSafeLen
+# @return [USASCII-String, nil] accessor for passwordAuthSafe and passwordAuthSafeLen
 attr_accessor :passwordAuthSafe
-# @return [String, nil] accessor for passwordHMAC and passwordHMACLen
+# @return [USASCII-String, nil] accessor for passwordHMAC and passwordHMACLen
 attr_accessor :passwordHMAC
 # @return [Integer, PKCS11::Object] Object handle (CK_ULONG)
 attr_accessor :keyCert
@@ -173,9 +173,9 @@ def to_s; end
 def members; end
 # @return [Array<PKCS11::CK_ATTRIBUTE>] accessor for certAttr and certAttrCount
 attr_accessor :certAttr
-# @return [String, nil] accessor for passwordAuthSafe and passwordAuthSafeLen
+# @return [USASCII-String, nil] accessor for passwordAuthSafe and passwordAuthSafeLen
 attr_accessor :passwordAuthSafe
-# @return [String, nil] accessor for passwordHMAC and passwordHMACLen
+# @return [USASCII-String, nil] accessor for passwordHMAC and passwordHMACLen
 attr_accessor :passwordHMAC
 # @return [Integer, nil] accessor for hCertCount (CK_ULONG_PTR)
 attr_accessor :hCertCount
@@ -187,9 +187,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 kdf (CK_ULONG)
 attr_accessor :kdf

data/ext/pk11s_struct_impl.inc

@@ -1,14 +1,14 @@
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_DES_CBC_PARAMS);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES_CBC_PARAMS, iv);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES_CBC_PARAMS, data);
+PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES_CBC_PARAMS, iv, ascii8bit);
+PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES_CBC_PARAMS, data, ascii8bit);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_DES2_CBC_PARAMS);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES2_CBC_PARAMS, iv);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES2_CBC_PARAMS, data);
+PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES2_CBC_PARAMS, iv, ascii8bit);
+PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES2_CBC_PARAMS, data, ascii8bit);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_DES3_CBC_PARAMS);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES3_CBC_PARAMS, iv);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES3_CBC_PARAMS, data);
+PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES3_CBC_PARAMS, iv, ascii8bit);
+PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_DES3_CBC_PARAMS, data, ascii8bit);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_TIMESTAMP_PARAMS);
 PKCS11_IMPLEMENT_BOOL_ACCESSOR(CK_TIMESTAMP_PARAMS, useMilliseconds);
@@ -36,22 +36,22 @@ PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_PKCS_7_PARAMS, CK_MECH_AND_OBJECTS, encrypti
 PKCS11_IMPLEMENT_STRUCT_ACCESSOR(CK_PKCS_7_PARAMS, CK_ATTRIBUTES, extensions);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_PP_LOAD_SECRET_PARAMS);
-PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_PP_LOAD_SECRET_PARAMS, prompt);
+PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_PP_LOAD_SECRET_PARAMS, prompt, usascii);
 PKCS11_IMPLEMENT_BOOL_ACCESSOR(CK_PP_LOAD_SECRET_PARAMS, bMaskInput);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PP_LOAD_SECRET_PARAMS, cConvert);
 /* unimplemented attr CK_CHAR cTimeout  */
 /* unimplemented attr CK_CHAR reserved  */
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_REPLICATE_TOKEN_PARAMS);
-PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_REPLICATE_TOKEN_PARAMS, peerId);
+PKCS11_IMPLEMENT_STRING_ACCESSOR(CK_REPLICATE_TOKEN_PARAMS, peerId, usascii);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_SECRET_SHARE_PARAMS);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SECRET_SHARE_PARAMS, n);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_SECRET_SHARE_PARAMS, m);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_PKCS12_PBE_EXPORT_PARAMS);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, passwordAuthSafe, passwordAuthSafeLen);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, passwordHMAC, passwordHMACLen);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, passwordAuthSafe, passwordAuthSafeLen, usascii);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, passwordHMAC, passwordHMACLen, usascii);
 PKCS11_IMPLEMENT_HANDLE_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, keyCert);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, safeBagKgMech);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, safeContentKgMech);
@@ -59,14 +59,14 @@ PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_PKCS12_PBE_EXPORT_PARAMS, hmacKgMech);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_PKCS12_PBE_IMPORT_PARAMS);
 PKCS11_IMPLEMENT_PKCS11_STRUCT_PTR_ARRAY_ACCESSOR(CK_PKCS12_PBE_IMPORT_PARAMS, CK_ATTRIBUTE, certAttr, certAttrCount);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_IMPORT_PARAMS, passwordAuthSafe, passwordAuthSafeLen);
-PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_IMPORT_PARAMS, passwordHMAC, passwordHMACLen);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_IMPORT_PARAMS, passwordAuthSafe, passwordAuthSafeLen, usascii);
+PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(CK_PKCS12_PBE_IMPORT_PARAMS, passwordHMAC, passwordHMACLen, usascii);
 /* unimplemented attr CK_OBJECT_HANDLE_PTR hCert  */
 PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(CK_PKCS12_PBE_IMPORT_PARAMS, hCertCount);
 
 PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(CK_ECIES_PARAMS);
-PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECIES_PARAMS, pSharedData1);
-PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECIES_PARAMS, pSharedData2);
+PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECIES_PARAMS, pSharedData1, ascii8bit);
+PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(CK_ECIES_PARAMS, pSharedData2, ascii8bit);
 /* unimplemented attr CK_EC_DH_PRIMITIVE dhPrimitive  */
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECIES_PARAMS, kdf);
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_ECIES_PARAMS, ulSharedDataLen1);

data/lib/pkcs11_protect_server/extensions.rb

@@ -58,6 +58,15 @@ module ProtectServer
     #
     # See also PKCS11::Library#initialize[http://pkcs11.rubyforge.org/pkcs11/PKCS11/Library.html#initialize-instance_method] of pkcs11.gem
     def initialize(so_path = nil, args = {})
+      super(so_path, args)
+    end
+
+    def load_library(so_path)
+      @so_path = resolve_so_path(so_path)
+      super(@so_path)
+    end
+
+    def resolve_so_path(so_path)
       if [:sw, :hsm].include?(so_path)
         if RUBY_PLATFORM =~ /mswin|mingw/
           libctsw_so = "cryptoki.dll"
@@ -80,10 +89,9 @@ module ProtectServer
 
         raise "#{libctsw_so} not found - please install ProtectServer PTK-C or set ENV['CRYPTOKI_SO']" unless so_path
       end
-
-      @so_path = so_path
-      super(so_path, args)
+      return so_path
     end
+    private :resolve_so_path
 
     def vendor_const_get(name)
       return ProtectServer.const_get(name) if ProtectServer.const_defined?(name)

data/test/helper.rb

@@ -1,5 +1,5 @@
 def open_ctsw
-  PKCS11::ProtectServer::Library.new(:sw, :flags=>0)
+  PKCS11::ProtectServer::Library.new(:sw, flags: 0)
 end
 
 def adjust_parity(data)

data/test/test_pkcs11_protect_server.rb

@@ -1,8 +1,8 @@
-require "test/unit"
+require "minitest/autorun"
 require "pkcs11_protect_server"
 require "test/helper"
 
-class TestPkcs11ProtectServer < Test::Unit::TestCase
+class TestPkcs11ProtectServer < Minitest::Test
   include PKCS11
 
   def test_CStruct
@@ -12,7 +12,7 @@ class TestPkcs11ProtectServer < Test::Unit::TestCase
     assert_match( /m=3/, s.inspect, 'There should be a n value in CK_SECRET_SHARE_PARAMS')
     assert_equal ["n", "m"], s.members, 'CK_SECRET_SHARE_PARAMS should contain some attributes'
     assert_equal [2, 3], s.values, 'values of CK_SECRET_SHARE_PARAMS'
-    assert_equal( {:n=>2, :m=>3}, s.to_hash, 'CK_SECRET_SHARE_PARAMS as hash' )
+    assert_equal( {n: 2, m: 3}, s.to_hash, 'CK_SECRET_SHARE_PARAMS as hash' )
   end
 
   def test_CK_PKCS12_PBE_IMPORT_PARAMS
@@ -23,7 +23,7 @@ class TestPkcs11ProtectServer < Test::Unit::TestCase
     s.certAttr = [s1, s2]
     assert_equal [s1.to_hash, s2.to_hash], s.certAttr.map{|e| e.to_hash }
     GC.start
-    assert_raise(ArgumentError){ s.certAttr = [s1, s2, nil] }
+    assert_raises(ArgumentError){ s.certAttr = [s1, s2, nil] }
     assert_equal [s1.to_hash, s2.to_hash], s.certAttr.map{|e| e.to_hash }
 
     s.certAttr = []
@@ -39,12 +39,21 @@ class TestPkcs11ProtectServer < Test::Unit::TestCase
   end
 
   def test_loading
-    pk = PKCS11::ProtectServer::Library.new(:sw, :flags=>0)
+    pk = PKCS11::ProtectServer::Library.new(:sw, flags: 0)
     so_path = pk.so_path
     pk.close
     assert !so_path.empty?, "Used path shouldn't be empty"
 
-    pk = PKCS11::ProtectServer::Library.new(so_path, :flags=>0)
+    pk = PKCS11::ProtectServer::Library.new(so_path, flags: 0)
+    pk.close
+  end
+
+  def test_loading2
+    pk = PKCS11::ProtectServer::Library.new
+    pk.load_library(:sw)
+    pk.C_GetFunctionList
+    pk.C_Initialize(flags: 0)
+    pk.info
     pk.close
   end
 end

data/test/test_pkcs11_protect_server_crypt.rb

@@ -1,8 +1,8 @@
-require "test/unit"
+require "minitest/autorun"
 require "pkcs11_protect_server"
 require "test/helper"
 
-class TestPkcs11ProtectServerCrypt < Test::Unit::TestCase
+class TestPkcs11ProtectServerCrypt < Minitest::Test
   include PKCS11
   attr_reader :slots
   attr_reader :slot
@@ -39,12 +39,12 @@ class TestPkcs11ProtectServerCrypt < Test::Unit::TestCase
     assert_equal CKS_RO_USER_FUNCTIONS, session.info.state, "Session should be in USER state"
 
     @secret_key = session.create_object(
-      :CLASS=>CKO_SECRET_KEY,
-      :KEY_TYPE=>CKK_DES2,
-      :ENCRYPT=>true, :WRAP=>true, :DECRYPT=>true, :UNWRAP=>true, :TOKEN=>false, :DERIVE=>true,
-      :USAGE_COUNT=>0, :EXPORTABLE=>true,
-      :VALUE=>adjust_parity("0123456789abcdef"),
-      :LABEL=>'test_secret_key')
+      CLASS: CKO_SECRET_KEY,
+      KEY_TYPE: CKK_DES2,
+      ENCRYPT: true, WRAP: true, DECRYPT: true, UNWRAP: true, TOKEN: false, DERIVE: true,
+      USAGE_COUNT: 0, EXPORTABLE: true,
+      VALUE: adjust_parity("0123456789abcdef"),
+      LABEL: 'test_secret_key')
   end
 
   def teardown
@@ -58,12 +58,12 @@ class TestPkcs11ProtectServerCrypt < Test::Unit::TestCase
   end
 
   def test_bad_parity
-    assert_raise(ProtectServer::CKR_ET_NOT_ODD_PARITY) do
+    assert_raises(ProtectServer::CKR_ET_NOT_ODD_PARITY) do
       session.create_object(
-        :CLASS=>CKO_SECRET_KEY,
-        :KEY_TYPE=>CKK_DES2,
-        :VALUE=>"0123456789abcdef",
-        :LABEL=>'test_secret_key2')
+        CLASS: CKO_SECRET_KEY,
+        KEY_TYPE: CKK_DES2,
+        VALUE: "0123456789abcdef",
+        LABEL: 'test_secret_key2')
     end
   end
 
@@ -73,14 +73,14 @@ class TestPkcs11ProtectServerCrypt < Test::Unit::TestCase
     pa.iv = "2"*8
 
     new_key1 = session.derive_key( {ProtectServer::CKM_DES3_DERIVE_CBC => pa}, secret_key,
-      :CLASS=>CKO_SECRET_KEY, :KEY_TYPE=>CKK_DES2, :ENCRYPT=>true, :DECRYPT=>true, :SENSITIVE=>false )
-    assert_not_equal secret_key[:VALUE], new_key1[:VALUE], 'Derived key shouldn\'t have equal key value'
+      CLASS: CKO_SECRET_KEY, KEY_TYPE: CKK_DES2, ENCRYPT: true, DECRYPT: true, SENSITIVE: false )
+    refute_equal secret_key[:VALUE], new_key1[:VALUE], 'Derived key shouldn\'t have equal key value'
 
-    new_key2 = session.derive_key( {:DES3_DERIVE_CBC => {:data=>"1"*16, :iv=>"2"*16}}, secret_key,
-      :CLASS=>CKO_SECRET_KEY, :KEY_TYPE=>CKK_DES2, :ENCRYPT=>true, :DECRYPT=>true, :SENSITIVE=>false )
+    new_key2 = session.derive_key( {DES3_DERIVE_CBC:  {data: "1"*16, iv: "2"*16}}, secret_key,
+      CLASS: CKO_SECRET_KEY, KEY_TYPE: CKK_DES2, ENCRYPT: true, DECRYPT: true, SENSITIVE: false )
     assert_equal new_key1[:VALUE], new_key2[:VALUE], 'Both derived key should be equal'
 
-    encrypted_key_value = session.encrypt( {:DES3_CBC => "2"*8}, secret_key, "1"*16)
+    encrypted_key_value = session.encrypt( {DES3_CBC:  "2"*8}, secret_key, "1"*16)
     encrypted_key_value = adjust_parity(encrypted_key_value)
     assert_equal new_key1[:VALUE], encrypted_key_value, 'Encrypted data should equal derived key value'
 
@@ -98,6 +98,6 @@ class TestPkcs11ProtectServerCrypt < Test::Unit::TestCase
     assert_equal 5, secret_key[:USAGE_COUNT], 'CKA_USAGE_COUNT should be usable'
 
     assert_equal false, secret_key[:IMPORT], 'CKA_IMPORT should default to false'
-    assert_not_nil secret_key.attributes.find{|a| a.type==ProtectServer::CKA_EXPORT}, 'CKA_EXPORT should be returned for Object#attributes'
+    refute_nil secret_key.attributes.find{|a| a.type==ProtectServer::CKA_EXPORT}, 'CKA_EXPORT should be returned for Object#attributes'
   end
 end

metadata

@@ -1,165 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pkcs11_protect_server
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: []
-
-date: 2011-12-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPDCCAiSgAwIBAgIBBjANBgkqhkiG9w0BAQsFADBEMQ0wCwYDVQQDDARsYXJz
+  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
+  GRYCZGUwHhcNMTkxMjAzMTkzNDA5WhcNMjAxMjAyMTkzNDA5WjBEMQ0wCwYDVQQD
+  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
+  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
+  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
+  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
+  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
+  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
+  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
+  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
+  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQsFAAOCAQEA
+  XDITkfRngYnc7MnDMd1XRSZqZKPvPFIk/ByhD4T5mHDAmOVV9Q4csAF9wAnYqLVG
+  XqetRpK47O55NHN7zG2RbE7ospqgNU4ToXM2KCZuGoGuV75RBf6kk498kcPuFBPq
+  FWzBIlr9Nat2NjwmEAvVf2UrmKl7rEDCQTkYCe9H5qkWtbneBASIfbVaw14yhosQ
+  0fP+rf/XkPrhjfYMBd258JnTy32boRZQ018c/kX8myjnEZA6rTr6082ESHD3BTHj
+  D5uWyL3krcnTOgVS0jv7qSuxDjlvpHqvN1BNaw64Gf5TpqRDNM5r+hXhD8U339Ot
+  lrxBVhTTtOOm6AE6oziYmw==
+  -----END CERTIFICATE-----
+date: 2019-12-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pkcs11
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
-        version: 0.2.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
   name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.20'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
-  type: :development
-  version_requirements: *id005
-description: This module allows Ruby programs to use vendor extensions for Safenet Protect Server.
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.20'
+description: This module allows Ruby programs to use vendor extensions for Safenet
+  Protect Server.
+email:
 - kanis@comcard.de
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - README_PROTECT_SERVER.rdoc
 - ext/pk11s.c
-files: 
-- .gemtest
-- .yardopts
+files:
+- ".gemtest"
+- ".yardopts"
 - Manifest.txt
 - README_PROTECT_SERVER.rdoc
 - Rakefile
 - ext/extconf.rb
 - ext/generate_constants.rb
 - ext/generate_structs.rb
+- ext/pk11_const_macros.h
+- ext/pk11_struct_macros.h
+- ext/pk11_version.h
 - ext/pk11s.c
+- ext/pk11s_const_def.inc
+- ext/pk11s_struct.doc
+- ext/pk11s_struct_def.inc
+- ext/pk11s_struct_impl.inc
 - lib/pkcs11_protect_server.rb
 - lib/pkcs11_protect_server/extensions.rb
 - test/helper.rb
 - test/test_pkcs11_protect_server.rb
 - test/test_pkcs11_protect_server_crypt.rb
-- ext/pk11s_struct_impl.inc
-- ext/pk11s_struct_def.inc
-- ext/pk11s_const_def.inc
-- ext/pk11s_struct.doc
-- ext/pk11_struct_macros.h
-- ext/pk11_const_macros.h
-- ext/pk11_version.h
 homepage: http://github.com/larskanis/pkcs11
-licenses: []
-
+licenses:
+- MIT
+metadata:
+  homepage_uri: http://github.com/larskanis/pkcs11
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README_PROTECT_SERVER.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: 2.2.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: pkcs11_protect_server
-rubygems_version: 1.8.11
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Safenet-ProtectServer extensions for PKCS#11-Ruby
-test_files: 
-- test/test_pkcs11_protect_server.rb
-- test/test_pkcs11_protect_server_crypt.rb
+test_files: []

metadata.gz.sig

@@ -0,0 +1,3 @@
+.�	V��,j��������r�x�WYs��c�$���YnD21P��Fr�Lch��&�1�ڕ�|'zP�;Ԉp3���yP���6������+��q�)r=�I�J0��~e�q�ZL�5ї*�o�%�xҏ�
+zJ������_s���H�O_D�)���&]`U=�*�j*�UX�� z���/�h�A�m��>o��P���:����mw�-*=Ӹ1��a�b�[i��D��<!��<MĶ�
+�Ezm����9�'`