certstore_c 0.1.2.rc → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78ff70eb97e64c2fcf16e9b458d11dc056d54a206d74e89336b21859b6f67b16
-  data.tar.gz: 99a55e4517f41199b7b1cf2e7210ed7217aa356cd9104abd5095e1e2b4e5034d
+  metadata.gz: d980868eb22aa3b7a16701cb9f61f349018ba203c9ea723aa263f26f48b2fbd3
+  data.tar.gz: b068d4b2c25eb8ee020923969c52bb03e24771867e371d4666bd1a2f12a1bd37
 SHA512:
-  metadata.gz: ab535c2e31db23bf07fcd90dd7b03ba3e8783c2beb37d2f0b37971f143e1a320b5a8d00323c3acc8bf54694f883f55bbaed0371d0e1c6d493e0226ffd526ccdc
-  data.tar.gz: c8abdd310e2c64875c2ff4fb89bccc4625025f8433116e511e43b22b2aa793a17832103d50473ba008cc6e8fbac928288e48bac2ed13a5f58ea79426529f1ee1
+  metadata.gz: 333b89dbd8a05a0a270f480ef047e34abd01657fa9c0e7bce9601c50ff0f5ad84fcfa62cd9d4f4c4c8d997c0fe22a08aadcc21c33fd7395de4897db9d226f093
+  data.tar.gz: 209ef9bc316eabf364be79c7f667c3b8e7f3ac45ad2bbbf37047280b97d57ad640f21fd965869e50855b4259be6a932741c2b9614c78b4540ce81c75fdf38eb2

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require "rake/testtask"
+require 'rake_compiler_dock'
 require "rake/clean"
 
 Rake::TestTask.new(:test) do |t|
@@ -16,6 +17,20 @@ spec = eval File.read("certstore_c.gemspec")
 
 Rake::ExtensionTask.new("certstore", spec) do |ext|
   ext.lib_dir = "lib/certstore"
+  ext.cross_compile = true
+  ext.lib_dir = File.join(*['lib', 'certstore', ENV['FAT_DIR']].compact)
+  # cross_platform names are of MRI's platform name
+  ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
+end
+
+
+desc 'Build gems for Windows per rake-compiler-dock'
+task 'gem:native' do
+  # See RUBY_CC_VERSION in https://github.com/rake-compiler/rake-compiler-dock/blob/master/Dockerfile.mri
+  RakeCompilerDock.sh <<-EOS
+    bundle --local
+    bundle exec rake cross native gem RUBY_CC_VERSION=2.4.0:2.5.0:2.6.0
+EOS
 end
 
 CLEAN.include('lib/certstore/certstore.*')

data/appveyor.yml

@@ -9,7 +9,8 @@ install:
   - gem --version
   - bundle --version
   - bundle install
-  - ridk.cmd exec bundle exec rake compile
+  - IF %ridk%==1 ridk.cmd exec bundle exec rake compile
+  - IF %ridk%==0 bundle exec rake compile -rdevkit
 build: off
 test_script:
   # - bundle exec rake test
@@ -19,8 +20,14 @@ test_script:
 environment:
   matrix:
     - ruby_version: "26-x64"
+      ridk: 1
     - ruby_version: "26"
+      ridk: 1
     - ruby_version: "25-x64"
-    - ruby_version: "25"
+      ridk: 1
     - ruby_version: "24-x64"
-    - ruby_version: "24"
+      ridk: 1
+    - ruby_version: "23-x64"
+      ridk: 0
+    - ruby_version: "23"
+      ridk: 0

data/certstore_c.gemspec

@@ -34,11 +34,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.license = "Apache-2.0"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4".freeze)
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3".freeze)
   spec.extensions = ["ext/certstore/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", [">= 1.16", "< 3"]
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rake-compiler", "~> 1.0"
+  spec.add_development_dependency "rake-compiler-dock", "~> 0.7.2"
   spec.add_development_dependency "test-unit", "~> 3.3.3"
 end

data/ext/certstore/certstore.h

@@ -30,7 +30,7 @@
 #define CERT_THUMBPRINT_STR_LENGTH 40
 #define CERT_THUMBPRINT_SIZE (160 / 8)
 
-#include <Wincrypt.h>
+#include <wincrypt.h>
 
 VALUE rb_mCertstore;
 VALUE rb_cCertLoader;

data/ext/certstore/extconf.rb

@@ -13,7 +13,7 @@ dir_config("certstore", includedir, libdir)
 have_library("crypt32")
 have_func("PFXExportCertStoreEx", "Wincrypt.h")
 
-$LDFLAGS << " -lCrypt32"
+$LDFLAGS << " -lcrypt32"
 $CFLAGS << " -std=c99 -fPIC -fms-extensions "
 # $CFLAGS << " -g -O0"
 

data/ext/certstore/loader.c

@@ -81,14 +81,20 @@ certificate_context_to_string(PCCERT_CONTEXT pContext)
   CHAR errBuf[256];
   DWORD errCode;
 
+#ifndef CRYPT_STRING_NOCRLF
+  #define CRYPT_STRING_NOCRLF 0x40000000
+#endif
+
   if (!CryptBinaryToStringW(pContext->pbCertEncoded, pContext->cbCertEncoded,
-                            CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, NULL, &cchString)) {
+                            CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF,
+                            NULL, &cchString)) {
     rb_raise(rb_eCertLoaderError, "cannot obtain certificate string length.");
   }
 
   wszString = malloc(sizeof(WCHAR) * cchString);
   CryptBinaryToStringW(pContext->pbCertEncoded, pContext->cbCertEncoded,
-                       CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, wszString, &cchString);
+                       CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF,
+                       wszString, &cchString);
 
   utf8str = wstr_to_mbstr(CP_UTF8, wszString, -1);
   // malloc sizeof CHAR * ((base64 cert content + header + footer) length).

data/lib/certstore.rb

@@ -1,4 +1,8 @@
-require "certstore/certstore"
+begin
+  require "certstore/#{RUBY_VERSION[/\d+.\d+/]}/certstore"
+rescue LoadError
+  require "certstore/certstore"
+end
 require "certstore/version"
 require "certstore/loader"
 require "certstore/openssl/loader"

data/lib/certstore/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Certstore
-  VERSION = "0.1.2.rc"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: certstore_c
 version: !ruby/object:Gem::Version
-  version: 0.1.2.rc
+  version: 0.1.2
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -108,12 +128,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3