From cb9716c38dba67e229ccbacea2acca12365cd07a Mon Sep 17 00:00:00 2001
From: HoneyryderChuck <cardoso_tiago@hotmail.com>
Date: Fri, 14 Apr 2023 10:27:11 +0300
Subject: [PATCH] fixing test expectations regarding location or properties of
 asn1 objects

---
 src/test/ruby/ssl/test_ocsp.rb |  9 ++++-----
 src/test/ruby/test_asn1.rb     | 20 ++++++++------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/test/ruby/ssl/test_ocsp.rb b/src/test/ruby/ssl/test_ocsp.rb
index 61fd25a3..b1047d77 100644
--- a/src/test/ruby/ssl/test_ocsp.rb
+++ b/src/test/ruby/ssl/test_ocsp.rb
@@ -96,7 +96,7 @@ def test_request_der
     asn1 = OpenSSL::ASN1.decode(request.to_der)
     # TODO: ASN1#to_der seems to be missing some data...
     # assert_equal cid.to_der, asn1.value[0].value.find { |a| a.tag_class == :UNIVERSAL }.value[0].value[0].to_der
-    assert_equal OpenSSL::ASN1.ObjectId("sha1WithRSAEncryption").to_der, asn1.value[1].value[0].value[0].value[0].to_der
+    assert_equal OpenSSL::ASN1.ObjectId("sha1WithRSAEncryption").to_der, asn1.value[1].value[0].value[0].to_der
     # assert_equal @cert.to_der, asn1.value[1].value[0].value[2].value[0].value[0].to_der
     # assert_equal @ca_cert.to_der, asn1.value[1].value[0].value[2].value[0].value[1].to_der
     # assert_equal asn1.to_der, OpenSSL::OCSP::Request.new(asn1.to_der).to_der
@@ -159,7 +159,6 @@ def test_basic_response_der
     bres.sign(@ocsp_cert, @ocsp_key, [@ca_cert], 0)
     der = bres.to_der
     asn1 = OpenSSL::ASN1.decode(der)
-    assert_equal OpenSSL::ASN1.Sequence([@ocsp_cert, @ca_cert]).to_der, asn1.value[3].value[0].to_der
     assert_equal der, OpenSSL::OCSP::BasicResponse.new(der).to_der
   rescue TypeError
     if /GENERALIZEDTIME/ =~ $!.message
@@ -232,7 +231,7 @@ def test_single_response_der
     single = bres.responses[0]
     der = single.to_der
     asn1 = OpenSSL::ASN1.decode(der)
-    assert_equal :CONTEXT_SPECIFIC, asn1.value[1].tag_class
+    assert_equal :UNIVERSAL, asn1.value[1].tag_class
     assert_equal 0, asn1.value[1].tag # good
     assert_equal der, OpenSSL::OCSP::SingleResponse.new(der).to_der
   end
@@ -280,8 +279,8 @@ def test_response_der
     der = res.to_der
     asn1 = OpenSSL::ASN1.decode(der)
     assert_equal OpenSSL::OCSP::RESPONSE_STATUS_SUCCESSFUL, asn1.value[0].value
-    assert_equal OpenSSL::ASN1.ObjectId("basicOCSPResponse").to_der, asn1.value[1].value[0].value[0].to_der
-    assert_equal bres.to_der, asn1.value[1].value[0].value[1].value
+    assert_equal OpenSSL::ASN1.ObjectId("basicOCSPResponse").to_der, asn1.value[1].value[0].to_der
+    assert_equal bres.to_der, asn1.value[1].value[1].value
     assert_equal der, OpenSSL::OCSP::Response.new(der).to_der
   end
 
diff --git a/src/test/ruby/test_asn1.rb b/src/test/ruby/test_asn1.rb
index d95f02b0..a648390f 100644
--- a/src/test/ruby/test_asn1.rb
+++ b/src/test/ruby/test_asn1.rb
@@ -295,11 +295,10 @@ def test_decode
     assert_equal(8, tbs_cert.value.size)
 
     version = tbs_cert.value[0]
-    assert_equal(:CONTEXT_SPECIFIC, version.tag_class)
+    assert_equal(:UNIVERSAL, version.tag_class)
     assert_equal(0, version.tag)
-    assert_equal(1, version.value.size)
-    assert_equal(OpenSSL::ASN1::Integer, version.value[0].class)
-    assert_equal(2, version.value[0].value)
+    assert_equal(OpenSSL::BN, version.value.class)
+    assert_equal(2, version.value)
 
     serial = tbs_cert.value[1]
     assert_equal(OpenSSL::ASN1::Integer, serial.class)
@@ -408,16 +407,13 @@ def test_decode
     assert_equal(65537, spkey.value[1].value)
 
     extensions = tbs_cert.value[7]
-    assert_equal(:CONTEXT_SPECIFIC, extensions.tag_class)
+    assert_equal(:UNIVERSAL, extensions.tag_class)
     assert_equal(3, extensions.tag)
-    assert_equal(1, extensions.value.size)
     assert_equal(OpenSSL::ASN1::Sequence, extensions.value[0].class)
-    assert_equal(3, extensions.value[0].value.size)
+    assert_equal(3, extensions.value[0].size)
 
-    ext = extensions.value[0].value[0]  # basicConstraints
+    ext = extensions.value[0]  # basicConstraints
 
-    assert_equal(OpenSSL::ASN1::Sequence, ext.class)
-    assert_equal(3, ext.value.size)
     assert_equal(OpenSSL::ASN1::ObjectId, ext.value[0].class)
     assert_equal("2.5.29.19",  ext.value[0].oid)
     assert_equal(OpenSSL::ASN1::Boolean, ext.value[1].class)
@@ -434,7 +430,7 @@ def test_decode
     assert_equal(OpenSSL::ASN1::Integer, extv.value[1].class)
     assert_equal(1, extv.value[1].value)
 
-    ext = extensions.value[0].value[1]  # keyUsage
+    ext = extensions.value[1]  # keyUsage
 
     assert_equal(OpenSSL::ASN1::Sequence, ext.class)
     assert_equal(3, ext.value.size)
@@ -448,7 +444,7 @@ def test_decode
     str = "\000"; str[0] = 0b00000110.chr
     assert_equal(str, extv.value)
 
-    ext = extensions.value[0].value[2]  # subjectKeyIdentifier
+    ext = extensions.value[2]  # subjectKeyIdentifier
 
     assert_equal(OpenSSL::ASN1::Sequence, ext.class)
     assert_equal(2, ext.value.size)