diff options
| -rw-r--r-- | lib/rubygems/package/tar_writer.rb | 3 | ||||
| -rw-r--r-- | lib/rubygems/security.rb | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb index a2dbab9f2f..aa00633cdd 100644 --- a/lib/rubygems/package/tar_writer.rb +++ b/lib/rubygems/package/tar_writer.rb @@ -187,8 +187,7 @@ class Gem::Package::TarWriter if digest.respond_to? :name then digest.name else - /::([^:]+)$/ =~ digest.class.name - $1 + digest.class.name[/::([^:]+)\z/, 1] end digest_name == signer.digest_name diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb index 236577c5a3..dc5e91a6f4 100644 --- a/lib/rubygems/security.rb +++ b/lib/rubygems/security.rb @@ -344,14 +344,19 @@ module Gem::Security OpenSSL::Digest::SHA256 elsif defined?(OpenSSL::Digest::SHA1) then OpenSSL::Digest::SHA1 + else + require 'digest' + Digest::SHA512 end ## # Used internally to select the signing digest from all computed digests DIGEST_NAME = # :nodoc: - if DIGEST_ALGORITHM then + if DIGEST_ALGORITHM.method_defined? :name then DIGEST_ALGORITHM.new.name + else + DIGEST_ALGORITHM.name[/::([^:]+)\z/, 1] end ## |