pkcs11 0.2.7 → 0.3.0

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.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryosuke Kutsuna
@@ -12,9 +12,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQ0wCwYDVQQDDARsYXJz
+  MIIDPDCCAiSgAwIBAgIBBjANBgkqhkiG9w0BAQsFADBEMQ0wCwYDVQQDDARsYXJz
   MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
-  GRYCZGUwHhcNMTcwNDA0MTgyNDE1WhcNMTgwNDA0MTgyNDE1WjBEMQ0wCwYDVQQD
+  GRYCZGUwHhcNMTkxMjAzMTkzNDA5WhcNMjAxMjAyMTkzNDA5WjBEMQ0wCwYDVQQD
   DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
   iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
   RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
@@ -23,28 +23,28 @@ cert_chain:
   P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
   LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
   brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
-  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQUFAAOCAQEA
-  Wbp+grpaqUH+RiXNXmi/5xBfvSYLbxWj+DZpCSnQW+DMfx46RVVko3b7BtKDs2zs
-  EtKM6r6s7VbllPgcYUzaP92uzPqCw8FncvqG0+B+Nd4C2jKzPxAQyzYXv/3bQhv1
-  sXAzEqLQqKx5V63eBDh1TPvPTEMfJwmjcdcbvMwFSt5EcUkT63W13ZJXX23JYp1K
-  KRW+N1WIYz8RSBNaQIP2v5Inb9vUA+jPUOcdyLHoi205lyZ28hE4lcnh9Zs02aHs
-  Ao8FZozVJz8xVEuYNJsL2k70w0FiwXwoWyvKyekgPBvYNUj4JGDMtBBayJTOpDs7
-  3EVmCm5IRuqZ1UcDFouQ9w==
+  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQsFAAOCAQEA
+  XDITkfRngYnc7MnDMd1XRSZqZKPvPFIk/ByhD4T5mHDAmOVV9Q4csAF9wAnYqLVG
+  XqetRpK47O55NHN7zG2RbE7ospqgNU4ToXM2KCZuGoGuV75RBf6kk498kcPuFBPq
+  FWzBIlr9Nat2NjwmEAvVf2UrmKl7rEDCQTkYCe9H5qkWtbneBASIfbVaw14yhosQ
+  0fP+rf/XkPrhjfYMBd258JnTy32boRZQ018c/kX8myjnEZA6rTr6082ESHD3BTHj
+  D5uWyL3krcnTOgVS0jv7qSuxDjlvpHqvN1BNaw64Gf5TpqRDNM5r+hXhD8U339Ot
+  lrxBVhTTtOOm6AE6oziYmw==
   -----END CERTIFICATE-----
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2019-12-05 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
@@ -107,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.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.20'
 description: 'This module allows Ruby programs to interface with "RSA Security Inc.
   PKCS #11 Cryptographic Token Interface (Cryptoki)".'
 email:
@@ -149,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
@@ -158,7 +166,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- appveyor.yml
 - ext/extconf.rb
 - ext/generate_constants.rb
 - ext/generate_structs.rb
@@ -207,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"
@@ -218,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.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: PKCS#11 binding for Ruby

data/appveyor.yml

@@ -1,42 +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: "24"
-      RUBY_DLL_PATH: "C:/Program Files (x86)/Mozilla Firefox"
-    - ruby_version: "24-x64"
-      RUBY_DLL_PATH: "C:/Program Files/Mozilla Firefox"
-      isx64: "1"
-    - ruby_version: "200"
-    #- ruby_version: "200-x64"
-    #- ruby_version: "21"
-    #- ruby_version: "21-x64"
-    - ruby_version: "22"
-    - ruby_version: "23-x64"
-      isx64: "1"