diff options
author | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-04 12:45:47 +0000 |
---|---|---|
committer | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-04 12:45:47 +0000 |
commit | 0f24cdec9ed4a2023b682e7cd5492b1602100b09 (patch) | |
tree | c8656136b5cae70a845f4691ad6651a3fff30268 | |
parent | e4664efaf8c29b7f670157266d2d3551fdde6776 (diff) | |
download | ruby-0f24cdec9ed4a2023b682e7cd5492b1602100b09.tar.gz |
Fallback to Digest::SHA512
`Gem::Package::TarWriter#add_file_signed` expects to fallback to
`Digest::SHA512`, and `digest.respond_to? :name` or not.
So lib/rubygems/security.rb should use same logic for
`Gem::Security::DIGEST_ALGORITHM` and `Gem::Security::DIGEST_NAME`.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 ## |