pkcs11 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb60ecaa0300930499d7783396ff4f471174f6bca63a97082208baaa9d3521b
-  data.tar.gz: c3019089cd8d0a8c2aed6d11f8a3f3b55d688c199ea62fb85b385e195e98494c
+  metadata.gz: b6901b24d77b1c193408fb8715f9b3ded208195ac24121d769c27005df39c701
+  data.tar.gz: c5fd2269bd0dd7064912f1f442d52cbc4e7bf8832b31fadaa4403e54198f1f63
 SHA512:
-  metadata.gz: d3f00f7d6fa0b386477b06de8e1fe30257f0fb4e625c7661ca90bad46fee20449d3f2b17ce71c132f11c3f2d11ed2aa8e27cbfb8c6000cb33d23c4a10d6a2aee
-  data.tar.gz: af86c163e05b8d7e850563fa724901bad4a6ed395a712b2c7f6a0a5dfc1c65352bd729d0f722d00b52db33f19bd8e4884d3ac26cbf5eda8f3c6db0c2bdfb6d73
+  metadata.gz: 2357d321016071e60fe51f10b1e10a66859e30d1f34a398c928e9eb8f13544033e33dd6e5303f94d502ec5af8bc11228858e0d962ab0b062dc3f13e99698dee5
+  data.tar.gz: ce7fbf9026eb59610ac933f6992876b7a0651c57e105c0baa8aac868ad8acb3b519ff898849d9957df29fb9eec6b3aafa8ef15724032ccbb840dceb759623c03

data/.appveyor.yml

@@ -1,20 +1,23 @@
+image: Visual Studio 2019
+
 install:
-  - SET PATH=C:/Ruby%ruby_version%/bin;%PATH%
-  - SET RAKEOPT=-rdevkit
+  - set PATH=C:/Ruby%ruby_version%/bin;c:/Program Files/Git/cmd;c:/Windows/system32;C:/Windows/System32/WindowsPowerShell/v1.0;C:/Program Files/Mercurial
+  - set RAKEOPT=-rdevkit
+  - set RUBYOPT=--verbose
   - ps: |
       if ($env:ruby_version -like "*head*") {
         $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
-        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
+        cmd /c ruby-setup.exe /verysilent /currentuser /dir=C:/Ruby$env:ruby_version
       }
-  - ruby --version
+  - ridk version
+  - ridk exec sh -c "pacman -S --noconfirm --needed ${MINGW_PACKAGE_PREFIX}-gcc ${MINGW_PACKAGE_PREFIX}-libyaml"
   - gem --version
-  - bundle install
+  - gem inst "bundler:4.0.9"
+  - bundle _4.0.9_ 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.
+  # We need a 32 or 64 bit softokn3.dll to test against.
   # However it is not part of any installed software on Appveyor,
-  # so we download and install a 64 bit firefox version and use it's softokn3.dll.
+  # so we download and install a 32 or 64 bit firefox version and use it's softokn3.dll.
   - ps: |
       if ($env:ruby_version -like "*x64*") {
         $(new-object net.webclient).DownloadFile('http://ftp.mozilla.org/pub/firefox/releases/68.3.0esr/win64/en-US/Firefox%20Setup%2068.3.0esr.exe', 'C:/firefox-setup.exe')
@@ -30,15 +33,11 @@ install:
 build: off
 
 test_script:
-  - bundle exec rake compile test gem
+  - bundle _4.0.9_ exec rake compile test
 
 environment:
   matrix:
     - ruby_version: head-x64
       RUBY_DLL_PATH: "C:/Program Files/Mozilla Firefox"
-    - ruby_version: "25"
+    - ruby_version: "33"
       RUBY_DLL_PATH: "C:/Program Files (x86)/Mozilla Firefox"
-    - ruby_version: "24-x64"
-      RUBY_DLL_PATH: "C:/Program Files/Mozilla Firefox"
-    - ruby_version: "22"
-    - ruby_version: "23-x64"

data/.github/workflows/ci.yml

@@ -0,0 +1,80 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 5 * * 3" # At 05:00 on Wednesday # https://crontab.guru/#0_5_*_*_3
+
+jobs:
+  job_test_gem:
+    name: Test in source tree
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows
+            ruby: "head"
+          - os: windows
+            ruby: "3.2"
+          - os: ubuntu
+            ruby: "head"
+          - os: ubuntu
+            ruby: "4.0"
+          - os: ubuntu
+            ruby: "3.0"
+          - os: ubuntu
+            ruby: "truffleruby"
+          - os: macos
+            ruby: "head"
+
+    runs-on: ${{ matrix.os }}-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby-pkgs@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}      # passed to ruby/setup-ruby
+          apt-get: "libnss3" # Ubuntu
+          brew: "nss"     # macOS
+          mingw: ""   # Windows mingw / mswin /ucrt
+
+      - name: Download firefox on Windows
+        if: ${{ matrix.os == 'windows' }}
+        run: |
+          remove-item "C:/Program Files/Mozilla Firefox" -recurse
+          $(new-object net.webclient).DownloadFile('http://ftp.mozilla.org/pub/firefox/releases/68.3.0esr/win64/en-US/Firefox%20Setup%2068.3.0esr.exe', 'C:/firefox-setup.exe')
+          "SOFTOKN_PATH=C:/Program Files/Mozilla Firefox/softokn3.dll" >> $env:GITHUB_ENV
+          "RUBY_DLL_PATH=C:/Program Files/Mozilla Firefox" >> $env:GITHUB_ENV
+          "C:/Program Files/Mozilla Firefox" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Install firefox on Windows
+        if: ${{ matrix.os == 'windows' }}
+        shell: cmd
+        run: |
+          "C:/firefox-setup.exe" -ms
+          dir "C:/Program Files/Mozilla Firefox"
+
+      - name: Print tool versions
+        run: |
+          ruby -v
+          gcc -v
+          gem env
+
+      - name: Bundle install
+        run: bundle install
+
+      - name: Compile extension
+        run: bundle exec rake compile
+
+      - name: Run tests
+        run: bundle exec rake test
+
+      - name: Build gem
+        run: bundle exec rake gem
+
+      - name: Print compile logs if failed
+        if: ${{ failure() && matrix.os != 'windows' }}
+        run: find . -name '*.log' -print0 | xargs -0 cat

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 sudo: false
 rvm:
