pkcs11 0.2.6 → 0.3.3

data/test/test_pkcs11_session.rb

@@ -32,11 +32,11 @@ class TestPkcs11Session < Minitest::Test
   end
 
   def test_find_objects
-    obj = session.find_objects(:CLASS => CKO_CERTIFICATE)
+    obj = session.find_objects(CLASS:  CKO_CERTIFICATE)
     assert obj.length>2, 'There should be some certificates in the test database'
     assert_equal PKCS11::Object, obj.first.class, 'Retuned objects should be class Object'
 
-    session.find_objects(:CLASS => CKO_CERTIFICATE) do |obj2|
+    session.find_objects(CLASS:  CKO_CERTIFICATE) do |obj2|
       assert obj2[:SUBJECT], 'A certificate should have a subject'
       assert OpenSSL::X509::Name.new(obj2[:SUBJECT]).to_s =~ /\/CN=/i, 'Every certificate should have a CN in the subject'
     end
@@ -57,25 +57,25 @@ class TestPkcs11Session < Minitest::Test
   end
 
   def test_create_data_object
-    obj = session.create_object(
-      :CLASS=>CKO_DATA,
-      :TOKEN=>false,
-      :APPLICATION=>'My Application',
-      :VALUE=>'value')
+    _obj = session.create_object(
+      CLASS: CKO_DATA,
+      TOKEN: false,
+      APPLICATION: 'My Application',
+      VALUE: 'value')
   end
 
   def test_create_certificate_object
-    obj1 = session.find_objects(:CLASS => CKO_CERTIFICATE, :ID=>TestCert_ID).first
+    obj1 = session.find_objects(CLASS:  CKO_CERTIFICATE, ID: TestCert_ID).first
 
     obj = session.create_object(
-      :CLASS=>CKO_CERTIFICATE,
-      :SUBJECT=>obj1[:SUBJECT],
-      :TOKEN=>false,
-      :LABEL=>'test_create_object',
-      :CERTIFICATE_TYPE=>CKC_X_509,
-      :ISSUER=>obj1[:ISSUER],
-      :VALUE=>obj1[:VALUE],
-      :SERIAL_NUMBER=>'12345'
+      CLASS: CKO_CERTIFICATE,
+      SUBJECT: obj1[:SUBJECT],
+      TOKEN: false,
+      LABEL: 'test_create_object',
+      CERTIFICATE_TYPE: CKC_X_509,
+      ISSUER: obj1[:ISSUER],
+      VALUE: obj1[:VALUE],
+      SERIAL_NUMBER: '12345'
     )
 
     assert_equal '12345', obj[:SERIAL_NUMBER], 'Value as created'
@@ -85,12 +85,12 @@ class TestPkcs11Session < Minitest::Test
     rsa = OpenSSL::PKey::RSA.generate(512)
 
     obj = session.create_object(
-      :CLASS=>CKO_PUBLIC_KEY,
-      :KEY_TYPE=>CKK_RSA,
-      :TOKEN=>false,
-      :MODULUS=>rsa.n.to_s(2),
-      :PUBLIC_EXPONENT=>rsa.e.to_s(2),
-      :LABEL=>'test_create_public_key_object')
+      CLASS: CKO_PUBLIC_KEY,
+      KEY_TYPE: CKK_RSA,
+      TOKEN: false,
+      MODULUS: rsa.n.to_s(2),
+      PUBLIC_EXPONENT: rsa.e.to_s(2),
+      LABEL: 'test_create_public_key_object')
 
     assert_equal 'test_create_public_key_object', obj[:LABEL], 'Value as created'
   end

data/test/test_pkcs11_slot.rb

@@ -26,13 +26,13 @@ class TestPkcs11Slot < Minitest::Test
 
     assert sinfo.inspect =~ /manufacturerID=/, 'Slot info should tell about manufacturerID'
 
-    assert_equal Fixnum, sinfo.flags.class
+    assert_kind_of Integer, sinfo.flags
     assert sinfo.manufacturerID =~ /Mozilla/i, "It's the mozilla libaray we test against"
     assert sinfo.slotDescription =~ /Private Key/i, "It's the slot with users private keys"
-    assert_equal Fixnum, sinfo.hardwareVersion.major.class, "Version should be a number"
-    assert_equal Fixnum, sinfo.hardwareVersion.minor.class, "Version should be a number"
-    assert_equal Fixnum, sinfo.firmwareVersion.major.class, "Version should be a number"
-    assert_equal Fixnum, sinfo.firmwareVersion.minor.class, "Version should be a number"
+    assert_kind_of Integer, sinfo.hardwareVersion.major, "Version should be a number"
+    assert_kind_of Integer, sinfo.hardwareVersion.minor, "Version should be a number"
+    assert_kind_of Integer, sinfo.firmwareVersion.major, "Version should be a number"
+    assert_kind_of Integer, sinfo.firmwareVersion.minor, "Version should be a number"
   end
 
   def test_token_info
