pkcs11 0.2.0 → 0.2.1

data/test/test_pkcs11_slot.rb

@@ -44,11 +44,20 @@ class TestPkcs11Slot < Test::Unit::TestCase
     assert_equal false, slot.mechanisms.empty?, 'There should be some mechanisms'
     slot.mechanisms.each do |m|
       info = slot.mechanism_info(m)
-      assert_equal CK_MECHANISM_INFO, info.class, 'Mechanism info should a CK_MECHANISM_INFO'
+      assert_equal CK_MECHANISM_INFO, info.class, 'Mechanism info should get a CK_MECHANISM_INFO'
       assert info.inspect =~ /ulMaxKeySize=/, 'Mechanism info should tell about max key size'
     end
   end
 
+  def test_mechanism_info
+    info1 = slot.mechanism_info(:DES3_CBC)
+    assert_equal CK_MECHANISM_INFO, info1.class, 'Mechanism info should get a CK_MECHANISM_INFO'
+    assert info1.inspect =~ /ulMinKeySize=/, 'Mechanism info should tell about min key size'
+    
+    info2 = slot.mechanism_info(CKM_DES3_CBC)
+    assert_equal info1.to_hash, info2.to_hash, 'Mechanism infos should be equal'
+  end
+
   def test_session
     flags = CKF_SERIAL_SESSION #| CKF_RW_SESSION
     session = slot.open(flags){|_session|

data/test/test_pkcs11_structs.rb

@@ -4,7 +4,7 @@ require "test/helper"
 
 class TestPkcs11Structs < Test::Unit::TestCase
   include PKCS11
-  
+
   def setup
   end
 
@@ -98,7 +98,7 @@ class TestPkcs11Structs < Test::Unit::TestCase
     s.pServerRandom = nil
     assert_nil s.pServerRandom
   end
-  
+
   def test_STRUCT_PTR_ACCESSOR
     s = CK_SSL3_KEY_MAT_PARAMS.new
     assert_nil s.pReturnedKeyMaterial
@@ -122,13 +122,32 @@ class TestPkcs11Structs < Test::Unit::TestCase
     assert_nil s.pulOutputLen
   end
 
+  def test_STRUCT_ARRAY_ACCESSOR
+    s = CK_OTP_PARAMS.new
+    assert_equal [], s.pParams
+    s1 = CK_OTP_PARAM.new
+    s1.type = CK_OTP_VALUE
+    s1.pValue = "\0xyz"
+    s2 = CK_OTP_PARAM.new
+    s2.type = CK_OTP_PIN
+    s2.pValue = "1234"
+    s.pParams = [s1, s2]
+    assert_equal [s1.to_hash, s2.to_hash], s.pParams.map{|e| e.to_hash }
+    GC.start
+    assert_raise(ArgumentError){ s.pParams = [s1, s2, nil] }
+    assert_equal [s1.to_hash, s2.to_hash], s.pParams.map{|e| e.to_hash }
+
+    s.pParams = []
+    assert_equal [], s.pParams
+  end
+
   def test_CStruct
     s = CK_DATE.new
     s.day, s.month, s.year = "31", "12", "2010"
 
     assert s.inspect =~ /year="2010"/, 'There should be a year in CK_DATE'
-    assert_equal ["day", "month", "year"], s.members, 'CK_DATE should contain some attributes'
-    assert_equal ["31", "12", "2010"], s.values, 'values of CK_DATE'
+    assert_equal ["year", "month", "day"], s.members, 'CK_DATE should contain some attributes'
+    assert_equal ["2010", "12", "31"], s.values, 'values of CK_DATE'
     assert_equal( {:day=>"31", :month=>"12", :year=>"2010"}, s.to_hash, 'CK_DATE as hash' )
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkcs11
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 21
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ryosuke Kutsuna
@@ -11,49 +17,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +01:00
+date: 2011-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
         version: 2.0.4
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
         version: "0.6"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
         version: "0.7"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.6.0
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
+        version: 2.7.0
+  type: :development
+  version_requirements: *id004
 description: "This module allows Ruby programs to interface with \"RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki)\"."
 email: 
 - ryosuke@deer-n-horse.jp
@@ -77,6 +105,7 @@ files:
 - README.rdoc
 - Rakefile
 - ext/extconf.rb
+- ext/generate_constants.rb
 - ext/generate_structs.rb
 - ext/generate_thread_funcs.rb
 - ext/include/cryptoki.h
@@ -89,6 +118,8 @@ files:
 - ext/pk11.c
 - ext/pk11.h
 - ext/pk11_const.c
+- ext/pk11_const_macros.h
+- ext/pk11_struct_macros.h
 - lib/pkcs11.rb
 - lib/pkcs11/extensions.rb
 - lib/pkcs11/helper.rb
@@ -125,29 +156,35 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: pkcs11
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: PKCS#11 binding for Ruby
 test_files: 
-- test/test_pkcs11_thread.rb
+- test/test_pkcs11_object.rb
 - test/test_pkcs11_structs.rb
+- test/test_pkcs11_thread.rb
 - test/test_pkcs11_session.rb
 - test/test_pkcs11_slot.rb
-- test/test_pkcs11.rb
 - test/test_pkcs11_crypt.rb
-- test/test_pkcs11_object.rb
+- test/test_pkcs11.rb