-  - "2.2"
   - "2.5.7"
+  - "3.1.2"
   - "ruby-head"
   - truffleruby
 matrix:

data/Gemfile

@@ -5,12 +5,13 @@
 source "https://rubygems.org/"
 
 
-gem "yard", "~>0.6", :group => [:development, :test]
+gem "yard", "~>0.9.36", :group => [:development, :test]
 gem "rake-compiler", "~>1.0", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.6.2", :group => [:development, :test]
-gem "minitest", "~>5.7", :group => [:development, :test]
+gem "rake-compiler-dock", "~>1.2", :group => [:development, :test]
+gem "minitest", ">=5.7", :group => [:development, :test]
+gem "hoe", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", "~>1.0", :group => [:development, :test]
-gem "rdoc", ">=4.0", "<7", :group => [:development, :test]
-gem "hoe", "~>3.22", :group => [:development, :test]
+gem "win32-registry", "~>0.1", :group => [:development, :test]
+gem "rdoc", ">=6.0", "<8", :group => [:development, :test]
 
 # vim: syntax=ruby

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.4 / 2022-04-20
+
+* Fix compatibility with ruby-3.2
+
 === 0.3.3 / 2020-11-07
 
 * Fix possible segfault on GC pressure at startup

data/Rakefile

@@ -34,11 +34,13 @@ hoe = Hoe.spec 'pkcs11' do
   developer('Ryosuke Kutsuna', 'ryosuke@deer-n-horse.jp')
   developer('GOTOU Yuuzou', 'gotoyuzo@notwork.org')
   developer('Lars Kanis', 'kanis@comcard.de')
-  extra_dev_deps << ['yard', '~> 0.6']
+  extra_dev_deps << ['yard', '~> 0.9.36']
   extra_dev_deps << ['rake-compiler', '~> 1.0']
-  extra_dev_deps << ['rake-compiler-dock', '~> 0.6.2']
-  extra_dev_deps << ['minitest', '~> 5.7']
+  extra_dev_deps << ['rake-compiler-dock', '~> 1.2']
+  extra_dev_deps << ['minitest', '>= 5.7', '< 7.0.a']
+  extra_dev_deps << ['hoe', '~> 4.0']
   extra_dev_deps << ['hoe-bundler', '~> 1.0']
+  extra_dev_deps << ['win32-registry', '~> 0.1']
 
   self.summary = 'PKCS#11 binding for Ruby'
   self.description = 'This module allows Ruby programs to interface with "RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki)".'
@@ -48,7 +50,7 @@ hoe = Hoe.spec 'pkcs11' do
   spec_extras[:extensions] = 'ext/extconf.rb'
   spec_extras[:files] = `git ls-files`.split("\n").reject{|f| f=~/^pkcs11_/ }
   spec_extras[:files] += GENERATED_FILES
-  spec_extras[:required_ruby_version] = '>= 2.2.0'
+  spec_extras[:required_ruby_version] = '>= 2.6.0'
   self.rdoc_locations << "http://www.rubydoc.info/gems/pkcs11"
 end
 

data/ext/generate_constants.rb

@@ -26,7 +26,7 @@ class ConstantParser
     s.options = options
     s.start!
   end
-  
+
   ConstTemplate = Struct.new :regexp, :def
   ConstGroups = [
     ConstTemplate.new(/#define\s+(CKM_[A-Z_0-9]+)\s+(\w+)/, 'PKCS11_DEFINE_MECHANISM'),
@@ -38,11 +38,11 @@ class ConstantParser
   def start!
     File.open(options.const, "w") do |fd_const|
       options.files.each do |file_h|
-        c_src = IO.read(file_h)
+        c_src = File.read(file_h)
         ConstGroups.each do |const_group|
           c_src.scan(const_group.regexp) do
             const_name, const_value = $1, $2
-            
+
             fd_const.puts "#{const_group.def}(#{const_name}); /* #{const_value} */"
           end
         end

data/ext/generate_structs.rb

@@ -56,7 +56,7 @@ class StructParser
   def parse_files(files)
     structs = []
     files.each do |file_h|
-      c_src = IO.read(file_h)
+      c_src = File.read(file_h)
       c_src.scan(/struct\s+([A-Z_0-9]+)\s*\{(.*?)\}/m) do |struct|
         struct_text = $2
         struct = CStruct.new( $1, [] )

data/ext/generate_thread_funcs.rb

@@ -31,7 +31,7 @@ fd_impl.puts <<-EOT
   #include #{File.basename(options.decl).inspect}
 EOT
 ARGV.each do |file_h|
-  c_src = IO.read(file_h)
+  c_src = File.read(file_h)
   c_src.scan(/CK_PKCS11_FUNCTION_INFO\((.+?)\).*?\((.*?)\);/m) do
     func_name, func_param_list = $1, $2
     func_params = []