pkcs11_protect_server 0.2.2-x86-mingw32 → 0.2.3-x86-mingw32

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.2.3";
 
 #endif

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/test_pkcs11_protect_server.rb

@@ -47,4 +47,13 @@ class TestPkcs11ProtectServer < Test::Unit::TestCase
     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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkcs11_protect_server
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: x86-mingw32
 authors: 
 - Lars Kanis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pkcs11
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 2
-        - 2
-        version: 0.2.2
+        - 3
+        version: 0.2.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -64,33 +64,33 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: hoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 2
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id005
 description: This module allows Ruby programs to use vendor extensions for Safenet Protect Server.
@@ -158,10 +158,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pkcs11_protect_server
-rubygems_version: 1.8.11
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Safenet-ProtectServer extensions for PKCS#11-Ruby
 test_files: 
-- test/test_pkcs11_protect_server.rb
 - test/test_pkcs11_protect_server_crypt.rb
+- test/test_pkcs11_protect_server.rb