openssl-win-root 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ada8f2f80dac79577ed4a69ddac662f7f59fe3b
-  data.tar.gz: 89ad5f3f9e0f4e8abcd4c34a76cfaccb6d6c3766
+  metadata.gz: ebed7ff514374969535e034a2360f8e953de49b3
+  data.tar.gz: 20dab383ad84c77b9bf2da2e8e7b1efab21f3289
 SHA512:
-  metadata.gz: 9d972cc71675abcd9db5598982f48269e788b4b1630938981a5946361ab0fc6bc31c5dad3167bae10c48cc4819ec6f875e7c41e4f45d9a7636b1283663a3e51c
-  data.tar.gz: 9ce632101d57d4291df5f9af0d15e7bd6b959b3361fa6eeaa84e370e850795b9cbd30f19aa4bcd7f841b2b605bc5d6c0d930d17ef0961b517c37350a4b720e0e
+  metadata.gz: 47756db99b64c8c85fd22e59af5d8c783c393bcac3391c0d0ba7ce58238bd0ceab50122cb8ae0a56d5dbea1cf0b6b72738a8fbb957b5b05818b7394290b09afb
+  data.tar.gz: feed5fe246c0e79df000c24abc2bca559a213ef6d954d5a5c37a45bc412345ddb064055ee4d0e671fcd2b481a309aa280bfb30ced761e0c62d2d053441a77fe4

data/lib/openssl/win/root.rb

@@ -1,6 +1,6 @@
-require 'ffi'
 require 'openssl'
 require 'fileutils'
+require 'fiddle/import'
 
 require_relative "root/version"
 
@@ -10,34 +10,33 @@ module OpenSSL::Win::Root
 
   # Based on Puppet::Util::Windows::RootCerts
   module Crypt
-    extend FFI::Library
-    ffi_lib 'crypt32'
-    ffi_convention :stdcall
+    extend Fiddle::Importer
+    dlload 'crypt32'
 
-    attach_function :open, :CertOpenSystemStoreA, [:pointer, :string], :pointer
-    attach_function :close, :CertCloseStore, [:pointer, :uint], :int
-    attach_function :enum, :CertEnumCertificatesInStore, [:pointer, :pointer], :pointer
+    extern 'uintptr_t CertOpenSystemStoreA(uintptr_t, char*)', :stdcall
+    extern 'int CertCloseStore(uintptr_t, unsigned long)', :stdcall
+    extern 'void* CertEnumCertificatesInStore(uintptr_t, void*)', :stdcall
 
-    class Ctx < FFI::Struct
-      layout :dwCertEncodingType, :uint,
-        :pbCertEncoded, :pointer,
-        :cbCertEncoded, :uint,
-        :pCertInfo, :pointer,
-        :hCertStore, :pointer
+    Ctx = struct [
+      'unsigned long dwCertEncodingType',
+      'unsigned char* pbCertEncoded',
+      'unsigned long cbCertEncoded',
+      'void* pCertInfo',
+      'uintptr_t hCertStore',
+    ]
 
+    class Ctx
       def crt
-        OpenSSL::X509::Certificate.new self[:pbCertEncoded].read_string self[:cbCertEncoded]
+        OpenSSL::X509::Certificate.new pbCertEncoded[0, cbCertEncoded]
       end
     end
 
     def self.each
-      store = open nil, 'ROOT'
-      begin
-        ctx = nil
-        yield Ctx.new(ctx).crt until (ctx = enum store, ctx).null?
-      ensure
-        close store, 0
-      end
+      store = CertOpenSystemStoreA 0, 'ROOT'
+      ctx = nil
+      yield Ctx.new(ctx).crt until (ctx = CertEnumCertificatesInStore store, ctx).null?
+    ensure
+      CertCloseStore store, 0
     end
   end if On
 

data/lib/openssl/win/root/version.rb

@@ -1,7 +1,7 @@
 module OpenSSL
   module Win
     module Root
-      VERSION = "1.0.3"
+      VERSION = "1.1.0"
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: openssl-win-root
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Stas Ukolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: ''