Add Extensions helpers

Author: peterdettman

core/src/main/java/org/bouncycastle/asn1/x509/CertificateList.java

@@ -117,6 +117,11 @@ public Time getNextUpdate()
         return tbsCertList.getNextUpdate();
     }
 
+    public Extensions getExtensions()
+    {
+        return tbsCertList.getExtensions();
+    }
+
     public ASN1Primitive toASN1Primitive()
     {
         ASN1EncodableVector v = new ASN1EncodableVector(3);

core/src/main/java/org/bouncycastle/asn1/x509/Extensions.java

@@ -8,6 +8,7 @@
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1TaggedObject;
@@ -40,6 +41,11 @@ public static ASN1Encodable getExtensionParsedValue(Extensions extensions, ASN1O
         return null == extensions ? null : extensions.getExtensionParsedValue(oid);
     }
 
+    public static ASN1OctetString getExtensionValue(Extensions extensions, ASN1ObjectIdentifier oid)
+    {
+        return null == extensions ? null : extensions.getExtensionValue(oid);
+    }
+
     public static Extensions getInstance(
         ASN1TaggedObject obj,
         boolean explicit)
@@ -141,8 +147,7 @@ public Enumeration oids()
      *
      * @return the extension if it's present, null otherwise.
      */
-    public Extension getExtension(
-        ASN1ObjectIdentifier oid)
+    public Extension getExtension(ASN1ObjectIdentifier oid)
     {
         return (Extension)extensions.get(oid);
     }
@@ -155,14 +160,19 @@ public Extension getExtension(
      */
     public ASN1Encodable getExtensionParsedValue(ASN1ObjectIdentifier oid)
     {
-        Extension ext = this.getExtension(oid);
-
-        if (ext != null)
-        {
-            return ext.getParsedValue();
-        }
+        Extension ext = getExtension(oid);
+        return ext == null ? null : ext.getParsedValue();
+    }
 
-        return null;
+    /**
+     * return the value of the extension represented by the object identifier passed in.
+     *
+     * @return the value of the extension if it's present, null otherwise.
+     */
+    public ASN1OctetString getExtensionValue(ASN1ObjectIdentifier oid)
+    {
+        Extension ext = getExtension(oid);
+        return ext == null ? null : ext.getExtnValue();
     }
 
     /**
@@ -229,6 +239,21 @@ public ASN1ObjectIdentifier[] getCriticalExtensionOIDs()
         return getExtensionOIDs(true);
     }
 
+    public boolean hasAnyCriticalExtensions()
+    {
+        for (int i = 0; i != ordering.size(); i++)
+        {
+            Object oid = ordering.elementAt(i);
+
+            if (((Extension)extensions.get(oid)).isCritical())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private ASN1ObjectIdentifier[] getExtensionOIDs(boolean isCritical)
     {
         Vector oidVec = new Vector();