getOptional methods should be usable with sequence/set elements

peterdettman · peterdettman · commit 568ffae5d9d8 · 2025-07-16T13:08:01.000+07:00
diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java b/core/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java
@@ -75,7 +75,7 @@ public static ASN1TaggedObject getInstance(ASN1TaggedObject taggedObject, int ta
         return ASN1Util.getExplicitBaseTagged(checkInstance(taggedObject, declaredExplicit), tagClass, tagNo);
     }
 
-    public static ASN1TaggedObject getOptional(ASN1Object element)
+    public static ASN1TaggedObject getOptional(ASN1Encodable element)
     {
         if (element == null)
         {
@@ -90,7 +90,7 @@ public static ASN1TaggedObject getOptional(ASN1Object element)
         return null;
     }
 
-    public static ASN1TaggedObject getOptional(ASN1Object element, int tagClass)
+    public static ASN1TaggedObject getOptional(ASN1Encodable element, int tagClass)
     {
         ASN1TaggedObject taggedObject = getOptional(element);
         if (taggedObject != null && taggedObject.hasTagClass(tagClass))
@@ -100,7 +100,7 @@ public static ASN1TaggedObject getOptional(ASN1Object element, int tagClass)
         return null;
     }
 
-    public static ASN1TaggedObject getOptional(ASN1Object element, int tagClass, int tagNo)
+    public static ASN1TaggedObject getOptional(ASN1Encodable element, int tagClass, int tagNo)
     {
         ASN1TaggedObject taggedObject = getOptional(element);
         if (taggedObject != null && taggedObject.hasTag(tagClass, tagNo))

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static ASN1TaggedObject getInstance(ASN1TaggedObject taggedObject, int ta`
`75`	`75`	`return ASN1Util.getExplicitBaseTagged(checkInstance(taggedObject, declaredExplicit), tagClass, tagNo);`
`76`	`76`	`}`
`77`	`77`
`78`		`- public static ASN1TaggedObject getOptional(ASN1Object element)`
	`78`	`+ public static ASN1TaggedObject getOptional(ASN1Encodable element)`
`79`	`79`	`{`
`80`	`80`	`if (element == null)`
`81`	`81`	`{`
`@@ -90,7 +90,7 @@ public static ASN1TaggedObject getOptional(ASN1Object element)`
`90`	`90`	`return null;`
`91`	`91`	`}`
`92`	`92`
`93`		`- public static ASN1TaggedObject getOptional(ASN1Object element, int tagClass)`
	`93`	`+ public static ASN1TaggedObject getOptional(ASN1Encodable element, int tagClass)`
`94`	`94`	`{`
`95`	`95`	`ASN1TaggedObject taggedObject = getOptional(element);`
`96`	`96`	`if (taggedObject != null && taggedObject.hasTagClass(tagClass))`
`@@ -100,7 +100,7 @@ public static ASN1TaggedObject getOptional(ASN1Object element, int tagClass)`
`100`	`100`	`return null;`
`101`	`101`	`}`
`102`	`102`
`103`		`- public static ASN1TaggedObject getOptional(ASN1Object element, int tagClass, int tagNo)`
	`103`	`+ public static ASN1TaggedObject getOptional(ASN1Encodable element, int tagClass, int tagNo)`
`104`	`104`	`{`
`105`	`105`	`ASN1TaggedObject taggedObject = getOptional(element);`
`106`	`106`	`if (taggedObject != null && taggedObject.hasTag(tagClass, tagNo))`