openssl-win-root 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebed7ff514374969535e034a2360f8e953de49b3
-  data.tar.gz: 20dab383ad84c77b9bf2da2e8e7b1efab21f3289
+  metadata.gz: ac483ad299cd7d80407dadd741f0d5b4dc1da182
+  data.tar.gz: 14f0180c0db3bacab9edd2b29ddc8523e3a06e71
 SHA512:
-  metadata.gz: 47756db99b64c8c85fd22e59af5d8c783c393bcac3391c0d0ba7ce58238bd0ceab50122cb8ae0a56d5dbea1cf0b6b72738a8fbb957b5b05818b7394290b09afb
-  data.tar.gz: feed5fe246c0e79df000c24abc2bca559a213ef6d954d5a5c37a45bc412345ddb064055ee4d0e671fcd2b481a309aa280bfb30ced761e0c62d2d053441a77fe4
+  metadata.gz: 32b64d4bf2deb9f397f502df473cd3bbb0a1a39eaa9860e7ae97e5029bf9a1bb896226391e03b353ca80985d24c4870cae2437dde2b7af2d1c5264334e264582
+  data.tar.gz: 9a7470233dc75824c757ed32b501879d1821ea957dcf1ba45536d102bdce669838a82c719472d5ebdf50ebc33bbd1fc47f00b76af2b90d5d116e6878415a77bd

data/lib/openssl/win/root.rb

@@ -50,17 +50,35 @@ module OpenSSL::Win::Root
     @path = x
   end
 
+  # Implement c_rehash naming
+  class CRehash
+    def unique id
+      @seen ||= {}
+      return if @seen[id]
+      @seen[id] = true
+    end
+
+    def name hash
+      hash = "%08x" % hash
+      @hashes ||= {}
+      names[name = "#{hash}.#{@hashes[hash] ||= 0}"] = 1
+      @hashes[hash] += 1
+      name
+    end
+
+    def names
+      @names ||= {}
+    end
+  end
+
   # Almost c_rehash
   def self.save(path=self.path)
-    names={}
-    hashes={}
+    cr = CRehash.new
     Crypt.each do |crt|
-      peers=hashes[hash=crt.subject.hash]||={}
-      id=OpenSSL::Digest::SHA1.new.digest crt.to_der
-      next if peers[id]
-      names[name='%08x.%i' % [hash, peers.length]]=1
-      peers[id]=1
-      File.open File.join(path, name), 'w' do |f|
+      next unless cr.unique OpenSSL::Digest::SHA1.new.digest crt.to_der
+
+      name = File.join path, cr.name(crt.subject.hash)
+      File.open name, 'w' do |f|
         f.puts <<-EOT
 Subject: #{crt.subject}
 Valid:   #{crt.not_before} - #{crt.not_after}
@@ -68,9 +86,11 @@ Saved:   #{Time.now} by #{self} v#{VERSION}
 #{crt.to_pem}
         EOT
       end
+      link = File.join path, cr.name(crt.subject.hash_old)
+      FileUtils.ln name, link, force: true
     end
     Dir.glob File.join path, '*' do |f|
-      File.unlink f rescue nil unless names[File.basename f]
+      File.unlink f rescue nil unless cr.names[File.basename f]
     end
   end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openssl-win-root
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Stas Ukolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: ''