1 files changed, 29 insertions, 32 deletions
diff --git a/test/openssl/test_digest.rb b/test/openssl/test_digest.rb
index 0bf66b826a..8d7046e831 100644
--- a/test/openssl/test_digest.rb
+++ b/test/openssl/test_digest.rb
@@ -21,8 +21,8 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
     @d1 << data
     assert_equal(bin, @d1.digest)
     assert_equal(hex, @d1.hexdigest)
-    assert_equal(bin, OpenSSL::Digest::MD5.digest(data))
-    assert_equal(hex, OpenSSL::Digest::MD5.hexdigest(data))
+    assert_equal(bin, OpenSSL::Digest.digest('MD5', data))
+    assert_equal(hex, OpenSSL::Digest.hexdigest('MD5', data))
   end
 
   def test_eql
@@ -53,19 +53,8 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
     assert_equal(dig1, dig2, "reset")
   end
 
-  def test_required_digests
-    algorithms = OpenSSL::Digest::ALGORITHMS
-    required = %w{MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512}
-
-    required.each do |name|
-      assert_include(algorithms, name)
-    end
-  end
-
   def test_digest_constants
-    algorithms = OpenSSL::Digest::ALGORITHMS
-
-    algorithms.each do |name|
+    %w{MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512}.each do |name|
       assert_not_nil(OpenSSL::Digest.new(name))
       klass = OpenSSL::Digest.const_get(name.tr('-', '_'))
       assert_not_nil(klass.new)
@@ -87,39 +76,39 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
     sha384_a = "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31"
     sha512_a = "1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75"
 
-    assert_equal(sha224_a, OpenSSL::Digest::SHA224.hexdigest("a"))
-    assert_equal(sha256_a, OpenSSL::Digest::SHA256.hexdigest("a"))
-    assert_equal(sha384_a, OpenSSL::Digest::SHA384.hexdigest("a"))
-    assert_equal(sha512_a, OpenSSL::Digest::SHA512.hexdigest("a"))
+    assert_equal(sha224_a, OpenSSL::Digest.hexdigest('SHA224', "a"))
+    assert_equal(sha256_a, OpenSSL::Digest.hexdigest('SHA256', "a"))
+    assert_equal(sha384_a, OpenSSL::Digest.hexdigest('SHA384', "a"))
+    assert_equal(sha512_a, OpenSSL::Digest.hexdigest('SHA512', "a"))
 
-    assert_equal(sha224_a, encode16(OpenSSL::Digest::SHA224.digest("a")))
-    assert_equal(sha256_a, encode16(OpenSSL::Digest::SHA256.digest("a")))
-    assert_equal(sha384_a, encode16(OpenSSL::Digest::SHA384.digest("a")))
-    assert_equal(sha512_a, encode16(OpenSSL::Digest::SHA512.digest("a")))
+    assert_equal(sha224_a, encode16(OpenSSL::Digest.digest('SHA224', "a")))
+    assert_equal(sha256_a, encode16(OpenSSL::Digest.digest('SHA256', "a")))
+    assert_equal(sha384_a, encode16(OpenSSL::Digest.digest('SHA384', "a")))
+    assert_equal(sha512_a, encode16(OpenSSL::Digest.digest('SHA512', "a")))
   end
 
   def test_sha512_truncate
-    pend "SHA512_224 is not implemented" unless OpenSSL::Digest.const_defined?(:SHA512_224)
+    pend "SHA512_224 is not implemented" unless digest_available?('SHA512-224')
     sha512_224_a = "d5cdb9ccc769a5121d4175f2bfdd13d6310e0d3d361ea75d82108327"
     sha512_256_a = "455e518824bc0601f9fb858ff5c37d417d67c2f8e0df2babe4808858aea830f8"
 
-    assert_equal(sha512_224_a, OpenSSL::Digest::SHA512_224.hexdigest("a"))
-    assert_equal(sha512_256_a, OpenSSL::Digest::SHA512_256.hexdigest("a"))
+    assert_equal(sha512_224_a, OpenSSL::Digest.hexdigest('SHA512-224', "a"))
+    assert_equal(sha512_256_a, OpenSSL::Digest.hexdigest('SHA512-256', "a"))
 
-    assert_equal(sha512_224_a, encode16(OpenSSL::Digest::SHA512_224.digest("a")))
-    assert_equal(sha512_256_a, encode16(OpenSSL::Digest::SHA512_256.digest("a")))
+    assert_equal(sha512_224_a, encode16(OpenSSL::Digest.digest('SHA512-224', "a")))
+    assert_equal(sha512_256_a, encode16(OpenSSL::Digest.digest('SHA512-256', "a")))
   end
 
   def test_sha3
-    pend "SHA3 is not implemented" unless OpenSSL::Digest.const_defined?(:SHA3_224)
+    pend "SHA3 is not implemented" unless digest_available?('SHA3-224')
     s224 = '6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7'
     s256 = 'a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a'
     s384 = '0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004'
     s512 = 'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26'
-    assert_equal(OpenSSL::Digest::SHA3_224.hexdigest(""), s224)
-    assert_equal(OpenSSL::Digest::SHA3_256.hexdigest(""), s256)
-    assert_equal(OpenSSL::Digest::SHA3_384.hexdigest(""), s384)
-    assert_equal(OpenSSL::Digest::SHA3_512.hexdigest(""), s512)
+    assert_equal(OpenSSL::Digest.hexdigest('SHA3-224', ""), s224)
+    assert_equal(OpenSSL::Digest.hexdigest('SHA3-256', ""), s256)
+    assert_equal(OpenSSL::Digest.hexdigest('SHA3-384', ""), s384)
+    assert_equal(OpenSSL::Digest.hexdigest('SHA3-512', ""), s512)
   end
 
   def test_digest_by_oid_and_name_sha2
@@ -147,6 +136,14 @@ class OpenSSL::TestDigest < OpenSSL::TestCase
     d = OpenSSL::Digest.new(oid.oid)
     assert_not_nil(d)
   end
+
+  def digest_available?(name)
+    begin
+      OpenSSL::Digest.new(name)
+    rescue RuntimeError
+      false
+    end
+  end
 end
 
 end