pkcs11 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47cf0846032fa4195445f11d2ed667ef25696d713c8093a0f9d2107ae1873d59
-  data.tar.gz: 2ed990c095b4a1523c86ac34f912f28f2f08f372f9450dbf4656d8ba4ce4d289
+  metadata.gz: 0fb60ecaa0300930499d7783396ff4f471174f6bca63a97082208baaa9d3521b
+  data.tar.gz: c3019089cd8d0a8c2aed6d11f8a3f3b55d688c199ea62fb85b385e195e98494c
 SHA512:
-  metadata.gz: bf7312e8a33c520a4fce0afd823654130c1bc78632ff314ea871f4752db9420d6eb17191d86c1665139bce460b5e97b243321440e1a568821a7039cfb7241a50
-  data.tar.gz: b5b901d6014dde392c0cd67dff23452f6bc6700decd13cf31fe447aebc3e011d1227ce52a47d3bc7c003ced3d1d2b537821cbe856e1baed9592bbb7f185a9415
+  metadata.gz: d3f00f7d6fa0b386477b06de8e1fe30257f0fb4e625c7661ca90bad46fee20449d3f2b17ce71c132f11c3f2d11ed2aa8e27cbfb8c6000cb33d23c4a10d6a2aee
+  data.tar.gz: af86c163e05b8d7e850563fa724901bad4a6ed395a712b2c7f6a0a5dfc1c65352bd729d0f722d00b52db33f19bd8e4884d3ac26cbf5eda8f3c6db0c2bdfb6d73

data/.appveyor.yml

@@ -18,10 +18,14 @@ install:
   - 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')
-        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
+      } else {
+        $(new-object net.webclient).DownloadFile('http://ftp.mozilla.org/pub/firefox/releases/68.3.0esr/win32/en-US/Firefox%20Setup%2068.3.0esr.exe', 'C:/firefox-setup.exe')
+        $env:SOFTOKN_PATH = 'C:/Program Files (x86)/Mozilla Firefox/softokn3.dll'
+        $env:PATH = 'C:/Program Files (x86)/Mozilla Firefox;' + $env:PATH
       }
+      cmd /c "C:/firefox-setup.exe" -ms
 
 build: off
 

data/.gitignore

@@ -4,14 +4,22 @@ ext/pk11_struct_def.inc
 ext/pk11_struct_impl.inc
 ext/pk11_thread_funcs.c
 ext/pk11_thread_funcs.h
+pkcs11_luna/ext/generate_constants.rb
+pkcs11_luna/ext/generate_structs.rb
+pkcs11_luna/ext/pk11_const_macros.h
+pkcs11_luna/ext/pk11_struct_macros.h
+pkcs11_luna/ext/pk11_version.h
+pkcs11_luna/ext/std_structs.rb
+pkcs11_luna/pkg/
+pkcs11_protect_server/ext/generate_constants.rb
+pkcs11_protect_server/ext/generate_structs.rb
 pkcs11_protect_server/ext/pk11_const_macros.h
 pkcs11_protect_server/ext/pk11_struct_macros.h
 pkcs11_protect_server/ext/pk11_version.h
-pkcs11_protect_server/ext/pk11s_const_def.inc
-pkcs11_protect_server/ext/pk11s_struct.doc
-pkcs11_protect_server/ext/pk11s_struct_def.inc
-pkcs11_protect_server/ext/pk11s_struct_impl.inc
+pkcs11_protect_server/ext/std_structs.rb
+pkcs11_protect_server/pkg/
 *.so
 Gemfile.lock
 tmp
 Manifest.txt
+pkg/

data/Gemfile

@@ -11,6 +11,6 @@ gem "rake-compiler-dock", "~>0.6.2", :group => [:development, :test]
 gem "minitest", "~>5.7", :group => [:development, :test]
 gem "hoe-bundler", "~>1.0", :group => [:development, :test]
 gem "rdoc", ">=4.0", "<7", :group => [:development, :test]
-gem "hoe", "~>3.20", :group => [:development, :test]
+gem "hoe", "~>3.22", :group => [:development, :test]
 
 # vim: syntax=ruby

data/History.txt

@@ -1,5 +1,12 @@
-=== 0.3.2 / 2020-01-11
+=== 0.3.3 / 2020-11-07
 
+* Fix possible segfault on GC pressure at startup
+* Move CI from http://travis-ci.org to https://travis-ci.com
+
+=== 0.3.2 / 2020-01-12
+
+* pkcs11_protect_server, pkcs11_luna: Move parsing of vendor header files to gem installation.
+  This fixes possible compile errors, if the version of vendor header files differ between gem build and gem install.
 * pkcs11_luna: Workaround invalid UTF-8 encoding in cryptoki_v2.h of some Luna Client versions.
 
 === 0.3.1 / 2020-01-07

