Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MSYS-836] fixes for ruby2.0 and FFI destroy object messages #32

Merged
merged 2 commits into from
Jun 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/win32/certstore.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/win32/certstore/mixin/assertions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down