From eb3d906c151b9f31382c07764e03b184da57839c Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Tue, 26 Sep 2023 21:13:33 -0700 Subject: [PATCH 1/4] Replace methods removed in BC 1.75 Several methods and classes were deprecated in BC 1.70 and many of those in the org.bouncycastle.asn1.* were removed in 1.75. This commit moves away from removed method and classes so BouncyCastle can be updated to 1.76. --- src/main/java/org/jruby/ext/openssl/ASN1.java | 37 +++++++++---------- .../org/jruby/ext/openssl/X509Extension.java | 4 +- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/jruby/ext/openssl/ASN1.java b/src/main/java/org/jruby/ext/openssl/ASN1.java index c939e948..8b7b2b54 100644 --- a/src/main/java/org/jruby/ext/openssl/ASN1.java +++ b/src/main/java/org/jruby/ext/openssl/ASN1.java @@ -1072,23 +1072,22 @@ else if ( obj instanceof DERBMPString ) { return ASN1.getClass("ObjectId").newInstance(context, runtime.newString(objId), Block.NULL_BLOCK); } - if ( obj instanceof ASN1ApplicationSpecific ) { // TODO this will likely break in BC version > 1.71 - final ASN1ApplicationSpecific appSpecific = (ASN1ApplicationSpecific) obj; - IRubyObject tag = runtime.newFixnum( appSpecific.getApplicationTag() ); - IRubyObject tag_class = runtime.newSymbol("APPLICATION"); - final ASN1Sequence sequence = (ASN1Sequence) appSpecific.getObject(SEQUENCE); - @SuppressWarnings("unchecked") - final RubyArray valArr = decodeObjects(context, ASN1, sequence.getObjects()); - return ASN1.getClass("ASN1Data").newInstance(context, new IRubyObject[] { valArr, tag, tag_class }, Block.NULL_BLOCK); - } - - if ( obj instanceof ASN1TaggedObject ) { + if (obj instanceof ASN1TaggedObject) { final ASN1TaggedObject taggedObj = (ASN1TaggedObject) obj; - IRubyObject val = decodeObject(context, ASN1, taggedObj.getBaseObject()); - IRubyObject tag = runtime.newFixnum( taggedObj.getTagNo() ); - IRubyObject tag_class = runtime.newSymbol("CONTEXT_SPECIFIC"); - final RubyArray valArr = runtime.newArray(val); - return ASN1.getClass("ASN1Data").newInstance(context, new IRubyObject[] { valArr, tag, tag_class }, Block.NULL_BLOCK); + if (taggedObj.getTagClass() == BERTags.APPLICATION) { + IRubyObject tag = runtime.newFixnum( taggedObj.getTagNo() ); + IRubyObject tag_class = runtime.newSymbol("APPLICATION"); + final ASN1Sequence sequence = (ASN1Sequence) taggedObj.getBaseUniversal(false, SEQUENCE); + @SuppressWarnings("unchecked") + final RubyArray valArr = decodeObjects(context, ASN1, sequence.getObjects()); + return ASN1.getClass("ASN1Data").newInstance(context, new IRubyObject[] { valArr, tag, tag_class }, Block.NULL_BLOCK); + } else { + IRubyObject val = decodeObject(context, ASN1, taggedObj.getBaseObject()); + IRubyObject tag = runtime.newFixnum( taggedObj.getTagNo() ); + IRubyObject tag_class = runtime.newSymbol("CONTEXT_SPECIFIC"); + final RubyArray valArr = runtime.newArray(val); + return ASN1.getClass("ASN1Data").newInstance(context, new IRubyObject[] { valArr, tag, tag_class }, Block.NULL_BLOCK); + } } if ( obj instanceof ASN1Sequence ) { @@ -1698,13 +1697,13 @@ ASN1Encodable toASN1(final ThreadContext context) { } if ( type == DERGeneralString.class ) { - return DERGeneralString.getInstance( val.asString().getBytes() ); + return new DERGeneralString( val.asString().toString() ); } if ( type == DERVisibleString.class ) { - return DERVisibleString.getInstance( val.asString().getBytes() ); + return new DERVisibleString( val.asString().toString() ); } if ( type == DERNumericString.class ) { - return DERNumericString.getInstance( val.asString().getBytes() ); + return new DERNumericString( val.asString().toString() ); } if ( val instanceof RubyString ) { diff --git a/src/main/java/org/jruby/ext/openssl/X509Extension.java b/src/main/java/org/jruby/ext/openssl/X509Extension.java index c199d05b..b50f0ca5 100644 --- a/src/main/java/org/jruby/ext/openssl/X509Extension.java +++ b/src/main/java/org/jruby/ext/openssl/X509Extension.java @@ -38,6 +38,7 @@ import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1Encoding; import org.bouncycastle.asn1.ASN1Integer; +import org.bouncycastle.asn1.ASN1IA5String; import org.bouncycastle.asn1.ASN1Object; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1OctetString; @@ -46,7 +47,6 @@ import org.bouncycastle.asn1.ASN1String; import org.bouncycastle.asn1.ASN1TaggedObject; import org.bouncycastle.asn1.BERTags; -import org.bouncycastle.asn1.DERIA5String; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DERUniversalString; import org.bouncycastle.asn1.DLSequence; @@ -620,7 +620,7 @@ private static boolean formatGeneralName(final GeneralName name, final ByteList case GeneralName.uniformResourceIdentifier: if ( ! tagged ) out.append('U').append('R').append('I'). append(':'); - val = DERIA5String.getInstance(obj).getString(); + val = ASN1IA5String.getInstance(obj).getString(); out.append( ByteList.plain(val) ); break; case GeneralName.directoryName: From 64cadf04624be71dc6bbc517e532a2d9957fd1b8 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Tue, 24 Oct 2023 11:35:33 -0700 Subject: [PATCH 2/4] Prefer ASN1*Strings over DER*Strings in ASN1.java --- src/main/java/org/jruby/ext/openssl/ASN1.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jruby/ext/openssl/ASN1.java b/src/main/java/org/jruby/ext/openssl/ASN1.java index 8b7b2b54..b2efe10c 100644 --- a/src/main/java/org/jruby/ext/openssl/ASN1.java +++ b/src/main/java/org/jruby/ext/openssl/ASN1.java @@ -1697,13 +1697,13 @@ ASN1Encodable toASN1(final ThreadContext context) { } if ( type == DERGeneralString.class ) { - return new DERGeneralString( val.asString().toString() ); + return ASN1GeneralString.getInstance( val.asString().getBytes() ); } if ( type == DERVisibleString.class ) { - return new DERVisibleString( val.asString().toString() ); + return ASN1VisibleString.getInstance( val.asString().getBytes() ); } if ( type == DERNumericString.class ) { - return new DERNumericString( val.asString().toString() ); + return ASN1NumericString.getInstance( val.asString().getBytes() ); } if ( val instanceof RubyString ) { From f13718360605a45049bfa6e1117f2fab42cd6fff Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Thu, 11 Apr 2024 11:48:00 -0700 Subject: [PATCH 3/4] wip, import upstream asn.1 tests --- src/test/ruby/test_asn1.rb | 385 ++++++++++++++++++++++++++++++++++++- 1 file changed, 382 insertions(+), 3 deletions(-) diff --git a/src/test/ruby/test_asn1.rb b/src/test/ruby/test_asn1.rb index b9b2cf83..4976a6fc 100644 --- a/src/test/ruby/test_asn1.rb +++ b/src/test/ruby/test_asn1.rb @@ -3,8 +3,212 @@ class TestASN1 < TestCase + def test_decode_x509_certificate + subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA") + key = Fixtures.pkey("rsa1024") + now = Time.at(Time.now.to_i) # suppress usec + s = 0xdeadbeafdeadbeafdeadbeafdeadbeaf + exts = [ + ["basicConstraints","CA:TRUE,pathlen:1",true], + ["keyUsage","keyCertSign, cRLSign",true], + ["subjectKeyIdentifier","hash",false], + ] + dgst = OpenSSL::Digest.new('SHA256') + cert = issue_cert(subj, key, s, exts, nil, nil, digest: dgst, not_before: now, not_after: now+3600) + + + asn1 = OpenSSL::ASN1.decode(cert) + assert_equal(OpenSSL::ASN1::Sequence, asn1.class) + assert_equal(3, asn1.value.size) + tbs_cert, sig_alg, sig_val = *asn1.value + + assert_equal(OpenSSL::ASN1::Sequence, tbs_cert.class) + assert_equal(8, tbs_cert.value.size) + + version = tbs_cert.value[0] + assert_equal(:CONTEXT_SPECIFIC, 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) + + serial = tbs_cert.value[1] + assert_equal(OpenSSL::ASN1::Integer, serial.class) + assert_equal(0xdeadbeafdeadbeafdeadbeafdeadbeaf, serial.value) + + sig = tbs_cert.value[2] + assert_equal(OpenSSL::ASN1::Sequence, sig.class) + assert_equal(2, sig.value.size) + assert_equal(OpenSSL::ASN1::ObjectId, sig.value[0].class) + assert_equal("1.2.840.113549.1.1.11", sig.value[0].oid) + assert_equal(OpenSSL::ASN1::Null, sig.value[1].class) + + dn = tbs_cert.value[3] # issuer + assert_equal(subj.hash, OpenSSL::X509::Name.new(dn).hash) + assert_equal(OpenSSL::ASN1::Sequence, dn.class) + assert_equal(3, dn.value.size) + assert_equal(OpenSSL::ASN1::Set, dn.value[0].class) + assert_equal(OpenSSL::ASN1::Set, dn.value[1].class) + assert_equal(OpenSSL::ASN1::Set, dn.value[2].class) + assert_equal(1, dn.value[0].value.size) + assert_equal(1, dn.value[1].value.size) + assert_equal(1, dn.value[2].value.size) + assert_equal(OpenSSL::ASN1::Sequence, dn.value[0].value[0].class) + assert_equal(OpenSSL::ASN1::Sequence, dn.value[1].value[0].class) + assert_equal(OpenSSL::ASN1::Sequence, dn.value[2].value[0].class) + assert_equal(2, dn.value[0].value[0].value.size) + assert_equal(2, dn.value[1].value[0].value.size) + assert_equal(2, dn.value[2].value[0].value.size) + oid, value = *dn.value[0].value[0].value + assert_equal(OpenSSL::ASN1::ObjectId, oid.class) + assert_equal("0.9.2342.19200300.100.1.25", oid.oid) + assert_equal(OpenSSL::ASN1::IA5String, value.class) + assert_equal("org", value.value) + oid, value = *dn.value[1].value[0].value + assert_equal(OpenSSL::ASN1::ObjectId, oid.class) + assert_equal("0.9.2342.19200300.100.1.25", oid.oid) + assert_equal(OpenSSL::ASN1::IA5String, value.class) + assert_equal("ruby-lang", value.value) + oid, value = *dn.value[2].value[0].value + assert_equal(OpenSSL::ASN1::ObjectId, oid.class) + assert_equal("2.5.4.3", oid.oid) + assert_equal(OpenSSL::ASN1::UTF8String, value.class) + assert_equal("TestCA", value.value) + + validity = tbs_cert.value[4] + assert_equal(OpenSSL::ASN1::Sequence, validity.class) + assert_equal(2, validity.value.size) + assert_equal(OpenSSL::ASN1::UTCTime, validity.value[0].class) + assert_equal(now, validity.value[0].value) + assert_equal(OpenSSL::ASN1::UTCTime, validity.value[1].class) + assert_equal(now+3600, validity.value[1].value) + + dn = tbs_cert.value[5] # subject + assert_equal(subj.hash, OpenSSL::X509::Name.new(dn).hash) + assert_equal(OpenSSL::ASN1::Sequence, dn.class) + assert_equal(3, dn.value.size) + assert_equal(OpenSSL::ASN1::Set, dn.value[0].class) + assert_equal(OpenSSL::ASN1::Set, dn.value[1].class) + assert_equal(OpenSSL::ASN1::Set, dn.value[2].class) + assert_equal(1, dn.value[0].value.size) + assert_equal(1, dn.value[1].value.size) + assert_equal(1, dn.value[2].value.size) + assert_equal(OpenSSL::ASN1::Sequence, dn.value[0].value[0].class) + assert_equal(OpenSSL::ASN1::Sequence, dn.value[1].value[0].class) + assert_equal(OpenSSL::ASN1::Sequence, dn.value[2].value[0].class) + assert_equal(2, dn.value[0].value[0].value.size) + assert_equal(2, dn.value[1].value[0].value.size) + assert_equal(2, dn.value[2].value[0].value.size) + oid, value = *dn.value[0].value[0].value + assert_equal(OpenSSL::ASN1::ObjectId, oid.class) + assert_equal("0.9.2342.19200300.100.1.25", oid.oid) + assert_equal(OpenSSL::ASN1::IA5String, value.class) + assert_equal("org", value.value) + oid, value = *dn.value[1].value[0].value + assert_equal(OpenSSL::ASN1::ObjectId, oid.class) + assert_equal("0.9.2342.19200300.100.1.25", oid.oid) + assert_equal(OpenSSL::ASN1::IA5String, value.class) + assert_equal("ruby-lang", value.value) + oid, value = *dn.value[2].value[0].value + assert_equal(OpenSSL::ASN1::ObjectId, oid.class) + assert_equal("2.5.4.3", oid.oid) + assert_equal(OpenSSL::ASN1::UTF8String, value.class) + assert_equal("TestCA", value.value) + + pkey = tbs_cert.value[6] + assert_equal(OpenSSL::ASN1::Sequence, pkey.class) + assert_equal(2, pkey.value.size) + assert_equal(OpenSSL::ASN1::Sequence, pkey.value[0].class) + assert_equal(2, pkey.value[0].value.size) + assert_equal(OpenSSL::ASN1::ObjectId, pkey.value[0].value[0].class) + assert_equal("1.2.840.113549.1.1.1", pkey.value[0].value[0].oid) + assert_equal(OpenSSL::ASN1::BitString, pkey.value[1].class) + assert_equal(0, pkey.value[1].unused_bits) + spkey = OpenSSL::ASN1.decode(pkey.value[1].value) + assert_equal(OpenSSL::ASN1::Sequence, spkey.class) + assert_equal(2, spkey.value.size) + assert_equal(OpenSSL::ASN1::Integer, spkey.value[0].class) + assert_equal(cert.public_key.n, spkey.value[0].value) + assert_equal(OpenSSL::ASN1::Integer, spkey.value[1].class) + assert_equal(cert.public_key.e, spkey.value[1].value) + + extensions = tbs_cert.value[7] + assert_equal(:CONTEXT_SPECIFIC, 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) + + ext = extensions.value[0].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) + assert_equal(true, ext.value[1].value) + assert_equal(OpenSSL::ASN1::OctetString, ext.value[2].class) + extv = OpenSSL::ASN1.decode(ext.value[2].value) + assert_equal(OpenSSL::ASN1::Sequence, extv.class) + assert_equal(2, extv.value.size) + assert_equal(OpenSSL::ASN1::Boolean, extv.value[0].class) + assert_equal(true, extv.value[0].value) + assert_equal(OpenSSL::ASN1::Integer, extv.value[1].class) + assert_equal(1, extv.value[1].value) + + ext = extensions.value[0].value[1] # keyUsage + 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.15", ext.value[0].oid) + assert_equal(OpenSSL::ASN1::Boolean, ext.value[1].class) + assert_equal(true, ext.value[1].value) + assert_equal(OpenSSL::ASN1::OctetString, ext.value[2].class) + extv = OpenSSL::ASN1.decode(ext.value[2].value) + assert_equal(OpenSSL::ASN1::BitString, extv.class) + str = +"\000"; str[0] = 0b00000110.chr + assert_equal(str, extv.value) + + ext = extensions.value[0].value[2] # subjectKeyIdentifier + assert_equal(OpenSSL::ASN1::Sequence, ext.class) + assert_equal(2, ext.value.size) + assert_equal(OpenSSL::ASN1::ObjectId, ext.value[0].class) + assert_equal("2.5.29.14", ext.value[0].oid) + assert_equal(OpenSSL::ASN1::OctetString, ext.value[1].class) + extv = OpenSSL::ASN1.decode(ext.value[1].value) + assert_equal(OpenSSL::ASN1::OctetString, extv.class) + sha1 = OpenSSL::Digest.new('SHA1') + sha1.update(pkey.value[1].value) + assert_equal(sha1.digest, extv.value) + + assert_equal(OpenSSL::ASN1::Sequence, sig_alg.class) + assert_equal(2, sig_alg.value.size) + assert_equal(OpenSSL::ASN1::ObjectId, pkey.value[0].value[0].class) + assert_equal("1.2.840.113549.1.1.1", pkey.value[0].value[0].oid) + assert_equal(OpenSSL::ASN1::Null, pkey.value[0].value[1].class) + + assert_equal(OpenSSL::ASN1::BitString, sig_val.class) + cululated_sig = key.sign(OpenSSL::Digest.new('SHA256'), tbs_cert.to_der) + # TODO: Import Issue + # Fails from import with: + # <"\x9E\x19\xE3oI\xC0\x85n$\xF4\xCE\n" + + # "\x87\xA6\xFCu\x1AQbti\xB1\xE0o\xD5\x18?}\xFAEq\xC8\xEF\x17K\xCA|d\xDEu;%\xFB\xA1\xD4\x14\x04\x837\x90E\xAC.p=\x14\xA7\x8B\xAE\xC4\xBE-\x99\xBAx\xB8\x9B+\x87\x80\e\xA1\x17{\fV\xA0\xCF\xA60b\xDFc\x06\x81\xFB\xD3:\x01\x17\x8F\xC5[\xE0m\xAB,\xD3D\xBE\xA0\xA5\x8C\x1E\xCB\x18!\xBF&\x17\xA6\xCF\x8A\xDD\xF1\xB4\x1C\x89\xD8t\xAEz\x95\xC6\xE4\x9E\xA3\xA4"> + # expected but was + # <",\xF4.\x1CH\xD5y\xFE\x05~\xB2\x05\xB7\xCB{2VwdZ\xD7\r^\x87AF\x16\x1A\xC8+U\xA1\xCA'\x1Ca\xCE}\xD2H + #assert_equal(cululated_sig, sig_val.value) + end + def test_encode_boolean - encode_decode_test(OpenSSL::ASN1::Boolean, [true, false]) + encode_decode_test1(OpenSSL::ASN1::Boolean, [true, false]) + end + + def test_end_of_content + # TODO: Import Issue + # raises OpenSSL::ASN1::ASN1Error: unexpected end-of-contents marker + #encode_decode_test B(%w{ 00 00 }), OpenSSL::ASN1::EndOfContent.new + assert_raise(OpenSSL::ASN1::ASN1Error) { + OpenSSL::ASN1.decode(B(%w{ 00 01 00 })) + } end def test_encode_integer @@ -21,6 +225,13 @@ def test_encode_integer assert_equal i, OpenSSL::ASN1.decode(ai.to_der).value end + def test_enumerated + encode_decode_test B(%w{ 0A 01 00 }), OpenSSL::ASN1::Enumerated.new(0) + encode_decode_test B(%w{ 0A 01 48 }), OpenSSL::ASN1::Enumerated.new(72) + encode_decode_test B(%w{ 0A 02 00 80 }), OpenSSL::ASN1::Enumerated.new(128) + encode_decode_test B(%w{ 0A 09 01 00 00 00 00 00 00 00 00 }), OpenSSL::ASN1::Enumerated.new(2 ** 64) + end + def test_encode_nested_sequence_to_der data_sequence = ::OpenSSL::ASN1::Sequence([::OpenSSL::ASN1::Integer(0)]) asn1 = ::OpenSSL::ASN1::Sequence(data_sequence) @@ -33,6 +244,16 @@ def test_encode_nested_set_to_der assert_equal "1\x03\x02\x01\x00", asn1.to_der end + def test_null + # TODO: Import Issue -- Is this related to the comment below in test_encode_all? + # TypeError: nil value + # src/test/ruby/test_asn1.rb:851:in `encode_test' + #encode_decode_test B(%w{ 05 00 }), OpenSSL::ASN1::Null.new(nil) + assert_raise(OpenSSL::ASN1::ASN1Error) { + OpenSSL::ASN1.decode(B(%w{ 05 01 00 })) + } + end + def test_encode_nil #Primitives raise TypeError, Constructives NoMethodError @@ -40,6 +261,63 @@ def test_encode_nil assert_raise(TypeError) { OpenSSL::ASN1::Boolean.new(nil).to_der } end + def test_object_identifier + encode_decode_test B(%w{ 06 01 00 }), OpenSSL::ASN1::ObjectId.new("0.0".b) + encode_decode_test B(%w{ 06 01 28 }), OpenSSL::ASN1::ObjectId.new("1.0".b) + encode_decode_test B(%w{ 06 03 88 37 03 }), OpenSSL::ASN1::ObjectId.new("2.999.3".b) + encode_decode_test B(%w{ 06 05 2A 22 83 BB 55 }), OpenSSL::ASN1::ObjectId.new("1.2.34.56789".b) + obj = encode_decode_test B(%w{ 06 09 60 86 48 01 65 03 04 02 01 }), OpenSSL::ASN1::ObjectId.new("sha256") + assert_equal "2.16.840.1.101.3.4.2.1", obj.oid + assert_equal "SHA256", obj.sn + assert_equal "sha256", obj.ln + # TODO: Import Issue + # Fails with: expected but was ) + #assert_raise(OpenSSL::ASN1::ASN1Error) { + # OpenSSL::ASN1.decode(B(%w{ 06 00 })) + #} + #assert_raise(OpenSSL::ASN1::ASN1Error) { + # OpenSSL::ASN1.decode(B(%w{ 06 01 80 })) + #} + # expected but was ) + #assert_raise(OpenSSL::ASN1::ASN1Error) { OpenSSL::ASN1::ObjectId.new("3.0".b).to_der } + # exception was expected but none was thrown. + #assert_raise(OpenSSL::ASN1::ASN1Error) { OpenSSL::ASN1::ObjectId.new("0.40".b).to_der } + + oid = (0...100).to_a.join(".").b + obj = OpenSSL::ASN1::ObjectId.new(oid) + assert_equal oid, obj.oid + + aki = [ + OpenSSL::ASN1::ObjectId.new("authorityKeyIdentifier"), + OpenSSL::ASN1::ObjectId.new("X509v3 Authority Key Identifier"), + OpenSSL::ASN1::ObjectId.new("2.5.29.35") + ] + + ski = [ + OpenSSL::ASN1::ObjectId.new("subjectKeyIdentifier"), + OpenSSL::ASN1::ObjectId.new("X509v3 Subject Key Identifier"), + OpenSSL::ASN1::ObjectId.new("2.5.29.14") + ] + + aki.each do |a| + # TODO: Import Issue + # None of these are equivalent to each other + #aki.each do |b| + # assert a == b + #end + + ski.each do |b| + refute a == b + end + end + + # TODO: Import Issue + # exception was expected but none was thrown. + #assert_raise(TypeError) { + # OpenSSL::ASN1::ObjectId.new("authorityKeyIdentifier") == nil + #} + end + def test_instantiate # nothing shall raise : OpenSSL::ASN1::Null.new(nil) @@ -472,6 +750,33 @@ def test_decode #assert_equal calulated_sig, sig_val.value end + # This is from the upstream MRI tests, might be superseded by `test_bit_string_infinite_length`? + def test_bitstring + # TODO: Import Issue + # fails expected but was <0> + #encode_decode_test B(%w{ 03 01 00 }), OpenSSL::ASN1::BitString.new(B(%w{})) + # TODO: Import Issue + # fails with expected but was <0> + #encode_decode_test B(%w{ 03 02 00 01 }), OpenSSL::ASN1::BitString.new(B(%w{ 01 })) + obj = OpenSSL::ASN1::BitString.new(B(%w{ F0 })) + obj.unused_bits = 4 + encode_decode_test B(%w{ 03 02 04 F0 }), obj + assert_raise(OpenSSL::ASN1::ASN1Error) { + OpenSSL::ASN1.decode(B(%w{ 03 00 })) + } + assert_raise(OpenSSL::ASN1::ASN1Error) { + OpenSSL::ASN1.decode(B(%w{ 03 03 08 FF 00 })) + } + + # TODO: Import Issue + # exception was expected but none was thrown. + #assert_raise(OpenSSL::ASN1::ASN1Error) { + # obj = OpenSSL::ASN1::BitString.new(B(%w{ FF FF })) + # obj.unused_bits = 8 + # obj.to_der + #} + end + def test_bit_string_infinite_length begin content = [ OpenSSL::ASN1::BitString.new("\x01"), OpenSSL::ASN1::EndOfContent.new() ] @@ -480,11 +785,45 @@ def test_bit_string_infinite_length expected = %w{ 23 80 03 02 00 01 00 00 } raw = [expected.join('')].pack('H*') assert_equal raw, cons.to_der - # TODO for now we can no decode our own sh*t : + # TODO for now we can not decode our own sh*t : #assert_equal raw, OpenSSL::ASN1.decode(raw).to_der end end + def test_string_basic + test = -> (tag, klass) { + encode_decode_test tag.chr + B(%w{ 00 }), klass.new(B(%w{})) + encode_decode_test tag.chr + B(%w{ 02 00 01 }), klass.new(B(%w{ 00 01 })) + } + test.(4, OpenSSL::ASN1::OctetString) + test.(12, OpenSSL::ASN1::UTF8String) + # TODO: Import Issue + # The below tests cause NPEs in the first call to `encode_test` above + # org.jruby.ext.openssl.ASN1$Primitive.toDER(ASN1.java:1610) + # org.jruby.ext.openssl.ASN1$ASN1Data.to_der(ASN1.java:1414) + # org.jruby.ext.openssl.ASN1$Primitive.to_der(ASN1.java:1522) + # org.jruby.ext.openssl.ASN1$Primitive$INVOKER$i$0$0$to_der.call(ASN1$Primitive$INVOKER$i$0$0$to_der.gen) + #test.(18, OpenSSL::ASN1::NumericString) + #test.(19, OpenSSL::ASN1::PrintableString) + #test.(20, OpenSSL::ASN1::T61String) + #test.(21, OpenSSL::ASN1::VideotexString) + test.(22, OpenSSL::ASN1::IA5String) + # See above + #test.(25, OpenSSL::ASN1::GraphicString) + #test.(26, OpenSSL::ASN1::ISO64String) + #test.(27, OpenSSL::ASN1::GeneralString) + + # TODO: Import Issue + # This fails with: + # <""> expected but was <"#1C00"> + #test.(28, OpenSSL::ASN1::UniversalString) + + # TODO: Import Issue + # This fails with: + # <"\x1E\x02\x00\x01">(US-ASCII) expected but was <"\x1E\x04\x00\x00\x00\x01">(ASCII-8BIT) + #test.(30, OpenSSL::ASN1::BMPString) + end + def test_decode_all expected = %w{ 02 01 01 02 01 02 02 01 03 } raw = [expected.join('')].pack('H*') @@ -543,13 +882,53 @@ def test_encode_der_integer_wrapped private + def B(ary) + [ary.join].pack("H*") + end + + def assert_asn1_equal(a, b) + assert_equal a.class, b.class + assert_equal a.tag, b.tag + assert_equal a.tag_class, b.tag_class + assert_equal a.indefinite_length, b.indefinite_length + assert_equal a.unused_bits, b.unused_bits if a.respond_to?(:unused_bits) + case a.value + when Array + a.value.each_with_index { |ai, i| + assert_asn1_equal ai, b.value[i] + } + else + if OpenSSL::ASN1::ObjectId === a + assert_equal a.oid, b.oid + else + assert_equal a.value, b.value + end + end + assert_equal a.to_der, b.to_der + end + + def encode_test(der, obj) + assert_equal der, obj.to_der + end + + def decode_test(der, obj) + decoded = OpenSSL::ASN1.decode(der) + assert_asn1_equal obj, decoded + decoded + end + + def encode_decode_test(der, obj) + encode_test(der, obj) + decode_test(der, obj) + end + def assert_universal(tag, asn1, inf_len=false) assert_equal(tag, asn1.tag) assert_equal(:UNIVERSAL, asn1.tag_class) assert_equal(inf_len, asn1.infinite_length) end - def encode_decode_test(type, values) + def encode_decode_test1(type, values) values.each do |v| assert_equal(v, OpenSSL::ASN1.decode(type.new(v).to_der).value) end From 6dc57dfeb68bd28d02e46f3ce229eb5f07a636de Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Tue, 16 Apr 2024 22:24:38 -0700 Subject: [PATCH 4/4] the rest of mri asn.1 tests --- src/test/ruby/test_asn1.rb | 408 ++++++++++++++++++++++++++++++++++++- 1 file changed, 407 insertions(+), 1 deletion(-) diff --git a/src/test/ruby/test_asn1.rb b/src/test/ruby/test_asn1.rb index 4976a6fc..282b2a4d 100644 --- a/src/test/ruby/test_asn1.rb +++ b/src/test/ruby/test_asn1.rb @@ -247,7 +247,6 @@ def test_encode_nested_set_to_der def test_null # TODO: Import Issue -- Is this related to the comment below in test_encode_all? # TypeError: nil value - # src/test/ruby/test_asn1.rb:851:in `encode_test' #encode_decode_test B(%w{ 05 00 }), OpenSSL::ASN1::Null.new(nil) assert_raise(OpenSSL::ASN1::ASN1Error) { OpenSSL::ASN1.decode(B(%w{ 05 01 00 })) @@ -359,6 +358,199 @@ def test_simple_to_der assert_equal "1\x00", OpenSSL::ASN1::Set.new(nil).to_der end + def test_sequence + encode_decode_test B(%w{ 30 00 }), OpenSSL::ASN1::Sequence.new([]) + # TODO: Import Issue + # TypeError: nil value + #encode_decode_test B(%w{ 30 07 05 00 30 00 04 01 00 }), OpenSSL::ASN1::Sequence.new([ + # OpenSSL::ASN1::Null.new(nil), + # OpenSSL::ASN1::Sequence.new([]), + # OpenSSL::ASN1::OctetString.new(B(%w{ 00 })) + #]) + + expected = OpenSSL::ASN1::Sequence.new([OpenSSL::ASN1::OctetString.new(B(%w{ 00 }))]) + expected.indefinite_length = true + encode_decode_test B(%w{ 30 80 04 01 00 00 00 }), expected + + # OpenSSL::ASN1::EndOfContent can only be at the end + obj = OpenSSL::ASN1::Sequence.new([ + OpenSSL::ASN1::EndOfContent.new, + OpenSSL::ASN1::OctetString.new(B(%w{ 00 })), + OpenSSL::ASN1::EndOfContent.new, + ]) + obj.indefinite_length = true + # TODO: Import Issue + # exception was expected but none was thrown. + #assert_raise(OpenSSL::ASN1::ASN1Error) { obj.to_der } + + # The last EOC in value is ignored if indefinite length form is used + expected = OpenSSL::ASN1::Sequence.new([ + OpenSSL::ASN1::OctetString.new(B(%w{ 00 })), + OpenSSL::ASN1::EndOfContent.new + ]) + expected.indefinite_length = true + encode_test B(%w{ 30 80 04 01 00 00 00 }), expected + end + + def test_set + encode_decode_test B(%w{ 31 00 }), OpenSSL::ASN1::Set.new([]) + # TODO: Import Issue + # <"1\a\x05\x000\x00\x04\x01\x00"> expected but was <"1\a\x04\x01\x00\x05\x000\x00"> + #encode_decode_test B(%w{ 31 07 05 00 30 00 04 01 00 }), OpenSSL::ASN1::Set.new([ + # OpenSSL::ASN1::Null.new(nil), + # OpenSSL::ASN1::Sequence.new([]), + # OpenSSL::ASN1::OctetString.new(B(%w{ 00 })) + #]) + expected = OpenSSL::ASN1::Set.new([OpenSSL::ASN1::OctetString.new(B(%w{ 00 }))]) + expected.indefinite_length = true + encode_decode_test B(%w{ 31 80 04 01 00 00 00 }), expected + end + + def test_utctime + encode_decode_test B(%w{ 17 0D }) + "160908234339Z".b, + OpenSSL::ASN1::UTCTime.new(Time.utc(2016, 9, 8, 23, 43, 39)) + begin + # possible range of UTCTime is 1969-2068 currently + encode_decode_test B(%w{ 17 0D }) + "690908234339Z".b, + OpenSSL::ASN1::UTCTime.new(Time.utc(1969, 9, 8, 23, 43, 39)) + rescue OpenSSL::ASN1::ASN1Error + pend "No negative time_t support?" + end + # not implemented + # decode_test B(%w{ 17 11 }) + "500908234339+0930".b, + # OpenSSL::ASN1::UTCTime.new(Time.new(1950, 9, 8, 23, 43, 39, "+09:30")) + # decode_test B(%w{ 17 0F }) + "5009082343-0930".b, + # OpenSSL::ASN1::UTCTime.new(Time.new(1950, 9, 8, 23, 43, 0, "-09:30")) + # assert_raise(OpenSSL::ASN1::ASN1Error) { + # OpenSSL::ASN1.decode(B(%w{ 17 0C }) + "500908234339".b) + # } + # assert_raise(OpenSSL::ASN1::ASN1Error) { + # OpenSSL::ASN1.decode(B(%w{ 17 0D }) + "500908234339Y".b) + # } + end + + def test_generalizedtime + encode_decode_test B(%w{ 18 0F }) + "20161208193429Z".b, + OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 29)) + encode_decode_test B(%w{ 18 0F }) + "99990908234339Z".b, + OpenSSL::ASN1::GeneralizedTime.new(Time.utc(9999, 9, 8, 23, 43, 39)) + # not implemented + # decode_test B(%w{ 18 13 }) + "20161208193439+0930".b, + # OpenSSL::ASN1::GeneralizedTime.new(Time.new(2016, 12, 8, 19, 34, 39, "+09:30")) + # decode_test B(%w{ 18 11 }) + "201612081934-0930".b, + # OpenSSL::ASN1::GeneralizedTime.new(Time.new(2016, 12, 8, 19, 34, 0, "-09:30")) + # decode_test B(%w{ 18 11 }) + "201612081934-09".b, + # OpenSSL::ASN1::GeneralizedTime.new(Time.new(2016, 12, 8, 19, 34, 0, "-09:00")) + # decode_test B(%w{ 18 0D }) + "2016120819.5Z".b, + # OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 30, 0)) + # decode_test B(%w{ 18 0D }) + "2016120819,5Z".b, + # OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 30, 0)) + # decode_test B(%w{ 18 0F }) + "201612081934.5Z".b, + # OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 30)) + # decode_test B(%w{ 18 11 }) + "20161208193439.5Z".b, + # OpenSSL::ASN1::GeneralizedTime.new(Time.utc(2016, 12, 8, 19, 34, 39.5)) + # assert_raise(OpenSSL::ASN1::ASN1Error) { + # OpenSSL::ASN1.decode(B(%w{ 18 0D }) + "201612081934Y".b) + # } + end + + def test_basic_asn1data + # TODO: Import Issue + # Java::JavaLang::ClassCastException: + # class org.jruby.RubyString cannot be cast to class org.jruby.ext.openssl.ASN1$ASN1Data + # org.jruby.ext.openssl.ASN1$ASN1Data.toASN1TaggedObject(ASN1.java:1408) + # org.jruby.ext.openssl.ASN1$ASN1Data.toASN1(ASN1.java:1383) + # org.jruby.ext.openssl.ASN1$ASN1Data.toDER(ASN1.java:1424) + # org.jruby.ext.openssl.ASN1$ASN1Data.to_der(ASN1.java:1414) + #encode_test B(%w{ 00 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 0, :UNIVERSAL) + #encode_test B(%w{ 01 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :UNIVERSAL) + #encode_decode_test B(%w{ 41 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :APPLICATION) + #encode_decode_test B(%w{ 81 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :CONTEXT_SPECIFIC) + #encode_decode_test B(%w{ C1 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 1, :PRIVATE) + # TODO: Import Issue + # OpenSSL::ASN1::ASN1Error: tag number for :UNIVERSAL too large + # org/jruby/RubyClass.java:942:in `new' + #encode_decode_test B(%w{ 1F 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 32, :UNIVERSAL) + #encode_decode_test B(%w{ 1F C0 20 00 }), OpenSSL::ASN1::ASN1Data.new(B(%w{}), 8224, :UNIVERSAL) + # TODO: Import Issue (same as start of this test) + # Java::JavaLang::ClassCastException: + # class org.jruby.RubyString cannot be cast to class org.jruby.ext.openssl.ASN1$ASN1Data + # org.jruby.ext.openssl.ASN1$ASN1Data.toASN1TaggedObject(ASN1.java:1408) + # org.jruby.ext.openssl.ASN1$ASN1Data.toASN1(ASN1.java:1383) + # org.jruby.ext.openssl.ASN1$ASN1Data.toDER(ASN1.java:1424) + # org.jruby.ext.openssl.ASN1$ASN1Data.to_der(ASN1.java:1414) + #encode_decode_test B(%w{ 41 02 AB CD }), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD }), 1, :APPLICATION) + #encode_decode_test B(%w{ 41 81 80 } + %w{ AB CD } * 64), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD } * 64), 1, :APPLICATION) + #encode_decode_test B(%w{ 41 82 01 00 } + %w{ AB CD } * 128), OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD } * 128), 1, :APPLICATION) + #encode_decode_test B(%w{ 61 00 }), OpenSSL::ASN1::ASN1Data.new([], 1, :APPLICATION) + #obj = OpenSSL::ASN1::ASN1Data.new([OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD }), 2, :PRIVATE)], 1, :APPLICATION) + #obj.indefinite_length = true + #encode_decode_test B(%w{ 61 80 C2 02 AB CD 00 00 }), obj + #obj = OpenSSL::ASN1::ASN1Data.new([ + # OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD }), 2, :PRIVATE), + # OpenSSL::ASN1::EndOfContent.new + #], 1, :APPLICATION) + #obj.indefinite_length = true + #encode_test B(%w{ 61 80 C2 02 AB CD 00 00 }), obj + #obj = OpenSSL::ASN1::ASN1Data.new(B(%w{ AB CD }), 1, :UNIVERSAL) + #obj.indefinite_length = true + # TODO: Import Issue + # expected but was <# expected but was <"\x01\x01\xFF"> + #encode_test B(%w{ 01 00 }), OpenSSL::ASN1::Primitive.new(B(%w{}), 1, nil, :UNIVERSAL) + # <"\x81\x00"> expected but was <"\x01\x01\xFF"> + #encode_test B(%w{ 81 00 }), OpenSSL::ASN1::Primitive.new(B(%w{}), 1, nil, :CONTEXT_SPECIFIC) + # <"\x01\x02\xAB\xCD"> expected but was <"\x01\x01\xFF"> + #encode_test B(%w{ 01 02 AB CD }), OpenSSL::ASN1::Primitive.new(B(%w{ AB CD }), 1) + # exception was expected but none was thrown. + #assert_raise(TypeError) { OpenSSL::ASN1::Primitive.new([], 1).to_der } + + prim = OpenSSL::ASN1::Integer.new(50) + assert_equal false, prim.indefinite_length + assert_not_respond_to prim, :indefinite_length= + end + + # + # MRI seems to have some different tests for similar things (constructive + # vs constructed) There may be some duplicated test cases within these but + # for completeness' sake I'm going to include all of MRI's tests below + # + + def test_basic_constructed + #octet_string = OpenSSL::ASN1::OctetString.new(B(%w{ AB CD })) + # TODO: Import Issue + # OpenSSL::ASN1::ASN1Error: Constructive shall only be used with indefinite length + #encode_test B(%w{ 20 00 }), OpenSSL::ASN1::Constructive.new([], 0) + #encode_test B(%w{ 21 00 }), OpenSSL::ASN1::Constructive.new([], 1, nil, :UNIVERSAL) + #encode_test B(%w{ A1 00 }), OpenSSL::ASN1::Constructive.new([], 1, nil, :CONTEXT_SPECIFIC) + #encode_test B(%w{ 21 04 04 02 AB CD }), OpenSSL::ASN1::Constructive.new([octet_string], 1) + # Java::JavaLang::UnsupportedOperationException: + # #], + # @tag_class=:CONTEXT_SPECIFIC, @tagging=:EXPLICIT, @indefinite_length=true> + # org.jruby.ext.openssl.ASN1$Constructive.toDER(ASN1.java:1881) + # org.jruby.ext.openssl.ASN1$ASN1Data.to_der(ASN1.java:1414) + # org.jruby.ext.openssl.ASN1$Constructive.to_der(ASN1.java:1858) + #obj = OpenSSL::ASN1::Constructive.new([octet_string], 1) + #obj.indefinite_length = true + #encode_decode_test B(%w{ 21 80 04 02 AB CD 00 00 }), obj + # (see above) Java::JavaLang::UnsupportedOperationException + #obj = OpenSSL::ASN1::Constructive.new([octet_string, OpenSSL::ASN1::EndOfContent.new], 1) + #obj.indefinite_length = true + #encode_test B(%w{ 21 80 04 02 AB CD 00 00 }), obj + end + def test_constructive oct = OpenSSL::ASN1::OctetString.new("") assert_equal "\x04\x00", oct.to_der @@ -391,6 +583,213 @@ def test_constructive assert_equal "0\x800\x80\x02\x01\x01\x00\x00\x00\x00", outer.to_der end + def test_prim_explicit_tagging + # TODO: Import Issue + # <"\xA0\x03\x04\x01a"> expected but was <"\x04\x01a"> + #oct_str = OpenSSL::ASN1::OctetString.new("a", 0, :EXPLICIT) + #encode_test B(%w{ A0 03 04 01 61 }), oct_str + # <"a\x03\x04\x01a"> expected but was <"\x04\x01a"> + oct_str2 = OpenSSL::ASN1::OctetString.new("a", 1, :EXPLICIT, :APPLICATION) + #encode_test B(%w{ 61 03 04 01 61 }), oct_str2 + + decoded = OpenSSL::ASN1.decode(oct_str2.to_der) + # <:APPLICATION> expected but was <:UNIVERSAL> + #assert_equal :APPLICATION, decoded.tag_class + # <1> expected but was <4> + #assert_equal 1, decoded.tag + assert_equal 1, decoded.value.size + #inner = decoded.value[0] + # expected but was + #assert_equal OpenSSL::ASN1::OctetString, inner.class + # NoMethodError: undefined method `value' for "a":String + #assert_equal B(%w{ 61 }), inner.value + end + + def test_prim_implicit_tagging + #int = OpenSSL::ASN1::Integer.new(1, 0, :IMPLICIT) + # TODO: Import Issue + # <"\x80\x01\x01"> expected but was <"\x02\x01\x01"> + #encode_test B(%w{ 80 01 01 }), int + #int2 = OpenSSL::ASN1::Integer.new(1, 1, :IMPLICIT, :APPLICATION) + # <"A\x01\x01"> expected but was <"\x02\x01\x01"> + #encode_test B(%w{ 41 01 01 }), int2 + #decoded = OpenSSL::ASN1.decode(int2.to_der) + # <:APPLICATION> expected but was <:UNIVERSAL> + #assert_equal :APPLICATION, decoded.tag_class + # <1> expected but was <2> + #assert_equal 1, decoded.tag + # <"\x01"> expected but was <#> + #assert_equal B(%w{ 01 }), decoded.value + + # Special behavior: Encoding universal types with non-default 'tag' + # attribute and nil tagging method. + #int3 = OpenSSL::ASN1::Integer.new(1, 1) + # <"\x01\x01\x01"> expected but was <"\x02\x01\x01"> + #encode_test B(%w{ 01 01 01 }), int3 + end + + def test_cons_explicit_tagging + #content = [ OpenSSL::ASN1::PrintableString.new('abc') ] + #seq = OpenSSL::ASN1::Sequence.new(content, 2, :EXPLICIT) + # TODO: Import Issue + # RuntimeError: No message available + #encode_test B(%w{ A2 07 30 05 13 03 61 62 63 }), seq + #seq2 = OpenSSL::ASN1::Sequence.new(content, 3, :EXPLICIT, :APPLICATION) + # RuntimeError: No message available + #encode_test B(%w{ 63 07 30 05 13 03 61 62 63 }), seq2 + + #content3 = [ OpenSSL::ASN1::PrintableString.new('abc'), + # OpenSSL::ASN1::EndOfContent.new() ] + #seq3 = OpenSSL::ASN1::Sequence.new(content3, 2, :EXPLICIT) + #seq3.indefinite_length = true + # RuntimeError: No message available + #encode_test B(%w{ A2 80 30 80 13 03 61 62 63 00 00 00 00 }), seq3 + end + + def test_cons_implicit_tagging + #content = [ OpenSSL::ASN1::Null.new(nil) ] + #seq = OpenSSL::ASN1::Sequence.new(content, 1, :IMPLICIT) + # TODO: Import Issue + # <"\xA1\x02\x05\x00"> expected but was <"0\x02\x05\x00"> + #encode_test B(%w{ A1 02 05 00 }), seq + #seq2 = OpenSSL::ASN1::Sequence.new(content, 1, :IMPLICIT, :APPLICATION) + # <"a\x02\x05\x00"> expected but was <"0\x02\x05\x00"> + #encode_test B(%w{ 61 02 05 00 }), seq2 + + #content3 = [ OpenSSL::ASN1::Null.new(nil), + # OpenSSL::ASN1::EndOfContent.new() ] + #seq3 = OpenSSL::ASN1::Sequence.new(content3, 1, :IMPLICIT) + #seq3.indefinite_length = true + # <"\xA1\x80\x05\x00\x00\x00"> expected but was <"0\x80\x05\x00\x00\x00"> + #encode_test B(%w{ A1 80 05 00 00 00 }), seq3 + + # Special behavior: Encoding universal types with non-default 'tag' + # attribute and nil tagging method. + #seq4 = OpenSSL::ASN1::Sequence.new([], 1) + # <"!\x00"> expected but was <"0\x00"> + #encode_test B(%w{ 21 00 }), seq4 + end + + def test_octet_string_constructed_tagging + #octets = [ OpenSSL::ASN1::OctetString.new('aaa') ] + #cons = OpenSSL::ASN1::Constructive.new(octets, 0, :IMPLICIT) + # TODO: Import Issues + # OpenSSL::ASN1::ASN1Error: Constructive shall only be used with indefinite length + #encode_test B(%w{ A0 05 04 03 61 61 61 }), cons + + #octets = [ OpenSSL::ASN1::OctetString.new('aaa'), + # OpenSSL::ASN1::EndOfContent.new() ] + #cons = OpenSSL::ASN1::Constructive.new(octets, 0, :IMPLICIT) + #cons.indefinite_length = true + # Java::JavaLang::UnsupportedOperationException: + # #, + # #], @tag_class=:CONTEXT_SPECIFIC, @tagging=:IMPLICIT, @indefinite_length=true> + #encode_test B(%w{ A0 80 04 03 61 61 61 00 00 }), cons + end + + def test_recursive_octet_string_indefinite_length + #octets_sub1 = [ OpenSSL::ASN1::OctetString.new("\x01"), + # OpenSSL::ASN1::EndOfContent.new() ] + #octets_sub2 = [ OpenSSL::ASN1::OctetString.new("\x02"), + # OpenSSL::ASN1::EndOfContent.new() ] + #container1 = OpenSSL::ASN1::Constructive.new(octets_sub1, OpenSSL::ASN1::OCTET_STRING, nil, :UNIVERSAL) + #container1.indefinite_length = true + #container2 = OpenSSL::ASN1::Constructive.new(octets_sub2, OpenSSL::ASN1::OCTET_STRING, nil, :UNIVERSAL) + #container2.indefinite_length = true + #octets3 = OpenSSL::ASN1::OctetString.new("\x03") + + #octets = [ container1, container2, octets3, + # OpenSSL::ASN1::EndOfContent.new() ] + #cons = OpenSSL::ASN1::Constructive.new(octets, OpenSSL::ASN1::OCTET_STRING, nil, :UNIVERSAL) + #cons.indefinite_length = true + #raw = B(%w{ 24 80 24 80 04 01 01 00 00 24 80 04 01 02 00 00 04 01 03 00 00 }) + # TODO: Implict Issue + # Java::JavaLang::UnsupportedOperationException + # org.jruby.ext.openssl.ASN1$Constructive$InternalEncodable.toASN1Primitive(ASN1.java:1961) + # org.jruby.ext.openssl.ASN1$Constructive.octetStringToDER(ASN1.java:1904) + # org.jruby.ext.openssl.ASN1$Constructive.toDER(ASN1.java:1873) + # org.jruby.ext.openssl.ASN1$ASN1Data.to_der(ASN1.java:1414) + #assert_equal(raw, cons.to_der) + # <"$\x80$\x80\x04\x01\x01\x00\x00$\x80\x04\x01\x02\x00\x00\x04\x01\x03\x00\x00"> expected but was <"$\x80\x04\x03\x01\x02\x03\x00\x00"> + #assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der) + end + + def test_recursive_octet_string_parse + raw = B(%w{ 24 80 24 80 04 01 01 00 00 24 80 04 01 02 00 00 04 01 03 00 00 }) + asn1 = OpenSSL::ASN1.decode(raw) + assert_equal(OpenSSL::ASN1::Constructive, asn1.class) + # TODO: Import Issue + # expected but was + #assert_universal(OpenSSL::ASN1::OCTET_STRING, asn1) + assert_equal(true, asn1.indefinite_length) + # <3> expected but was <2> + #assert_equal(3, asn1.value.size) + nested1 = asn1.value[0] + # expected but was + #assert_equal(OpenSSL::ASN1::Constructive, nested1.class) + assert_universal(OpenSSL::ASN1::OCTET_STRING, nested1) + # expected but was + #assert_equal(true, nested1.indefinite_length) + # <1> expected but was <3> + #assert_equal(1, nested1.value.size) + #oct1 = nested1.value[0] + # NoMethodError: undefined method `tag' for "\x01":String + # Did you mean? tap + # src/test/ruby/test_asn1.rb:1286:in `assert_universal' + #assert_universal(OpenSSL::ASN1::OCTET_STRING, oct1) + # NoMethodError: undefined method `indefinite_length' for "\x01":String + #assert_equal(false, oct1.indefinite_length) + #nested2 = asn1.value[1] + # expected but was + #assert_equal(OpenSSL::ASN1::Constructive, nested2.class) + # <4> expected but was <0> + #assert_universal(OpenSSL::ASN1::OCTET_STRING, nested2) + # expected but was + #assert_equal(true, nested2.indefinite_length) + # <1> expected but was <0> + #assert_equal(1, nested2.value.size) + #oct2 = nested2.value[0] + # NoMethodError: undefined method `tag' for nil:NilClass + #assert_universal(OpenSSL::ASN1::OCTET_STRING, oct2) + # NoMethodError: undefined method `indefinite_length' for nil:NilClass + #assert_equal(false, oct2.indefinite_length) + #oct3 = asn1.value[2] + # NoMethodError: undefined method `tag' for nil:NilClass + #assert_universal(OpenSSL::ASN1::OCTET_STRING, oct3) + # NoMethodError: undefined method `indefinite_length' for nil:NilClass + #assert_equal(false, oct3.indefinite_length) + end + + def test_decode_constructed_overread + #test = %w{ 31 06 31 02 30 02 05 00 } + ## ^ <- invalid + #raw = [test.join].pack("H*") + #ret = [] + # exception was expected but none was thrown. + #assert_raise(OpenSSL::ASN1::ASN1Error) { + # OpenSSL::ASN1.traverse(raw) { |x| ret << x } + #} + # <2> expected but was <0> + #assert_equal 2, ret.size + # NoMethodError: undefined method `[]' for nil:NilClass + #assert_equal 17, ret[0][6] + #assert_equal 17, ret[1][6] + + #test = %w{ 31 80 30 03 00 00 } + ## ^ <- invalid + #raw = [test.join].pack("H*") + #ret = [] + # exception was expected but none was thrown. + #assert_raise(OpenSSL::ASN1::ASN1Error) { + # OpenSSL::ASN1.traverse(raw) { |x| ret << x } + #} + #assert_equal 1, ret.size + #assert_equal 17, ret[0][6] + end + def test_constructive_nesting seq = OpenSSL::ASN1::Sequence.new([ OpenSSL::ASN1::ObjectId.new('DC'), @@ -824,6 +1223,13 @@ def test_string_basic #test.(30, OpenSSL::ASN1::BMPString) end + def test_constructive_each + data = [OpenSSL::ASN1::Integer.new(0), OpenSSL::ASN1::Integer.new(1)] + seq = OpenSSL::ASN1::Sequence.new data + + assert_equal data, seq.entries + end + def test_decode_all expected = %w{ 02 01 01 02 01 02 02 01 03 } raw = [expected.join('')].pack('H*')