mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[rubygems/rubygems] Avoid loading the digest
gem unnecessarily
OpenSSL includes what we need. https://github.com/rubygems/rubygems/commit/955f3b72ca
This commit is contained in:
parent
a959342abf
commit
9d28618091
3 changed files with 10 additions and 11 deletions
|
@ -1,4 +1,3 @@
|
|||
require 'digest'
|
||||
require_relative 'openssl'
|
||||
|
||||
##
|
||||
|
@ -87,7 +86,7 @@ class Gem::S3URISigner
|
|||
"AWS4-HMAC-SHA256",
|
||||
date_time,
|
||||
credential_info,
|
||||
Digest::SHA256.hexdigest(canonical_request),
|
||||
OpenSSL::Digest::SHA256.hexdigest(canonical_request),
|
||||
].join("\n")
|
||||
end
|
||||
|
||||
|
|
|
@ -225,7 +225,7 @@ class Gem::Source::Git < Gem::Source
|
|||
# A hash for the git gem based on the git repository URI.
|
||||
|
||||
def uri_hash # :nodoc:
|
||||
require 'digest'
|
||||
require_relative '../openssl'
|
||||
|
||||
normalized =
|
||||
if @repository =~ %r{^\w+://(\w+@)?}
|
||||
|
@ -235,6 +235,6 @@ class Gem::Source::Git < Gem::Source
|
|||
@repository
|
||||
end
|
||||
|
||||
Digest::SHA1.hexdigest normalized
|
||||
OpenSSL::Digest::SHA1.hexdigest normalized
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require_relative 'package/tar_test_case'
|
||||
require 'digest'
|
||||
require 'rubygems/openssl'
|
||||
|
||||
class TestGemPackage < Gem::Package::TarTestCase
|
||||
def setup
|
||||
|
@ -84,17 +84,17 @@ class TestGemPackage < Gem::Package::TarTestCase
|
|||
io.write spec.to_yaml
|
||||
end
|
||||
|
||||
metadata_sha256 = Digest::SHA256.hexdigest s.string
|
||||
metadata_sha512 = Digest::SHA512.hexdigest s.string
|
||||
metadata_sha256 = OpenSSL::Digest::SHA256.hexdigest s.string
|
||||
metadata_sha512 = OpenSSL::Digest::SHA512.hexdigest s.string
|
||||
|
||||
expected = {
|
||||
'SHA512' => {
|
||||
'metadata.gz' => metadata_sha512,
|
||||
'data.tar.gz' => Digest::SHA512.hexdigest(tar),
|
||||
'data.tar.gz' => OpenSSL::Digest::SHA512.hexdigest(tar),
|
||||
},
|
||||
'SHA256' => {
|
||||
'metadata.gz' => metadata_sha256,
|
||||
'data.tar.gz' => Digest::SHA256.hexdigest(tar),
|
||||
'data.tar.gz' => OpenSSL::Digest::SHA256.hexdigest(tar),
|
||||
},
|
||||
}
|
||||
|
||||
|
@ -857,7 +857,7 @@ class TestGemPackage < Gem::Package::TarTestCase
|
|||
io.write metadata_gz
|
||||
end
|
||||
|
||||
digest = Digest::SHA1.new
|
||||
digest = OpenSSL::Digest::SHA1.new
|
||||
digest << metadata_gz
|
||||
|
||||
checksums = {
|
||||
|
@ -1016,7 +1016,7 @@ class TestGemPackage < Gem::Package::TarTestCase
|
|||
bogus_data = Gem::Util.gzip 'hello'
|
||||
fake_signer = Class.new do
|
||||
def digest_name; 'SHA512'; end
|
||||
def digest_algorithm; Digest(:SHA512).new; end
|
||||
def digest_algorithm; OpenSSL::Digest(:SHA512).new; end
|
||||
def key; 'key'; end
|
||||
def sign(*); 'fake_sig'; end
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue