Use ASN1Util methods

peterdettman · peterdettman · commit 35a80b529fe0 · 2023-07-18T10:43:37.000+07:00
diff --git a/util/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKey.java b/util/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKey.java
@@ -6,6 +6,7 @@
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1TaggedObject;
+import org.bouncycastle.asn1.ASN1Util;
 import org.bouncycastle.asn1.BERTags;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERTaggedObject;
@@ -24,14 +25,10 @@ private POPOSigningKey(ASN1Sequence seq)
 
         if (seq.getObjectAt(index) instanceof ASN1TaggedObject)
         {
-            ASN1TaggedObject tagObj
-                = ASN1TaggedObject.getInstance(seq.getObjectAt(index++), BERTags.CONTEXT_SPECIFIC);
-            if (tagObj.getTagNo() != 0)
-            {
-                throw new IllegalArgumentException(
-                    "Unknown POPOSigningKeyInput tag: " + tagObj.getTagNo());
-            }
-            poposkInput = POPOSigningKeyInput.getInstance(tagObj.getBaseUniversal(false, BERTags.SEQUENCE));
+            ASN1TaggedObject tagObj = (ASN1TaggedObject)seq.getObjectAt(index++);
+
+            poposkInput = POPOSigningKeyInput.getInstance(
+                ASN1Util.getContextBaseUniversal(tagObj, 0, false, BERTags.SEQUENCE));
         }
         algorithmIdentifier = AlgorithmIdentifier.getInstance(seq.getObjectAt(index++));
         signature = ASN1BitString.getInstance(seq.getObjectAt(index));
diff --git a/util/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKeyInput.java b/util/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKeyInput.java
@@ -6,7 +6,7 @@
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERTags;
+import org.bouncycastle.asn1.ASN1Util;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERTaggedObject;
 import org.bouncycastle.asn1.x509.GeneralName;
@@ -25,13 +25,9 @@ private POPOSigningKeyInput(ASN1Sequence seq)
 
         if (authInfo instanceof ASN1TaggedObject)
         {
-            ASN1TaggedObject tagObj = ASN1TaggedObject.getInstance(authInfo, BERTags.CONTEXT_SPECIFIC);
-            if (tagObj.getTagNo() != 0)
-            {
-                throw new IllegalArgumentException(
-                    "Unknown authInfo tag: " + tagObj.getTagNo());
-            }
-            sender = GeneralName.getInstance(tagObj.getExplicitBaseObject());
+            ASN1TaggedObject tagObj = (ASN1TaggedObject)authInfo;
+
+            sender = GeneralName.getInstance(ASN1Util.getExplicitContextBaseObject(tagObj, 0));
         }
         else
         {