data/README.rdoc

@@ -1,11 +1,11 @@
-{<img src="https://travis-ci.org/larskanis/pkcs11.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/larskanis/pkcs11]
-{<img src="https://ci.appveyor.com/api/projects/status/8m7ugl1ogijw1c8c?svg=true" alt="Build Status" />}[https://ci.appveyor.com/project/larskanis/pkcs11]
-
 = PKCS #11/Ruby Interface
 
 home :: http://github.com/larskanis/pkcs11
 API documentation :: http://rubydoc.info/gems/pkcs11/frames
 
+{<img src="https://travis-ci.com/larskanis/pkcs11.svg?branch=master" alt="Build Status" />}[https://travis-ci.com/larskanis/pkcs11]
+{<img src="https://ci.appveyor.com/api/projects/status/8m7ugl1ogijw1c8c?svg=true" alt="Build Status" />}[https://ci.appveyor.com/project/larskanis/pkcs11]
+
 This module allows Ruby programs to interface with "RSA Security Inc.
 PKCS #11 Cryptographic Token Interface (Cryptoki)".
 PKCS #11 is the de-facto standard to access cryptographic devices.

data/Rakefile

@@ -24,6 +24,12 @@ Hoe.plugin :bundler
 # Build a Manifest file to satisfy hoe.
 IO.write("Manifest.txt", `git ls-files`)
 
+# Ensure pkg is rebuilt
+task :remove_pkg do
+  rm_rf 'pkg'
+end
+task :gem => [:remove_pkg]
+
 hoe = Hoe.spec 'pkcs11' do
   developer('Ryosuke Kutsuna', 'ryosuke@deer-n-horse.jp')
   developer('GOTOU Yuuzou', 'gotoyuzo@notwork.org')

data/ext/generate_constants.rb

@@ -12,7 +12,7 @@ class ConstantParser
   def self.run(argv)
     s = self.new
     options = Struct.new(:verbose, :const, :files).new
-    OptionParser.new(argv) do |opts|
+    OptionParser.new do |opts|
       opts.banner = "Usage: #{$0} [options] <header-file.h>*"
 
       opts.on("-v", "--[no-]verbose", "Run verbosely", &options.method(:verbose=))
@@ -21,7 +21,7 @@ class ConstantParser
         puts opts
         exit
       end
-    end.parse!
+    end.parse!(argv)
     options.files = argv
     s.options = options
     s.start!

data/ext/generate_structs.rb

@@ -15,7 +15,7 @@ class StructParser
   def self.run(argv)
     s = self.new
     options = Struct.new(:verbose, :def, :impl, :doc, :files).new
-    OptionParser.new(argv) do |opts|
+    OptionParser.new do |opts|
       opts.banner = "Usage: #{$0} [options] <header-file.h>*"
 
       opts.on("-v", "--[no-]verbose", "Run verbosely", &options.method(:verbose=))
@@ -26,7 +26,7 @@ class StructParser
         puts opts
         exit
       end
-    end.parse!
+    end.parse!(argv)
     options.files = argv
     s.options = options
     s.start!

data/ext/pk11.c

@@ -1501,11 +1501,11 @@ cCK_MECHANISM_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 /* rb_define_method(cCK_MECHANISM, "mechanism", cCK_MECHANISM_get_mechanism, 0); */
-/* rb_define_method(cCK_MECHANISM, "mechanism=", cCK_MECHANISM_set_mechanism, 0); */
+/* rb_define_method(cCK_MECHANISM, "mechanism=", cCK_MECHANISM_set_mechanism, 1); */
 PKCS11_IMPLEMENT_ULONG_ACCESSOR(CK_MECHANISM, mechanism);
 
 /* rb_define_method(cCK_MECHANISM, "pParameter", cCK_MECHANISM_get_pParameter, 0); */
-/* rb_define_method(cCK_MECHANISM, "pParameter=", cCK_MECHANISM_set_pParameter, 0); */
+/* rb_define_method(cCK_MECHANISM, "pParameter=", cCK_MECHANISM_set_pParameter, 1); */
 /* @see PKCS11::CK_MECHANISM#initialize */
 static VALUE
 cCK_MECHANISM_get_pParameter(VALUE self)

data/ext/pk11_const.c

@@ -170,14 +170,15 @@ Init_pkcs11_const(VALUE cPKCS11, VALUE ePKCS11Error)
   PKCS11_DEFINE_CONST(CKZ_DATA_SPECIFIED);
   PKCS11_DEFINE_CONST(CKZ_SALT_SPECIFIED);
 
-  vOBJECT_CLASSES = rb_hash_new();
-  vATTRIBUTES = rb_hash_new();
-  vMECHANISMS = rb_hash_new();
-  vRETURN_VALUES = rb_hash_new();
-  rb_define_const(cPKCS11, "OBJECT_CLASSES", vOBJECT_CLASSES);
-  rb_define_const(cPKCS11, "ATTRIBUTES", vATTRIBUTES);
-  rb_define_const(cPKCS11, "MECHANISMS", vMECHANISMS);
-  rb_define_const(cPKCS11, "RETURN_VALUES", vRETURN_VALUES);
+#define DEFINE_GLOBAL_HASH(h) \
+  rb_global_variable(&v##h); \
+  v##h = rb_hash_new(); \
+  rb_define_const(cPKCS11, #h, v##h);
+
+  DEFINE_GLOBAL_HASH(OBJECT_CLASSES)
+  DEFINE_GLOBAL_HASH(ATTRIBUTES)
+  DEFINE_GLOBAL_HASH(MECHANISMS)
+  DEFINE_GLOBAL_HASH(RETURN_VALUES)
 
   #include "pk11_const_def.inc"
 

data/ext/pk11_const_macros.h

@@ -6,7 +6,7 @@
 /**************************************************/
 
 #define PKCS11_DEFINE_CONST(constant) \
-  rb_define_const(MODULE_FOR_CONSTS, #constant, INT2NUM(constant))
+  rb_define_const(MODULE_FOR_CONSTS, #constant, LONG2NUM(constant))
 
 #define PKCS11_DEFINE_CONST_GROUP(group, name, value) \
   do { \
@@ -17,6 +17,7 @@
     old = rb_hash_aref(group, rvalue); \
     if (!NIL_P(old)) rb_warning("%s is equal to %s", RSTRING_PTR(old), name); \
     rb_hash_aset(group, rvalue, str); \
+    RB_GC_GUARD(str); \
   } while(0)
 
 #define PKCS11_DEFINE_OBJECT_CLASS(constant) \

data/ext/pk11_struct_macros.h

@@ -416,6 +416,7 @@ static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
 #define PKCS11_DEFINE_STRUCT(s) \
   do { \
     c##s = rb_define_class_under(MODULE_FOR_STRUCTS, #s, BASECLASS_FOR_STRUCTS); \
+    rb_global_variable(&a##s##_members); \
     a##s##_members = rb_ary_new(); \
     rb_define_alloc_func(c##s, s##_s_alloc); \
     rb_define_const(c##s, "SIZEOF_STRUCT", ULONG2NUM(sizeof(s))); \

data/ext/pk11_version.h

@@ -1,6 +1,6 @@
 #ifndef RUBY_PK11_VERSION_H
 #define RUBY_PK11_VERSION_H
 
-static const char *VERSION = "0.3.2";
+static const char *VERSION = "0.3.3";
 
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkcs11
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ryosuke Kutsuna
@@ -12,26 +12,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBBjANBgkqhkiG9w0BAQsFADBEMQ0wCwYDVQQDDARsYXJz
-  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
-  GRYCZGUwHhcNMTkxMjAzMTkzNDA5WhcNMjAxMjAyMTkzNDA5WjBEMQ0wCwYDVQQD
-  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
-  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
-  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
-  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
-  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
-  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
-  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
-  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
-  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQsFAAOCAQEA
-  XDITkfRngYnc7MnDMd1XRSZqZKPvPFIk/ByhD4T5mHDAmOVV9Q4csAF9wAnYqLVG
-  XqetRpK47O55NHN7zG2RbE7ospqgNU4ToXM2KCZuGoGuV75RBf6kk498kcPuFBPq
-  FWzBIlr9Nat2NjwmEAvVf2UrmKl7rEDCQTkYCe9H5qkWtbneBASIfbVaw14yhosQ
-  0fP+rf/XkPrhjfYMBd258JnTy32boRZQ018c/kX8myjnEZA6rTr6082ESHD3BTHj
-  D5uWyL3krcnTOgVS0jv7qSuxDjlvpHqvN1BNaw64Gf5TpqRDNM5r+hXhD8U339Ot
-  lrxBVhTTtOOm6AE6oziYmw==
+  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-01-11 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.20'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.20'
+        version: '3.22'
 description: 'This module allows Ruby programs to interface with "RSA Security Inc.
   PKCS #11 Cryptographic Token Interface (Cryptoki)".'
 email:
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: PKCS#11 binding for Ruby