Merge pull request #32 from MsysTechnologiesllc/piyush/fix_for_ruby2.0

[MSYS-836] fixes for ruby2.0 and FFI destroy object messages
chef · Jun 11, 2018 · 8358a0f · 8358a0f
2 parents 6c2179c + c86e3c1
commit 8358a0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/win32/certstore.rb b/lib/win32/certstore.rb
@@ -118,7 +118,7 @@ def add_finalizer(certstore_handler)
     end
 
     def self.finalize(certstore_handler)
-      proc { puts "DESTROY OBJECT #{certstore_handler}" }
+      proc { "#{certstore_handler}" }
     end
 
     # To close all open certificate store at the end

diff --git a/lib/win32/certstore/mixin/assertions.rb b/lib/win32/certstore/mixin/assertions.rb
@@ -22,7 +22,7 @@ module Mixin
       module Assertions
         # Validate certificate store name
         def validate_store(store_name)
-          unless valid_store_name.include?(store_name&.upcase)
+          unless valid_store_name.include?(store_name.to_s.upcase)
             raise ArgumentError, "Invalid Certificate Store."
           end
         end
@@ -82,7 +82,7 @@ def lookup_error(failed_operation = nil)
         # ROOT -> Root certificates.
         # SPC -> Software Publisher Certificate.
         def valid_store_name
-          %w{MY CA ROOT SPC}
+          %w{MY CA ROOT AUTHROOT DISALLOWED SPC TRUST TRUSTEDPEOPLE TRUSTEDPUBLISHER CLIENTAUTHISSUER TRUSTEDDEVICES SMARTCARDROOT WEBHOSTING REMOTE\ DESKTOP}
         end
       end
     end