@@ -88,7 +88,6 @@ def test_sha2
8888 end
8989
9090 def test_sha512_truncate
91- pend "SHA512_224 is not implemented" unless digest_available? ( 'sha512-224' )
9291 sha512_224_a = "d5cdb9ccc769a5121d4175f2bfdd13d6310e0d3d361ea75d82108327"
9392 sha512_256_a = "455e518824bc0601f9fb858ff5c37d417d67c2f8e0df2babe4808858aea830f8"
9493
@@ -100,15 +99,14 @@ def test_sha512_truncate
10099 end
101100
102101 def test_sha3
103- pend "SHA3 is not implemented" unless digest_available? ( 'sha3-224' )
104102 s224 = '6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7'
105103 s256 = 'a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a'
106104 s384 = '0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004'
107105 s512 = 'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26'
108- assert_equal ( OpenSSL ::Digest . hexdigest ( 'SHA3-224' , "" ) , s224 )
109- assert_equal ( OpenSSL ::Digest . hexdigest ( 'SHA3-256' , "" ) , s256 )
110- assert_equal ( OpenSSL ::Digest . hexdigest ( 'SHA3-384' , "" ) , s384 )
111- assert_equal ( OpenSSL ::Digest . hexdigest ( 'SHA3-512' , "" ) , s512 )
106+ assert_equal ( s224 , OpenSSL ::Digest . hexdigest ( 'SHA3-224' , "" ) )
107+ assert_equal ( s256 , OpenSSL ::Digest . hexdigest ( 'SHA3-256' , "" ) )
108+ assert_equal ( s384 , OpenSSL ::Digest . hexdigest ( 'SHA3-384' , "" ) )
109+ assert_equal ( s512 , OpenSSL ::Digest . hexdigest ( 'SHA3-512' , "" ) )
112110 end
113111
114112 def test_digest_by_oid_and_name_sha2
@@ -145,11 +143,6 @@ def check_digest(oid)
145143 d = OpenSSL ::Digest . new ( oid . oid )
146144 assert_not_nil ( d )
147145 end
148-
149- def digest_available? ( name )
150- @digests ||= OpenSSL ::Digest . digests
151- @digests . include? ( name )
152- end
153146end
154147
155148end
0 commit comments