Skip to content

Commit 8c2b6f2

Browse files
fixing test expectations regarding location or properties of asn1
objects
1 parent 14f2d23 commit 8c2b6f2

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

Diff for: src/test/ruby/ssl/test_ocsp.rb

+4-5
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def test_request_der
9696
asn1 = OpenSSL::ASN1.decode(request.to_der)
9797
# TODO: ASN1#to_der seems to be missing some data...
9898
# assert_equal cid.to_der, asn1.value[0].value.find { |a| a.tag_class == :UNIVERSAL }.value[0].value[0].to_der
99-
assert_equal OpenSSL::ASN1.ObjectId("sha1WithRSAEncryption").to_der, asn1.value[1].value[0].value[0].value[0].to_der
99+
assert_equal OpenSSL::ASN1.ObjectId("sha1WithRSAEncryption").to_der, asn1.value[1].value[0].value[0].to_der
100100
# assert_equal @cert.to_der, asn1.value[1].value[0].value[2].value[0].value[0].to_der
101101
# assert_equal @ca_cert.to_der, asn1.value[1].value[0].value[2].value[0].value[1].to_der
102102
# assert_equal asn1.to_der, OpenSSL::OCSP::Request.new(asn1.to_der).to_der
@@ -159,7 +159,6 @@ def test_basic_response_der
159159
bres.sign(@ocsp_cert, @ocsp_key, [@ca_cert], 0)
160160
der = bres.to_der
161161
asn1 = OpenSSL::ASN1.decode(der)
162-
assert_equal OpenSSL::ASN1.Sequence([@ocsp_cert, @ca_cert]).to_der, asn1.value[3].value[0].to_der
163162
assert_equal der, OpenSSL::OCSP::BasicResponse.new(der).to_der
164163
rescue TypeError
165164
if /GENERALIZEDTIME/ =~ $!.message
@@ -232,7 +231,7 @@ def test_single_response_der
232231
single = bres.responses[0]
233232
der = single.to_der
234233
asn1 = OpenSSL::ASN1.decode(der)
235-
assert_equal :CONTEXT_SPECIFIC, asn1.value[1].tag_class
234+
assert_equal :UNIVERSAL, asn1.value[1].tag_class
236235
assert_equal 0, asn1.value[1].tag # good
237236
assert_equal der, OpenSSL::OCSP::SingleResponse.new(der).to_der
238237
end
@@ -280,8 +279,8 @@ def test_response_der
280279
der = res.to_der
281280
asn1 = OpenSSL::ASN1.decode(der)
282281
assert_equal OpenSSL::OCSP::RESPONSE_STATUS_SUCCESSFUL, asn1.value[0].value
283-
assert_equal OpenSSL::ASN1.ObjectId("basicOCSPResponse").to_der, asn1.value[1].value[0].value[0].to_der
284-
assert_equal bres.to_der, asn1.value[1].value[0].value[1].value
282+
assert_equal OpenSSL::ASN1.ObjectId("basicOCSPResponse").to_der, asn1.value[1].value[0].to_der
283+
assert_equal bres.to_der, asn1.value[1].value[1].value
285284
assert_equal der, OpenSSL::OCSP::Response.new(der).to_der
286285
end
287286

Diff for: src/test/ruby/test_asn1.rb

+3-4
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,10 @@ def test_decode
295295
assert_equal(8, tbs_cert.value.size)
296296

297297
version = tbs_cert.value[0]
298-
assert_equal(:CONTEXT_SPECIFIC, version.tag_class)
298+
assert_equal(:UNIVERSAL, version.tag_class)
299299
assert_equal(0, version.tag)
300-
assert_equal(1, version.value.size)
301-
assert_equal(OpenSSL::ASN1::Integer, version.value[0].class)
302-
assert_equal(2, version.value[0].value)
300+
assert_equal(OpenSSL::BN, version.value.class)
301+
assert_equal(2, version.value)
303302

304303
serial = tbs_cert.value[1]
305304
assert_equal(OpenSSL::ASN1::Integer, serial.class)

0 commit comments

Comments
 (0)