diff options
author | Bart de Water <496367+bdewater@users.noreply.github.com> | 2020-06-28 14:39:26 -0400 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-07-31 21:07:19 +0900 |
commit | 8161cf85ba4f9091176536bcac9107879e4293a1 (patch) | |
tree | d737649bae49f26bff646e2868608e2aa91ef2bb /test | |
parent | e7b6e0ff5823c422cd3e508d2b7104a91a2e36f6 (diff) | |
download | ruby-8161cf85ba4f9091176536bcac9107879e4293a1.tar.gz |
Stop using deprecated OpenSSL::Digest constants
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/test_gem_package.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_package_tar_writer.rb | 4 | ||||
-rw-r--r-- | test/rubygems/test_gem_security_policy.rb | 12 | ||||
-rw-r--r-- | test/rubygems/test_gem_security_trust_dir.rb | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index adf11a1941..3a97a85a74 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -1018,7 +1018,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); end + def digest_algorithm; Digest(:SHA512).new; end def key; 'key'; end def sign(*); 'fake_sig'; end end diff --git a/test/rubygems/test_gem_package_tar_writer.rb b/test/rubygems/test_gem_package_tar_writer.rb index 9a3feca269..e31efdd55f 100644 --- a/test/rubygems/test_gem_package_tar_writer.rb +++ b/test/rubygems/test_gem_package_tar_writer.rb @@ -71,7 +71,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase end def test_add_file_digest - digest_algorithms = Digest::SHA1, Digest::SHA512 + digest_algorithms = Digest::SHA1.new, Digest::SHA512.new Time.stub :now, Time.at(1458518157) do digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io| @@ -94,7 +94,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase end def test_add_file_digest_multiple - digest_algorithms = [Digest::SHA1, Digest::SHA512] + digest_algorithms = [Digest::SHA1.new, Digest::SHA512.new] Time.stub :now, Time.at(1458518157) do digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io| diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb index 4d5d9bbe33..86100d7c74 100644 --- a/test/rubygems/test_gem_security_policy.rb +++ b/test/rubygems/test_gem_security_policy.rb @@ -32,7 +32,7 @@ class TestGemSecurityPolicy < Gem::TestCase s.files = %w[lib/code.rb] end - @digest = Gem::Security::DIGEST_ALGORITHM + @digest = OpenSSL::Digest.new Gem::Security::DIGEST_NAME @trust_dir = Gem::Security.trust_dir.dir # HACK use the object @no = Gem::Security::NoSecurity @@ -395,13 +395,11 @@ class TestGemSecurityPolicy < Gem::TestCase def test_verify_wrong_digest_type Gem::Security.trust_dir.trust_cert PUBLIC_CERT - sha512 = OpenSSL::Digest::SHA512 - - data = sha512.new + data = OpenSSL::Digest.new('SHA512') data << 'hello' digests = { 'SHA512' => { 0 => data } } - signature = PRIVATE_KEY.sign sha512.new, data.digest + signature = PRIVATE_KEY.sign 'sha512', data.digest signatures = { 0 => signature } e = assert_raises Gem::Security::Exception do @@ -480,7 +478,7 @@ class TestGemSecurityPolicy < Gem::TestCase def s.full_name() 'metadata.gz' end digests = package.digest s - digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.new 'hello' + digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.hexdigest 'hello' metadata_gz_digest = digests[Gem::Security::DIGEST_NAME]['metadata.gz'] @@ -509,7 +507,7 @@ class TestGemSecurityPolicy < Gem::TestCase def s.full_name() 'metadata.gz' end digests = package.digest s - digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.new 'hello' + digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.hexdigest 'hello' assert_raises Gem::Security::Exception do @high.verify_signatures @spec, digests, {} diff --git a/test/rubygems/test_gem_security_trust_dir.rb b/test/rubygems/test_gem_security_trust_dir.rb index 9a40f85eb6..64871f7bd3 100644 --- a/test/rubygems/test_gem_security_trust_dir.rb +++ b/test/rubygems/test_gem_security_trust_dir.rb @@ -17,7 +17,7 @@ class TestGemSecurityTrustDir < Gem::TestCase end def test_cert_path - digest = Gem::Security::DIGEST_ALGORITHM.hexdigest PUBLIC_CERT.subject.to_s + digest = OpenSSL::Digest.hexdigest Gem::Security::DIGEST_NAME, PUBLIC_CERT.subject.to_s expected = File.join @dest_dir, "cert-#{digest}.pem" @@ -41,7 +41,7 @@ class TestGemSecurityTrustDir < Gem::TestCase end def test_name_path - digest = Gem::Security::DIGEST_ALGORITHM.hexdigest PUBLIC_CERT.subject.to_s + digest = OpenSSL::Digest.hexdigest Gem::Security::DIGEST_NAME, PUBLIC_CERT.subject.to_s expected = File.join @dest_dir, "cert-#{digest}.pem" |