@@ -44,14 +44,14 @@ class TestPkcs11Slot < Minitest::Test
     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 get a CK_MECHANISM_INFO'
+      assert_kind_of CK_MECHANISM_INFO, info, '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_kind_of CK_MECHANISM_INFO, info1, '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)
@@ -71,7 +71,7 @@ class TestPkcs11Slot < Minitest::Test
 
   def test_session2
     flags = CKF_SERIAL_SESSION #| CKF_RW_SESSION
-    session = slot.open(flags)
+    _session = slot.open(flags)
     slot.close_all_sessions
   end
 end

data/test/test_pkcs11_structs.rb

@@ -11,9 +11,10 @@ class TestPkcs11Structs < Minitest::Test
   def teardown
   end
 
-  def test_STRING_ACCESSOR
+  def test_STRING_ACCESSOR_ASCII
     s = CK_DATE.new
     assert_equal "\0\0", s.day
+    assert_equal Encoding::ASCII, s.day.encoding
     assert_equal "\0\0\0\0", s.year
     s.day = "12345"
     assert_equal "12", s.day
@@ -22,6 +23,20 @@ class TestPkcs11Structs < Minitest::Test
     assert_raises(TypeError){ s.day = nil }
   end
 
+  def test_STRING_ACCESSOR_UTF8
+    s = CK_INFO.new
+    s.manufacturerID = 'Müller'
+    assert_equal "Müller", s.manufacturerID.split("\0",2).first
+    assert_equal Encoding::UTF_8, s.manufacturerID.encoding
+  end
+
+  def test_STRING_ACCESSOR_BINARY
+    s = CK_DES_CBC_ENCRYPT_DATA_PARAMS.new
+    s.iv = "somedata"
+    assert_equal "somedata", s.iv
+    assert_equal Encoding::BINARY, s.iv.encoding
+  end
+
   def test_ULONG_ACCESSOR
     s = CK_SSL3_KEY_MAT_PARAMS.new
     assert_equal 0, s.ulIVSizeInBits
@@ -42,13 +57,24 @@ class TestPkcs11Structs < Minitest::Test
     assert_raises(ArgumentError){ s.bIsExport = nil }
   end
 
-  def test_STRING_PTR_ACCESSOR
-    s = CK_WTLS_MASTER_KEY_DERIVE_PARAMS.new
-    assert_nil s.pVersion
-    s.pVersion = "1.2.3"
-    assert_equal "1.2.3", s.pVersion
-    s.pVersion = nil
-    assert_nil s.pVersion
+  def test_STRING_PTR_ACCESSOR_UTF8
+    s = CK_PBE_PARAMS.new
+    assert_nil s.pPassword
+    s.pPassword = "secret"
+    assert_equal "secret", s.pPassword
+    assert_equal Encoding::UTF_8, s.pPassword.encoding
+    s.pPassword = nil
+    assert_nil s.pPassword
+  end
+
+  def test_STRING_PTR_ACCESSOR_BINARY
+    s = CK_DES_CBC_ENCRYPT_DATA_PARAMS.new
+    assert_nil s.pData
+    s.pData = "some data"
+    assert_equal "some data", s.pData
+    assert_equal Encoding::BINARY, s.pData.encoding
+    s.pData = nil
+    assert_nil s.pData
   end
 
   def test_STRUCT_ACCESSOR
@@ -148,7 +174,7 @@ class TestPkcs11Structs < Minitest::Test
     assert s.inspect =~ /year="2010"/, 'There should be a year in 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' )
+    assert_equal( {day: "31", month: "12", year: "2010"}, s.to_hash, 'CK_DATE as hash' )
   end
 
   def test_bignum_attribute

data/test/test_pkcs11_thread.rb

@@ -33,8 +33,8 @@ class TestPkcs11Thread < Minitest::Test
       end
     }
     # This should take some seconds:
-    pub_key, priv_key = session.generate_key_pair(:RSA_PKCS_KEY_PAIR_GEN,
-      {:MODULUS_BITS=>2048, :PUBLIC_EXPONENT=>[3].pack("N"), :TOKEN=>false},
+    _pub_key, _priv_key = session.generate_key_pair(:RSA_PKCS_KEY_PAIR_GEN,
+      {MODULUS_BITS: 2048, PUBLIC_EXPONENT: [65537].pack("N"), TOKEN: false},
       {})
     th.kill
     assert_operator count, :>, 100000, "The second thread should count further concurrent to the key generation"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkcs11
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.3
 platform: ruby
 authors:
 - Ryosuke Kutsuna
@@ -9,21 +9,42 @@ authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPDCCAiSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBl0cmF2
+  aXMtY2kvREM9ZHVtbXkvREM9b3JnMB4XDTIwMDQwODExMDA0MFoXDTIxMDQwODEx
+  MDA0MFowJDEiMCAGA1UEAwwZdHJhdmlzLWNpL0RDPWR1bW15L0RDPW9yZzCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+5uh+zqCXKho0zXIaLmJD6YDpa
+  l07nJ+PQFcMBYgsKA2ip01THj3DVYwP/va6hYgqPmxEJB3tsEthKnHVHm0dgqqg/
+  gfyDFU0ZfbSYKeNlZQRIdddKPc6dNbmtY2gBWFt6YOZnBccsgJmSUAbh0a9xhVbm
+  qAStn/q7eq9iW9+12AB9HM+QCWrsCAXEHGGNENDAK9HtHwBs4KsneiIQY5rd/Mzs
+  Ii25XXnDUa1NjC4u/mMuJXBpWLw2rEAQkzEFQBZR0W0ehm9Mi4TokhLy/QH8GRaH
+  0KADzpk1cxuOrEBIhy6ISQs7g/tI6YTePAmDMTsodov02FZCcMpoxOifpFkCAwEA
+  AaN5MHcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFOTn5ek+QtcI
+  g+ZglIvRPAPGoXvLMB4GA1UdEQQXMBWBE3RyYXZpcy1jaUBkdW1teS5vcmcwHgYD
+  VR0SBBcwFYETdHJhdmlzLWNpQGR1bW15Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEA
+  Xuaj6r4QXrQwDdrmT2sPgWiS5/CRRiSwyWsE1jfM0q5spzuKRIy+vSfmj6isScGf
+  vT7nwXus+3IcISSdfUddGqf/L54z6U9dVc+V5SH+QuptDRPgQ+fPJFKn8uFARJDU
+  9qNNSKpyoXXHksouuRV4dXVYRChfhLiavXaR0jNmi6qgTsSSvyKD2aObyVdVUzxr
+  Umpavc3v5BbquwF9DlKeHZwU/qP0ynCZg/Z9CFa18e5JfyBSFXHXDA0YXE6+b4Dh
+  +QvsIa+rEKMYbn0IActnL2SCNlGcttHDcH0AkctmwmAN2r6LTInUBCJoahaIeIXU
+  RE1H1QyCW3SV93CTTKaR2A==
+  -----END CERTIFICATE-----
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
@@ -46,14 +67,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -86,30 +107,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   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.16'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
 description: 'This module allows Ruby programs to interface with "RSA Security Inc.
   PKCS #11 Cryptographic Token Interface (Cryptoki)".'
 email:
@@ -128,8 +155,10 @@ extra_rdoc_files:
 - pkcs11_protect_server/README_PROTECT_SERVER.rdoc
 - ext/pk11.c
 files:
+- ".appveyor.yml"
 - ".autotest"
 - ".gemtest"
+- ".gitignore"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -137,7 +166,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- appveyor.yml
 - ext/extconf.rb
 - ext/generate_constants.rb
 - ext/generate_structs.rb
@@ -186,7 +214,8 @@ files:
 homepage: http://github.com/larskanis/pkcs11
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: http://github.com/larskanis/pkcs11
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -197,15 +226,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: PKCS#11 binding for Ruby

metadata.gz.sig

@@ -0,0 +1,3 @@
+0�u-��]yeP*���՛$[���=�?�
+��������*�+{}WoҽR@C`����Fq�W��F���=��|L�6/
+SX��r��tn;^*k�+����K@|�\R�A��

data/appveyor.yml

@@ -1,38 +0,0 @@
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
-  - SET RAKEOPT=-rdevkit
-  - ruby --version
-  - gem --version
-  - bundle install
-
-  # When running ruby-x86, we make use of the softokn3.dll that is part of the
-  # pre-installed firefox. The test helper will find it automatically.
-  # When running ruby-x64, we equally need a 64 bit softokn3.dll to test against.
-  # However it is not part of any installed software on appveyor, nor is it
-  # officially released as a windows binary, so we download and install a 64 bit
-  # firefox version and use it's softokn3.dll.
-  - ps: |
-        if ($env:isx64 -eq "1")
-        {
-          $(new-object net.webclient).DownloadFile('http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/40.0b4/win64/en-US/Firefox%20Setup%2040.0b4.exe', 'C:\firefox-setup.exe')
-          cmd /c C:\firefox-setup.exe -ms
-          $env:SOFTOKN_PATH = 'C:\Program Files\Mozilla Firefox\softokn3.dll'
-          $env:PATH = 'C:\Program Files\Mozilla Firefox;' + $env:PATH
-        }
-
-build: off
-
-test_script:
-  - bundle exec rake compile test gem
-
-environment:
-  matrix:
-    - ruby_version: "193"
-    #- ruby_version: "200"
-    #- ruby_version: "200-x64"
-    #- ruby_version: "21"
-    #- ruby_version: "21-x64"
-    - ruby_version: "22"
-    - ruby_version: "22-x64"
-      isx64: "1"