[fix] restore ASN1TaggedObject#getObject compatibility

making it behave the same as with older BC (1.69)

Author: kares

src/main/java/org/jruby/ext/openssl/ASN1.java

@@ -1074,7 +1074,7 @@ else if ( obj instanceof DERBMPString ) {
 
         if ( obj instanceof ASN1TaggedObject ) {
             final ASN1TaggedObject taggedObj = (ASN1TaggedObject) obj;
-            IRubyObject val = decodeObject(context, ASN1, taggedObj.getObject());
+            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);
@@ -1134,11 +1134,11 @@ public static IRubyObject decode(final ThreadContext context,
             debugStackTrace(context.runtime, e);
             throw context.runtime.newArgumentError(e.getMessage());
         }
-        //catch (RuntimeException e) {
-        //    final Ruby runtime = context.runtime;
-        //    debugStackTrace(runtime, e);
-        //    throw Utils.newRuntimeError(context.runtime, e);
-        //}
+        catch (RuntimeException e) {
+
+            debugStackTrace(context.runtime, e);
+            throw Utils.newRuntimeError(context.runtime, e);
+        }
     }
 
     static IRubyObject decodeImpl(final ThreadContext context, IRubyObject obj)

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.ASN1Object;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
@@ -426,10 +427,10 @@ public RubyString value(final ThreadContext context) {
                     for ( int i = 0; i < size; i++ ) {
                         final ASN1Encodable enc = seq.getObjectAt(i);
                         if (enc instanceof ASN1TaggedObject) {
-                            ASN1Primitive obj = ((ASN1TaggedObject) enc).getObject();
+                            ASN1Primitive obj = ((ASN1TaggedObject) enc).getBaseObject().toASN1Primitive();
                             switch( ((ASN1TaggedObject) enc).getTagNo() ) {
                                 case 0 :
-                                    ASN1Primitive keyid = obj;
+                                    ASN1Primitive keyid = obj.toASN1Primitive();
                                     val.append(keyid_);
                                     hexBytes( keyidBytes(keyid), val );
                                     break;
@@ -595,7 +596,7 @@ private RubyString rawValueAsString(final ThreadContext context) throws IOExcept
 
     private static byte[] keyidBytes(ASN1Primitive keyid) throws IOException {
         if ( keyid instanceof ASN1TaggedObject ) {
-            keyid = ((ASN1TaggedObject) keyid).getObject();
+            keyid = ((ASN1TaggedObject) keyid).getBaseObject().toASN1Primitive();
         }
         if ( keyid instanceof ASN1OctetString ) {
             return ((ASN1OctetString) keyid).getOctets();

src/main/java/org/jruby/ext/openssl/impl/EncContent.java

@@ -157,7 +157,7 @@ public static EncContent fromASN1(final ASN1Encodable content) {
         ec.setContentType( ASN1Registry.oid2nid(contentType) );
         ec.setAlgorithm(AlgorithmIdentifier.getInstance(sequence.getObjectAt(1)));
         if(sequence.size() > 2 && sequence.getObjectAt(2) instanceof ASN1TaggedObject && ((ASN1TaggedObject)(sequence.getObjectAt(2))).getTagNo() == 0) {
-            ASN1Encodable ee = ((ASN1TaggedObject)(sequence.getObjectAt(2))).getObject();
+            ASN1Encodable ee = ((ASN1TaggedObject)(sequence.getObjectAt(2))).getBaseObject().toASN1Primitive();
             if ( ee instanceof ASN1Sequence && ((ASN1Sequence) ee).size() > 0 ) {
                 ByteList combinedOctets = new ByteList();
                 Enumeration enm = ((ASN1Sequence)ee).getObjects();

src/main/java/org/jruby/ext/openssl/impl/PKCS7.java

@@ -143,7 +143,7 @@ public static PKCS7 fromASN1(ASN1Encodable obj) throws PKCS7Exception {
                 ASN1Encodable content = size == 1 ? null : ((ASN1Sequence) obj).getObjectAt(1);
 
                 if (content != null && content instanceof ASN1TaggedObject && ((ASN1TaggedObject) content).getTagNo() == 0) {
-                    content = ((ASN1TaggedObject) content).getObject();
+                    content = ((ASN1TaggedObject) content).getBaseObject().toASN1Primitive();
                 }
                 p7.initiateWith(nid, content);
             }

src/main/java/org/jruby/ext/openssl/impl/Signed.java

@@ -292,13 +292,13 @@ public static Signed fromASN1(ASN1Encodable content) throws PKCS7Exception{
         int index = 3;
         ASN1Encodable tmp = sequence.getObjectAt(index);
         if((tmp instanceof ASN1TaggedObject) && ((ASN1TaggedObject)tmp).getTagNo() == 0) {
-            certificates = ((ASN1TaggedObject)tmp).getObject();
+            certificates = ((ASN1TaggedObject)tmp).getBaseObject().toASN1Primitive();
             index++;
         }
 
         tmp = sequence.getObjectAt(index);
         if((tmp instanceof ASN1TaggedObject) && ((ASN1TaggedObject)tmp).getTagNo() == 1) {
-            crls = ((ASN1TaggedObject)tmp).getObject();
+            crls = ((ASN1TaggedObject)tmp).getBaseObject().toASN1Primitive();
             index++;
         }
 

src/main/java/org/jruby/ext/openssl/x509store/PEMInputOutput.java

@@ -1362,8 +1362,8 @@ private static X509AuxCertificate readAuxCertificate(final BufferedReader in, fi
                 else trust = Collections.emptyList();
 
                 if ( obj instanceof ASN1TaggedObject && ((ASN1TaggedObject) obj).getTagNo() == 0 ) {
-                    reject = new ArrayList<String>();
-                    final ASN1Sequence rejectSeq = (ASN1Sequence) ((ASN1TaggedObject) obj).getObject();
+                    final ASN1Sequence rejectSeq = (ASN1Sequence) ((ASN1TaggedObject) obj).getBaseObject().toASN1Primitive();
+                    reject = new ArrayList<>(rejectSeq.size());
                     for( int i = 0; i < rejectSeq.size(); i++ ) {
                         reject.add( ((ASN1ObjectIdentifier) rejectSeq.getObjectAt(i)).getId() );
                     }
@@ -1387,8 +1387,8 @@ private static X509AuxCertificate readAuxCertificate(final BufferedReader in, fi
                 else keyid = null;
 
                 if ( obj instanceof ASN1TaggedObject && ((ASN1TaggedObject) obj).getTagNo() == 1 ) {
-                    other = new ArrayList<ASN1Primitive>();
-                    final ASN1Sequence otherSeq = (ASN1Sequence) ((ASN1TaggedObject) obj).getObject();
+                    final ASN1Sequence otherSeq = (ASN1Sequence) ((ASN1TaggedObject) obj).getBaseObject().toASN1Primitive();
+                    other = new ArrayList<>(otherSeq.size());
                     for( int i = 0; i < otherSeq.size(); i++ ) {
                         other.add( (ASN1Primitive) otherSeq.getObjectAt(i) );
                     }