Skip to content

Commit 950b447

Browse files
committed
digest: refactor tests for name aliases
Use explicit strings instead of relying on OpenSSL::ASN1::ObjectId methods. It is reduced to just SHA-256 because testing other algorithms does not improve test coverage for ruby/openssl.
1 parent fe5f2aa commit 950b447

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

test/openssl/test_digest.rb

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,17 @@ def test_digest_constants
6262
end
6363

6464
def test_digest_by_oid_and_name
65-
check_digest(OpenSSL::ASN1::ObjectId.new("MD5"))
66-
check_digest(OpenSSL::ASN1::ObjectId.new("SHA1"))
65+
# SHA256
66+
o1 = OpenSSL::Digest.digest("SHA256", "")
67+
o2 = OpenSSL::Digest.digest("sha256", "")
68+
assert_equal(o1, o2)
69+
o3 = OpenSSL::Digest.digest("2.16.840.1.101.3.4.2.1", "")
70+
assert_equal(o1, o3)
71+
72+
# An alias for SHA256 recognized by EVP_get_digestbyname(), but not by
73+
# EVP_MD_fetch()
74+
o4 = OpenSSL::Digest.digest("RSA-SHA256", "")
75+
assert_equal(o1, o4)
6776
end
6877

6978
def encode16(str)
@@ -109,13 +118,6 @@ def test_sha3
109118
assert_equal(s512, OpenSSL::Digest.hexdigest('SHA3-512', ""))
110119
end
111120

112-
def test_digest_by_oid_and_name_sha2
113-
check_digest(OpenSSL::ASN1::ObjectId.new("SHA224"))
114-
check_digest(OpenSSL::ASN1::ObjectId.new("SHA256"))
115-
check_digest(OpenSSL::ASN1::ObjectId.new("SHA384"))
116-
check_digest(OpenSSL::ASN1::ObjectId.new("SHA512"))
117-
end
118-
119121
def test_openssl_digest
120122
assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5")
121123

@@ -132,17 +134,6 @@ def test_digests
132134
assert_include digests, "sha256"
133135
assert_include digests, "sha512"
134136
end
135-
136-
private
137-
138-
def check_digest(oid)
139-
d = OpenSSL::Digest.new(oid.sn)
140-
assert_not_nil(d)
141-
d = OpenSSL::Digest.new(oid.ln)
142-
assert_not_nil(d)
143-
d = OpenSSL::Digest.new(oid.oid)
144-
assert_not_nil(d)
145-
end
146137
end
147138

148139
end

0 commit comments

Comments
 (0)