refactoring of ASN1 primitive classes.

40 files changed, 484 insertions, 603 deletions

diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1Enumerated.java b/core/src/main/java/org/bouncycastle/asn1/ASN1Enumerated.java
index d93fd912..09a518f6 100644
--- a/core/src/main/java/org/bouncycastle/asn1/ASN1Enumerated.java
+++ b/core/src/main/java/org/bouncycastle/asn1/ASN1Enumerated.java
@@ -1,22 +1,162 @@
 package org.bouncycastle.asn1;
 
+import java.io.IOException;
 import java.math.BigInteger;
 
+import org.bouncycastle.util.Arrays;
+
 public class ASN1Enumerated
-    extends DEREnumerated
+    extends ASN1Primitive
 {
-    ASN1Enumerated(byte[] bytes)
+    byte[]      bytes;
+
+    /**
+     * return an integer from the passed in object
+     *
+     * @exception IllegalArgumentException if the object cannot be converted.
+     */
+    public static ASN1Enumerated getInstance(
+        Object  obj)
+    {
+        if (obj == null || obj instanceof ASN1Enumerated)
+        {
+            return (ASN1Enumerated)obj;
+        }
+
+        if (obj instanceof byte[])
+        {
+            try
+            {
+                return (ASN1Enumerated)fromByteArray((byte[])obj);
+            }
+            catch (Exception e)
+            {
+                throw new IllegalArgumentException("encoding error in getInstance: " + e.toString());
+            }
+        }
+
+        throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
+    }
+
+    /**
+     * return an Enumerated from a tagged object.
+     *
+     * @param obj the tagged object holding the object we want
+     * @param explicit true if the object is meant to be explicitly
+     *              tagged false otherwise.
+     * @exception IllegalArgumentException if the tagged object cannot
+     *               be converted.
+     */
+    public static ASN1Enumerated getInstance(
+        ASN1TaggedObject obj,
+        boolean          explicit)
+    {
+        ASN1Primitive o = obj.getObject();
+
+        if (explicit || o instanceof ASN1Enumerated)
+        {
+            return getInstance(o);
+        }
+        else
+        {
+            return fromOctetString(((ASN1OctetString)o).getOctets());
+        }
+    }
+
+    /**
+     * @deprecated use ASN1Enumerated
+     */
+    public ASN1Enumerated(
+        int         value)
+    {
+        bytes = BigInteger.valueOf(value).toByteArray();
+    }
+
+    /**
+     * @deprecated use ASN1Enumerated
+     */
+    public ASN1Enumerated(
+        BigInteger   value)
+    {
+        bytes = value.toByteArray();
+    }
+
+    /**
+     * @deprecated use ASN1Enumerated
+     */
+    public ASN1Enumerated(
+        byte[]   bytes)
+    {
+        this.bytes = bytes;
+    }
+
+    public BigInteger getValue()
     {
-        super(bytes);
+        return new BigInteger(bytes);
     }
 
-    public ASN1Enumerated(BigInteger value)
+    boolean isConstructed()
     {
-        super(value);
+        return false;
     }
 
-    public ASN1Enumerated(int value)
+    int encodedLength()
     {
-        super(value);
+        return 1 + StreamUtil.calculateBodyLength(bytes.length) + bytes.length;
+    }
+
+    void encode(
+        ASN1OutputStream out)
+        throws IOException
+    {
+        out.writeEncoded(BERTags.ENUMERATED, bytes);
+    }
+    
+    boolean asn1Equals(
+        ASN1Primitive  o)
+    {
+        if (!(o instanceof ASN1Enumerated))
+        {
+            return false;
+        }
+
+        ASN1Enumerated other = (ASN1Enumerated)o;
+
+        return Arrays.areEqual(this.bytes, other.bytes);
+    }
+
+    public int hashCode()
+    {
+        return Arrays.hashCode(bytes);
+    }
+
+    private static ASN1Enumerated[] cache = new ASN1Enumerated[12];
+
+    static ASN1Enumerated fromOctetString(byte[] enc)
+    {
+        if (enc.length > 1)
+        {
+            return new ASN1Enumerated(Arrays.clone(enc));
+        }
+
+        if (enc.length == 0)
+        {
+            throw new IllegalArgumentException("ENUMERATED has zero length");
+        }
+        int value = enc[0] & 0xff;
+
+        if (value >= cache.length)
+        {
+            return new ASN1Enumerated(Arrays.clone(enc));
+        }
+
+        ASN1Enumerated possibleMatch = cache[value];
+
+        if (possibleMatch == null)
+        {
+            possibleMatch = cache[value] = new ASN1Enumerated(Arrays.clone(enc));
+        }
+
+        return possibleMatch;
     }
 }
diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1Integer.java b/core/src/main/java/org/bouncycastle/asn1/ASN1Integer.java
index 18e89c6d..b951e745 100644
--- a/core/src/main/java/org/bouncycastle/asn1/ASN1Integer.java
+++ b/core/src/main/java/org/bouncycastle/asn1/ASN1Integer.java
@@ -1,34 +1,150 @@
 package org.bouncycastle.asn1;
 
+import java.io.IOException;
 import java.math.BigInteger;
 
 import org.bouncycastle.util.Arrays;
 
 public class ASN1Integer
-    extends DERInteger
+    extends ASN1Primitive
 {
-    ASN1Integer(byte[] bytes, boolean clone)
+    byte[] bytes;
+
+    /**
+     * return an integer from the passed in object
+     *
+     * @throws IllegalArgumentException if the object cannot be converted.
+     */
+    public static ASN1Integer getInstance(
+        Object obj)
     {
-        super(clone ? Arrays.clone(bytes) : bytes);
+        if (obj == null || obj instanceof ASN1Integer)
+        {
+            return (ASN1Integer)obj;
+        }
+
+        if (obj instanceof byte[])
+        {
+            try
+            {
+                return (ASN1Integer)fromByteArray((byte[])obj);
+            }
+            catch (Exception e)
+            {
+                throw new IllegalArgumentException("encoding error in getInstance: " + e.toString());
+            }
+        }
+
+        throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
     }
 
     /**
-     * Constructor from a byte array containing a signed representation of the number.
+     * return an Integer from a tagged object.
      *
-     * @param bytes a byte array containing the signed number.A copy is made of the byte array.
+     * @param obj      the tagged object holding the object we want
+     * @param explicit true if the object is meant to be explicitly
+     *                 tagged false otherwise.
+     * @throws IllegalArgumentException if the tagged object cannot
+     * be converted.
      */
-    public ASN1Integer(byte[] bytes)
+    public static ASN1Integer getInstance(
+        ASN1TaggedObject obj,
+        boolean explicit)
+    {
+        ASN1Primitive o = obj.getObject();
+
+        if (explicit || o instanceof ASN1Integer)
+        {
+            return getInstance(o);
+        }
+        else
+        {
+            return new ASN1Integer(ASN1OctetString.getInstance(obj.getObject()).getOctets());
+        }
+    }
+
+    public ASN1Integer(
+        long value)
+    {
+        bytes = BigInteger.valueOf(value).toByteArray();
+    }
+
+    public ASN1Integer(
+        BigInteger value)
+    {
+        bytes = value.toByteArray();
+    }
+
+    public ASN1Integer(
+        byte[] bytes)
     {
         this(bytes, true);
     }
 
-    public ASN1Integer(BigInteger value)
+    ASN1Integer(byte[] bytes, boolean clone)
+    {
+        this.bytes = (clone) ? Arrays.clone(bytes) : bytes;
+    }
+
+    public BigInteger getValue()
+    {
+        return new BigInteger(bytes);
+    }
+
+    /**
+     * in some cases positive values get crammed into a space,
+     * that's not quite big enough...
+     */
+    public BigInteger getPositiveValue()
+    {
+        return new BigInteger(1, bytes);
+    }
+
+    boolean isConstructed()
     {
-        super(value);
+        return false;
     }
 
-    public ASN1Integer(long value)
+    int encodedLength()
     {
-        super(value);
+        return 1 + StreamUtil.calculateBodyLength(bytes.length) + bytes.length;
     }
+
+    void encode(
+        ASN1OutputStream out)
+        throws IOException
+    {
+        out.writeEncoded(BERTags.INTEGER, bytes);
+    }
+
+    public int hashCode()
+    {
+        int value = 0;
+
+        for (int i = 0; i != bytes.length; i++)
+        {
+            value ^= (bytes[i] & 0xff) << (i % 4);
+        }
+
+        return value;
+    }
+
+    boolean asn1Equals(
+        ASN1Primitive o)
+    {
+        if (!(o instanceof ASN1Integer))
+        {
+            return false;
+        }
+
+        ASN1Integer other = (ASN1Integer)o;
+
+        return Arrays.areEqual(bytes, other.bytes);
+    }
+
+    public String toString()
+    {
+        return getValue().toString();
+    }
+
 }
diff --git a/core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java b/core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
index 9b1ef55c..879a01ca 100644
--- a/core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
+++ b/core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
@@ -1,170 +1,25 @@
 package org.bouncycastle.asn1;
 
-import java.io.IOException;
 import java.math.BigInteger;
 
-import org.bouncycastle.util.Arrays;
-
 /**
- * Use ASN1Enumerated instead of this.
+ * @deprecated Use ASN1Enumerated instead of this.
  */
 public class DEREnumerated
-    extends ASN1Primitive
+    extends ASN1Enumerated
 {
-    byte[]      bytes;
-
-    /**
-     * return an integer from the passed in object
-     *
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static ASN1Enumerated getInstance(
-        Object  obj)
-    {
-        if (obj == null || obj instanceof ASN1Enumerated)
-        {
-            return (ASN1Enumerated)obj;
-        }
-
-        if (obj instanceof DEREnumerated)
-        {
-            return new ASN1Enumerated(((DEREnumerated)obj).getValue());
-        }
-
-        if (obj instanceof byte[])
-        {
-            try
-            {
-                return (ASN1Enumerated)fromByteArray((byte[])obj);
-            }
-            catch (Exception e)
-            {
-                throw new IllegalArgumentException("encoding error in getInstance: " + e.toString());
-            }
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
-    }
-
-    /**
-     * return an Enumerated from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the tagged object cannot
-     *               be converted.
-     */
-    public static ASN1Enumerated getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        ASN1Primitive o = obj.getObject();
-
-        if (explicit || o instanceof DEREnumerated)
-        {
-            return getInstance(o);
-        }
-        else
-        {
-            return fromOctetString(((ASN1OctetString)o).getOctets());
-        }
-    }
-
-    /**
-     * @deprecated use ASN1Enumerated
-     */
-    public DEREnumerated(
-        int         value)
-    {
-        bytes = BigInteger.valueOf(value).toByteArray();
-    }
-
-    /**
-     * @deprecated use ASN1Enumerated
-     */
-    public DEREnumerated(
-        BigInteger   value)
-    {
-        bytes = value.toByteArray();
-    }
-
-    /**
-     * @deprecated use ASN1Enumerated
-     */
-    public DEREnumerated(
-        byte[]   bytes)
-    {
-        this.bytes = bytes;
-    }
-
-    public BigInteger getValue()
-    {
-        return new BigInteger(bytes);
-    }
-
-    boolean isConstructed()
-    {
-        return false;
-    }
-
-    int encodedLength()
-    {
-        return 1 + StreamUtil.calculateBodyLength(bytes.length) + bytes.length;
-    }
-
-    void encode(
-        ASN1OutputStream out)
-        throws IOException
+    DEREnumerated(byte[] bytes)
     {
-        out.writeEncoded(BERTags.ENUMERATED, bytes);
+        super(bytes);
     }
-    
-    boolean asn1Equals(
-        ASN1Primitive  o)
-    {
-        if (!(o instanceof DEREnumerated))
-        {
-            return false;
-        }
-
-        DEREnumerated other = (DEREnumerated)o;
 
-        return Arrays.areEqual(this.bytes, other.bytes);
-    }
-
-    public int hashCode()
+    public DEREnumerated(BigInteger value)
     {
-        return Arrays.hashCode(bytes);
+        super(value);
     }
 
-    private static ASN1Enumerated[] cache = new ASN1Enumerated[12];
-
-    static ASN1Enumerated fromOctetString(byte[] enc)
+    public DEREnumerated(int value)
     {
-        if (enc.length > 1)
-        {
-            return new ASN1Enumerated(Arrays.clone(enc));
-        }
-
-        if (enc.length == 0)
-        {
-            throw new IllegalArgumentException("ENUMERATED has zero length");
-        }
-        int value = enc[0] & 0xff;
-
-        if (value >= cache.length)
-        {
-            return new ASN1Enumerated(Arrays.clone(enc));
-        }
-
-        ASN1Enumerated possibleMatch = cache[value];
-
-        if (possibleMatch == null)
-        {
-            possibleMatch = cache[value] = new ASN1Enumerated(Arrays.clone(enc));
-        }
-
-        return possibleMatch;
+        super(value);
     }
 }
diff --git a/core/src/main/java/org/bouncycastle/asn1/DERInteger.java b/core/src/main/java/org/bouncycastle/asn1/DERInteger.java
index 57cc84a7..d2e850f3 100644
--- a/core/src/main/java/org/bouncycastle/asn1/DERInteger.java
+++ b/core/src/main/java/org/bouncycastle/asn1/DERInteger.java
@@ -1,160 +1,30 @@
 package org.bouncycastle.asn1;
 
-import java.io.IOException;
 import java.math.BigInteger;
 
-import org.bouncycastle.util.Arrays;
-
 /**
- * Use ASN1Integer instead of this,
+ * @deprecated  Use ASN1Integer instead of this,
  */
 public class DERInteger
-    extends ASN1Primitive
+    extends ASN1Integer
 {
-    byte[]      bytes;
-
-    /**
-     * return an integer from the passed in object
-     *
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static ASN1Integer getInstance(
-        Object  obj)
-    {
-        if (obj == null || obj instanceof ASN1Integer)
-        {
-            return (ASN1Integer)obj;
-        }
-        if (obj instanceof DERInteger)
-        {
-            return new ASN1Integer((((DERInteger)obj).getValue()));
-        }
-
-        if (obj instanceof byte[])
-        {
-            try
-            {
-                return (ASN1Integer)fromByteArray((byte[])obj);
-            }
-            catch (Exception e)
-            {
-                throw new IllegalArgumentException("encoding error in getInstance: " + e.toString());
-            }
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
-    }
-
     /**
-     * return an Integer from a tagged object.
+     * Constructor from a byte array containing a signed representation of the number.
      *
-     * @param obj the tagged object holding the object we want
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the tagged object cannot
-     *               be converted.
-     */
-    public static ASN1Integer getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        ASN1Primitive o = obj.getObject();
-
-        if (explicit || o instanceof DERInteger)
-        {
-            return getInstance(o);
-        }
-        else
-        {
-            return new ASN1Integer(ASN1OctetString.getInstance(obj.getObject()).getOctets());
-        }
-    }
-
-    /**
-     * @deprecated use ASN1Integer constructor
-     */
-    public DERInteger(
-        long         value)
-    {
-        bytes = BigInteger.valueOf(value).toByteArray();
-    }
-
-    /**
-     * @deprecated use ASN1Integer constructor
+     * @param bytes a byte array containing the signed number.A copy is made of the byte array.
      */
-    public DERInteger(
-        BigInteger   value)
+    public DERInteger(byte[] bytes)
     {
-        bytes = value.toByteArray();
+        super(bytes, true);
     }
 
-    /**
-     * @deprecated use ASN1Integer constructor
-     */
-    public DERInteger(
-        byte[]   bytes)
+    public DERInteger(BigInteger value)
     {
-        this.bytes = bytes;
-    }
-
-    public BigInteger getValue()
-    {
-        return new BigInteger(bytes);
-    }
-
-    /**
-     * in some cases positive values get crammed into a space,
-     * that's not quite big enough...
-     */
-    public BigInteger getPositiveValue()
-    {
-        return new BigInteger(1, bytes);
-    }
-
-    boolean isConstructed()
-    {
-        return false;
-    }
-
-    int encodedLength()
-    {
-        return 1 + StreamUtil.calculateBodyLength(bytes.length) + bytes.length;
-    }
-
-    void encode(
-        ASN1OutputStream out)
-        throws IOException
-    {
-        out.writeEncoded(BERTags.INTEGER, bytes);
-    }
-    
-    public int hashCode()
-    {
-         int     value = 0;
- 
-         for (int i = 0; i != bytes.length; i++)
-         {
-             value ^= (bytes[i] & 0xff) << (i % 4);
-         }
- 
-         return value;
-    }
-
-    boolean asn1Equals(
-        ASN1Primitive  o)
-    {
-        if (!(o instanceof DERInteger))
-        {
-            return false;
-        }
-
-        DERInteger other = (DERInteger)o;
-
-        return Arrays.areEqual(bytes, other.bytes);
+        super(value);
     }
 
-    public String toString()
+    public DERInteger(long value)
     {
-      return getValue().toString();
+        super(value);
     }
 }
diff --git a/core/src/main/java/org/bouncycastle/asn1/cms/Attribute.java b/core/src/main/java/org/bouncycastle/asn1/cms/Attribute.java
index 066cf693..8c487433 100644
--- a/core/src/main/java/org/bouncycastle/asn1/cms/Attribute.java
+++ b/core/src/main/java/org/bouncycastle/asn1/cms/Attribute.java
@@ -7,7 +7,6 @@ import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 
 /**
@@ -73,17 +72,6 @@ public class Attribute
         attrValues = (ASN1Set)seq.getObjectAt(1);
     }
 
-    /**
-     * @deprecated use ASN1ObjectIdentifier
-     */
-    public Attribute(
-        DERObjectIdentifier attrType,
-        ASN1Set             attrValues)
-    {
-        this.attrType = new ASN1ObjectIdentifier(attrType.getId());
-        this.attrValues = attrValues;
-    }
-
     public Attribute(
         ASN1ObjectIdentifier attrType,
         ASN1Set             attrValues)
diff --git a/core/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java b/core/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java
index 02b6cc1e..3b8e0bed 100644
--- a/core/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java
+++ b/core/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java
@@ -8,7 +8,6 @@ import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSet;
 
 /**
@@ -91,14 +90,6 @@ public class AttributeTable
     }
 
     /**
-     * @deprecated use ASN1ObjectIdentifier
-     */
-    public Attribute get(DERObjectIdentifier oid)
-    {
-        return get(new ASN1ObjectIdentifier(oid.getId()));
-    }
-
-    /**
      * Return the first attribute matching the OBJECT IDENTIFIER oid.
      * 
      * @param oid type of attribute required.
@@ -117,14 +108,6 @@ public class AttributeTable
         return (Attribute)value;
     }
 
-     /**
-     * @deprecated use ASN1ObjectIdentifier
-     */
-    public ASN1EncodableVector getAll(DERObjectIdentifier oid)
-    {
-        return getAll(new ASN1ObjectIdentifier(oid.getId()));
-    }
-
     /**
      * Return all the attributes matching the OBJECT IDENTIFIER oid. The vector will be 
      * empty if there are no attributes of the required type present.
diff --git a/core/src/main/java/org/bouncycastle/asn1/ess/ContentHints.java b/core/src/main/java/org/bouncycastle/asn1/ess/ContentHints.java
index 93d9d0c8..462d9685 100644
--- a/core/src/main/java/org/bouncycastle/asn1/ess/ContentHints.java
+++ b/core/src/main/java/org/bouncycastle/asn1/ess/ContentHints.java
@@ -6,7 +6,6 @@ import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERUTF8String;
 
@@ -47,25 +46,6 @@ public class ContentHints
         }
     }
 
-    /**
-     * @deprecated use ASN1ObjectIdentifier
-     */
-    public ContentHints(
-        DERObjectIdentifier contentType)
-    {
-        this(new ASN1ObjectIdentifier(contentType.getId()));
-    }
-
-        /**
-     * @deprecated use ASN1ObjectIdentifier
-     */
-    public ContentHints(
-        DERObjectIdentifier contentType,
-        DERUTF8String contentDescription)
-    {
-        this(new ASN1ObjectIdentifier(contentType.getId()), contentDescription);
-    }
-
     public ContentHints(
         ASN1ObjectIdentifier contentType)
     {
diff --git a/core/src/main/java/org/bouncycastle/asn1/isismtt/x509/NamingAuthority.java b/core/src/main/java/org/bouncycastle/asn1/isismtt/x509/NamingAuthority.java
index 237f5e55..ca472e67 100644
--- a/core/src/main/java/org/bouncycastle/asn1/isismtt/x509/NamingAuthority.java
+++ b/core/src/main/java/org/bouncycastle/asn1/isismtt/x509/NamingAuthority.java
@@ -11,7 +11,6 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1String;
 import org.bouncycastle.asn1.ASN1TaggedObject;
 import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.isismtt.ISISMTTObjectIdentifiers;
 import org.bouncycastle.asn1.x500.DirectoryString;
@@ -173,24 +172,6 @@ public class NamingAuthority
         return namingAuthorityUrl;
     }
 
-        /**
-     * Constructor from given details.
-     * <p/>
-     * All parameters can be combined.
-     *
-     * @param namingAuthorityId   ObjectIdentifier for naming authority.
-     * @param namingAuthorityUrl  URL for naming authority.
-     * @param namingAuthorityText Textual representation of naming authority.
-         * @deprecated use ASN1ObjectIdentifier method
-     */
-    public NamingAuthority(DERObjectIdentifier namingAuthorityId,
-                           String namingAuthorityUrl, DirectoryString namingAuthorityText)
-    {
-        this.namingAuthorityId = new ASN1ObjectIdentifier(namingAuthorityId.getId());
-        this.namingAuthorityUrl = namingAuthorityUrl;
-        this.namingAuthorityText = namingAuthorityText;
-    }
-
     /**
      * Constructor from given details.
      * <p/>
diff --git a/core/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java b/core/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java
index c6a2965b..d654d032 100644
--- a/core/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java
+++ b/core/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java
@@ -23,7 +23,7 @@ public class ElGamalParameter
         this.g = new ASN1Integer(g);
     }
 
-    public ElGamalParameter(
+    private ElGamalParameter(
         ASN1Sequence  seq)
     {
         Enumeration     e = seq.getObjects();
@@ -32,6 +32,20 @@ public class ElGamalParameter
         g = (ASN1Integer)e.nextElement();
     }
 
+    public static ElGamalParameter getInstance(Object o)
+    {
+        if (o instanceof ElGamalParameter)
+        {
+            return (ElGamalParameter)o;
+        }
+        else if (o != null)
+        {
+            return new ElGamalParameter(ASN1Sequence.getInstance(o));
+        }
+
+        return null;
+    }
+
     public BigInteger getP()
     {
         return p.getPositiveValue();
diff --git a/core/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java b/core/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
index 4560f647..8221e182 100644
--- a/core/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
+++ b/core/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
@@ -3,7 +3,9 @@ package org.bouncycastle.asn1.util;
 import java.io.IOException;
 import java.util.Enumeration;
 
+import org.bouncycastle.asn1.ASN1Boolean;
 import org.bouncycastle.asn1.ASN1Encodable;
+import org.bouncycastle.asn1.ASN1Enumerated;
 import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
@@ -12,7 +14,6 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.ASN1TaggedObject;
 import org.bouncycastle.asn1.BERApplicationSpecific;
-import org.bouncycastle.asn1.BERConstructedOctetString;
 import org.bouncycastle.asn1.BEROctetString;
 import org.bouncycastle.asn1.BERSequence;
 import org.bouncycastle.asn1.BERSet;
@@ -21,8 +22,6 @@ import org.bouncycastle.asn1.BERTags;
 import org.bouncycastle.asn1.DERApplicationSpecific;
 import org.bouncycastle.asn1.DERBMPString;
 import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERBoolean;
-import org.bouncycastle.asn1.DEREnumerated;
 import org.bouncycastle.asn1.DERExternal;
 import org.bouncycastle.asn1.DERGeneralizedTime;
 import org.bouncycastle.asn1.DERIA5String;
@@ -193,9 +192,9 @@ public class ASN1Dump
         {
             buf.append(indent + "ObjectIdentifier(" + ((ASN1ObjectIdentifier)obj).getId() + ")" + nl);
         }
-        else if (obj instanceof DERBoolean)
+        else if (obj instanceof ASN1Boolean)
         {
-            buf.append(indent + "Boolean(" + ((DERBoolean)obj).isTrue() + ")" + nl);
+            buf.append(indent + "Boolean(" + ((ASN1Boolean)obj).isTrue() + ")" + nl);
         }
         else if (obj instanceof ASN1Integer)
         {
@@ -254,9 +253,9 @@ public class ASN1Dump
         {
             buf.append(outputApplicationSpecific("DER", indent, verbose, obj, nl));
         }
-        else if (obj instanceof DEREnumerated)
+        else if (obj instanceof ASN1Enumerated)
         {
-            DEREnumerated en = (DEREnumerated) obj;
+            ASN1Enumerated en = (ASN1Enumerated) obj;
             buf.append(indent + "DER Enumerated(" + en.getValue() + ")" + nl);
         }
         else if (obj instanceof DERExternal)
diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java b/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
index d250bf1e..bb90030c 100644
--- a/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
+++ b/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
@@ -8,7 +8,6 @@ import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1TaggedObject;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 
 public class AlgorithmIdentifier
@@ -64,30 +63,6 @@ public class AlgorithmIdentifier
         this.objectId = new ASN1ObjectIdentifier(objectId);
     }
 
-    /**
-     * @deprecated use ASN1ObjectIdentifier
-     * @param objectId
-     */
-    public AlgorithmIdentifier(
-        DERObjectIdentifier    objectId)
-    {
-        this.objectId = new ASN1ObjectIdentifier(objectId.getId());
-    }
-
-    /**
-     * @deprecated use ASN1ObjectIdentifier
-     * @param objectId
-     * @param parameters
-     */
-    public AlgorithmIdentifier(
-        DERObjectIdentifier objectId,
-        ASN1Encodable           parameters)
-    {
-        parametersDefined = true;
-        this.objectId = new ASN1ObjectIdentifier(objectId.getId());
-        this.parameters = parameters;
-    }
-
     public AlgorithmIdentifier(
         ASN1ObjectIdentifier     objectId,
         ASN1Encodable           parameters)
diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java b/core/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java
index 4a16bd4b..ba5ecf1f 100644
--- a/core/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java
+++ b/core/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java
@@ -9,7 +9,6 @@ import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBoolean;
 import org.bouncycastle.asn1.DERSequence;
 
 public class BasicConstraints
@@ -59,9 +58,9 @@ public class BasicConstraints
         }
         else
         {
-            if (seq.getObjectAt(0) instanceof DERBoolean)
+            if (seq.getObjectAt(0) instanceof ASN1Boolean)
             {
-                this.cA = DERBoolean.getInstance(seq.getObjectAt(0));
+                this.cA = ASN1Boolean.getInstance(seq.getObjectAt(0));
             }
             else
             {
diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java b/core/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java
index f29284d5..93530571 100644
--- a/core/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java
+++ b/core/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java
@@ -2,11 +2,11 @@ package org.bouncycastle.asn1.x509;
 
 import java.io.IOException;
 
+import org.bouncycastle.asn1.ASN1Boolean;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBoolean;
 
 /**
  * an object for the elements in the X.509 V3 extension block.
@@ -173,7 +173,7 @@ public class X509Extension
     ASN1OctetString     value;
 
     public X509Extension(
-        DERBoolean              critical,
+        ASN1Boolean             critical,
         ASN1OctetString         value)
     {
         this.critical = critical.isTrue();
diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java b/core/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java
index c72e3cc0..5b9ea9e1 100644
--- a/core/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java
+++ b/core/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java
@@ -4,6 +4,7 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
+import org.bouncycastle.asn1.ASN1Boolean;
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -11,8 +12,6 @@ import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBoolean;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 
 /**
@@ -259,7 +258,7 @@ public class X509Extensions
 
             if (s.size() == 3)
             {
-                extensions.put(s.getObjectAt(0), new X509Extension(DERBoolean.getInstance(s.getObjectAt(1)), ASN1OctetString.getInstance(s.getObjectAt(2))));
+                extensions.put(s.getObjectAt(0), new X509Extension(ASN1Boolean.getInstance(s.getObjectAt(1)), ASN1OctetString.getInstance(s.getObjectAt(2))));
             }
             else if (s.size() == 2)
             {
@@ -369,17 +368,6 @@ public class X509Extensions
      * @return the extension if it's present, null otherwise.
      */
     public X509Extension getExtension(
-        DERObjectIdentifier oid)
-    {
-        return (X509Extension)extensions.get(oid);
-    }
-
-    /**
-     * @deprecated
-     * @param oid
-     * @return
-     */
-    public X509Extension getExtension(
         ASN1ObjectIdentifier oid)
     {
         return (X509Extension)extensions.get(oid);
@@ -410,7 +398,7 @@ public class X509Extensions
 
             if (ext.isCritical())
             {
-                v.add(DERBoolean.TRUE);
+                v.add(ASN1Boolean.TRUE);
             }
 
             v.add(ext.getValue());
diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java b/core/src/main/java/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java
index 468d1b96..589d512f 100644
--- a/core/src/main/java/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java
+++ b/core/src/main/java/org/bouncycastle/asn1/x509/X509ExtensionsGenerator.java
@@ -7,7 +7,6 @@ import java.util.Vector;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1Encoding;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DEROctetString;
 
 /**
@@ -29,28 +28,6 @@ public class X509ExtensionsGenerator
     }
 
     /**
-     * @deprecated use ASN1ObjectIdentifier
-     */
-    public void addExtension(
-        DERObjectIdentifier oid,
-        boolean             critical,
-        ASN1Encodable       value)
-    {
-        addExtension(new ASN1ObjectIdentifier(oid.getId()), critical, value);
-    }
-
-    /**
-     * @deprecated use ASN1ObjectIdentifier
-     */
-    public void addExtension(
-        DERObjectIdentifier oid,
-        boolean             critical,
-        byte[]              value)
-    {
-        addExtension(new ASN1ObjectIdentifier(oid.getId()), critical, value);
-    }
-
-    /**
      * Add an extension with the given oid and the passed in value to be included
      * in the OCTET STRING associated with the extension.
      *
diff --git a/core/src/main/java/org/bouncycastle/asn1/x9/DHDomainParameters.java b/core/src/main/java/org/bouncycastle/asn1/x9/DHDomainParameters.java
index 6a97a48e..509111ad 100644
--- a/core/src/main/java/org/bouncycastle/asn1/x9/DHDomainParameters.java
+++ b/core/src/main/java/org/bouncycastle/asn1/x9/DHDomainParameters.java
@@ -1,5 +1,6 @@
 package org.bouncycastle.asn1.x9;
 
+import java.math.BigInteger;
 import java.util.Enumeration;
 
 import org.bouncycastle.asn1.ASN1Encodable;
@@ -38,6 +39,29 @@ public class DHDomainParameters
             + obj.getClass().getName());
     }
 
+    public DHDomainParameters(BigInteger p, BigInteger g, BigInteger q, BigInteger j,
+        DHValidationParms validationParms)
+    {
+        if (p == null)
+        {
+            throw new IllegalArgumentException("'p' cannot be null");
+        }
+        if (g == null)
+        {
+            throw new IllegalArgumentException("'g' cannot be null");
+        }
+        if (q == null)
+        {
+            throw new IllegalArgumentException("'q' cannot be null");
+        }
+
+        this.p = new ASN1Integer(p);
+        this.g = new ASN1Integer(g);
+        this.q = new ASN1Integer(q);
+        this.j = new ASN1Integer(j);
+        this.validationParms = validationParms;
+    }
+
     public DHDomainParameters(ASN1Integer p, ASN1Integer g, ASN1Integer q, ASN1Integer j,
         DHValidationParms validationParms)
     {
diff --git a/core/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKEKGenerator.java b/core/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKEKGenerator.java
index 947bc5c4..55d8ba51 100644
--- a/core/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKEKGenerator.java
+++ b/core/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKEKGenerator.java
@@ -4,7 +4,7 @@ import java.io.IOException;
 
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERTaggedObject;
@@ -22,7 +22,7 @@ public class DHKEKGenerator
 {
     private final Digest digest;
 
-    private DERObjectIdentifier algorithm;
+    private ASN1ObjectIdentifier algorithm;
     private int                 keySize;
     private byte[]              z;
     private byte[]              partyAInfo;
diff --git a/core/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java b/core/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java
index 2e4c48d3..684eb9c0 100644
--- a/core/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java
+++ b/core/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java
@@ -5,9 +5,9 @@ import java.math.BigInteger;
 
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Encoding;
+import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERInteger;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.DSA;
@@ -142,8 +142,8 @@ public class DSADigestSigner
         throws IOException
     {
         ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(new DERInteger(r));
-        v.add(new DERInteger(s));
+        v.add(new ASN1Integer(r));
+        v.add(new ASN1Integer(s));
 
         return new DERSequence(v).getEncoded(ASN1Encoding.DER);
     }
@@ -156,8 +156,8 @@ public class DSADigestSigner
 
         return new BigInteger[]
         {
-            ((DERInteger)s.getObjectAt(0)).getValue(),
-            ((DERInteger)s.getObjectAt(1)).getValue()
+            ((ASN1Integer)s.getObjectAt(0)).getValue(),
+            ((ASN1Integer)s.getObjectAt(1)).getValue()
         };
     }
 }
diff --git a/core/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java b/core/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
index 9e342ff9..92684ecc 100644
--- a/core/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
+++ b/core/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
@@ -9,7 +9,6 @@ import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.oiw.ElGamalParameter;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.DHParameter;
@@ -101,7 +100,7 @@ public class PrivateKeyFactory
         }
         else if (algId.getAlgorithm().equals(OIWObjectIdentifiers.elGamalAlgorithm))
         {
-            ElGamalParameter params = new ElGamalParameter((ASN1Sequence)algId.getParameters());
+            ElGamalParameter params = ElGamalParameter.getInstance(algId.getParameters());
             ASN1Integer derX = (ASN1Integer)keyInfo.parsePrivateKey();
 
             return new ElGamalPrivateKeyParameters(derX.getValue(), new ElGamalParameters(
diff --git a/core/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java b/core/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
index b52d9bc0..cb130954 100644
--- a/core/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
+++ b/core/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
@@ -10,7 +10,6 @@ import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.oiw.ElGamalParameter;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
@@ -136,7 +135,7 @@ public class PublicKeyFactory
         }
         else if (algId.getAlgorithm().equals(OIWObjectIdentifiers.elGamalAlgorithm))
         {
-            ElGamalParameter params = new ElGamalParameter((ASN1Sequence)algId.getParameters());
+            ElGamalParameter params = ElGamalParameter.getInstance(algId.getParameters());
             ASN1Integer derY = (ASN1Integer)keyInfo.parsePublicKey();
 
             return new ElGamalPublicKeyParameters(derY.getValue(), new ElGamalParameters(
diff --git a/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java b/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java
index 8da7bbe6..5917765c 100644
--- a/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java
+++ b/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java
@@ -16,7 +16,7 @@ import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERInteger;
+import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.x509.X509Extensions;
 import org.bouncycastle.asn1.x509.X509Name;
 import org.bouncycastle.jce.PrincipalUtil;
@@ -562,7 +562,7 @@ public class X509CRLSelector implements CRLSelector
                         ((ASN1OctetString)derInputStream.readObject())
                                 .getOctets());
                 derInputStream = new ASN1InputStream(inStream);
-                BigInteger crlNumber = ((DERInteger)derInputStream.readObject())
+                BigInteger crlNumber = ((ASN1Integer)derInputStream.readObject())
                         .getPositiveValue();
                 if (minCRL != null && minCRL.compareTo(crlNumber) > 0)
                 {
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java b/core/src/test/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
index bbfc65db..e0cd1af2 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
@@ -1,22 +1,22 @@
 package org.bouncycastle.asn1.test;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1Null;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1SequenceParser;
 import org.bouncycastle.asn1.ASN1StreamParser;
 import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.DERInteger;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequenceGenerator;
 import org.bouncycastle.util.encoders.Hex;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-
 public class ASN1SequenceParserTest 
     extends TestCase 
 {
@@ -40,9 +40,9 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        DERSequenceGenerator  seqGen = new DERSequenceGenerator(bOut);
        
-       seqGen.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen.addObject(new DERObjectIdentifier("1.1"));
+       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
        
        seqGen.close();
 
@@ -55,13 +55,13 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        DERSequenceGenerator seqGen1 = new DERSequenceGenerator(bOut);
        
-       seqGen1.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen1.addObject(new DERObjectIdentifier("1.1"));
+       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
        
        DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream());
        
-       seqGen2.addObject(new DERInteger(BigInteger.valueOf(1)));
+       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
        
        seqGen2.close();
        
@@ -76,9 +76,9 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        DERSequenceGenerator  seqGen = new DERSequenceGenerator(bOut, 1, true);
        
-       seqGen.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen.addObject(new DERObjectIdentifier("1.1"));
+       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
        
        seqGen.close();
 
@@ -91,9 +91,9 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        DERSequenceGenerator  seqGen = new DERSequenceGenerator(bOut, 1, false);
        
-       seqGen.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen.addObject(new DERObjectIdentifier("1.1"));
+       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
        
        seqGen.close();
 
@@ -106,13 +106,13 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        DERSequenceGenerator  seqGen1 = new DERSequenceGenerator(bOut);
        
-       seqGen1.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen1.addObject(new DERObjectIdentifier("1.1"));
+       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
        
        DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream(), 1, true);
        
-       seqGen2.addObject(new DERInteger(BigInteger.valueOf(1)));
+       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
        
        seqGen2.close();
        
@@ -127,13 +127,13 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        DERSequenceGenerator  seqGen1 = new DERSequenceGenerator(bOut);
        
-       seqGen1.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen1.addObject(new DERObjectIdentifier("1.1"));
+       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
        
        DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream(), 1, false);
        
-       seqGen2.addObject(new DERInteger(BigInteger.valueOf(1)));
+       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
        
        seqGen2.close();
        
@@ -148,9 +148,9 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        BERSequenceGenerator  seqGen = new BERSequenceGenerator(bOut);
        
-       seqGen.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen.addObject(new DERObjectIdentifier("1.1"));
+       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
        
        seqGen.close();
        
@@ -163,13 +163,13 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        BERSequenceGenerator seqGen1 = new BERSequenceGenerator(bOut);
        
-       seqGen1.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen1.addObject(new DERObjectIdentifier("1.1"));
+       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
        
        DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream());
        
-       seqGen2.addObject(new DERInteger(BigInteger.valueOf(1)));
+       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
        
        seqGen2.close();
        
@@ -184,13 +184,13 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        BERSequenceGenerator  seqGen1 = new BERSequenceGenerator(bOut);
        
-       seqGen1.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen1.addObject(new DERObjectIdentifier("1.1"));
+       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
        
        BERSequenceGenerator seqGen2 = new BERSequenceGenerator(seqGen1.getRawOutputStream());
        
-       seqGen2.addObject(new DERInteger(BigInteger.valueOf(1)));
+       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
        
        seqGen2.close();
        
@@ -215,10 +215,10 @@ public class ASN1SequenceParserTest
             switch (count)
             {
             case 0:
-                assertTrue(o instanceof DERInteger);
+                assertTrue(o instanceof ASN1Integer);
                 break;
             case 1:
-                assertTrue(o instanceof DERObjectIdentifier);
+                assertTrue(o instanceof ASN1ObjectIdentifier);
                 break;
             }
             count++;
@@ -244,10 +244,10 @@ public class ASN1SequenceParserTest
             switch (count)
             {
             case 0:
-                assertTrue(o instanceof DERInteger);
+                assertTrue(o instanceof ASN1Integer);
                 break;
             case 1:
-                assertTrue(o instanceof DERObjectIdentifier);
+                assertTrue(o instanceof ASN1ObjectIdentifier);
                 break;
             case 2:
                 assertTrue(o instanceof ASN1SequenceParser);
@@ -290,10 +290,10 @@ public class ASN1SequenceParserTest
             switch (count)
             {
             case 0:
-                assertTrue(o instanceof DERInteger);
+                assertTrue(o instanceof ASN1Integer);
                 break;
             case 1:
-                assertTrue(o instanceof DERObjectIdentifier);
+                assertTrue(o instanceof ASN1ObjectIdentifier);
                 break;
             }
             count++;
@@ -320,9 +320,9 @@ public class ASN1SequenceParserTest
        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
        BERSequenceGenerator  seqGen = new BERSequenceGenerator(bOut, 1, true);
        
-       seqGen.addObject(new DERInteger(BigInteger.valueOf(0)));
+       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
        
-       seqGen.addObject(new DERObjectIdentifier("1.1"));
+       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
        
        seqGen.close();
       
@@ -353,10 +353,10 @@ public class ASN1SequenceParserTest
                 assertTrue(o instanceof ASN1Null);
                 break;
             case 1:
-                assertTrue(o instanceof DERInteger);
+                assertTrue(o instanceof ASN1Integer);
                 break;
             case 2:
-                assertTrue(o instanceof DERObjectIdentifier);
+                assertTrue(o instanceof ASN1ObjectIdentifier);
                 break;
             }
             count++;
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java
index b1d0e43d..171faec4 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java
@@ -1,8 +1,10 @@
 package org.bouncycastle.asn1.test;
 
+import java.io.IOException;
+
 import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.isismtt.x509.Admissions;
 import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
 import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
@@ -10,8 +12,6 @@ import org.bouncycastle.asn1.x500.DirectoryString;
 import org.bouncycastle.asn1.x509.GeneralName;
 import org.bouncycastle.asn1.x509.X509Name;
 
-import java.io.IOException;
-
 public class AdmissionsUnitTest
     extends ASN1UnitTest
 {
@@ -24,7 +24,7 @@ public class AdmissionsUnitTest
         throws Exception
     {
         GeneralName name = new GeneralName(new X509Name("CN=hello world"));
-        NamingAuthority auth =  new NamingAuthority(new DERObjectIdentifier("1.2.3"), "url", new DirectoryString("fred"));
+        NamingAuthority auth =  new NamingAuthority(new ASN1ObjectIdentifier("1.2.3"), "url", new DirectoryString("fred"));
         Admissions  admissions = new Admissions(name, auth, new ProfessionInfo[0]);
 
         checkConstruction(admissions, name, auth);
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java
index de7d1470..337fb1a5 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java
@@ -3,7 +3,7 @@ package org.bouncycastle.asn1.test;
 import java.util.Hashtable;
 
 import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DERSet;
 import org.bouncycastle.asn1.cms.Attribute;
 import org.bouncycastle.asn1.cms.AttributeTable;
@@ -12,9 +12,9 @@ import org.bouncycastle.util.test.SimpleTest;
 public class AttributeTableUnitTest 
     extends SimpleTest
 {
-    private static final DERObjectIdentifier type1 = new DERObjectIdentifier("1.1.1");
-    private static final DERObjectIdentifier type2 = new DERObjectIdentifier("1.1.2");
-    private static final DERObjectIdentifier type3 = new DERObjectIdentifier("1.1.3");
+    private static final ASN1ObjectIdentifier type1 = new ASN1ObjectIdentifier("1.1.1");
+    private static final ASN1ObjectIdentifier type2 = new ASN1ObjectIdentifier("1.1.2");
+    private static final ASN1ObjectIdentifier type3 = new ASN1ObjectIdentifier("1.1.3");
     
     public String getName()
     {
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CertHashUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/CertHashUnitTest.java
index 08fb70ce..62c81d45 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CertHashUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/CertHashUnitTest.java
@@ -1,13 +1,13 @@
 package org.bouncycastle.asn1.test;
 
+import java.io.IOException;
+
 import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.isismtt.ocsp.CertHash;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 
-import java.io.IOException;
-
 public class CertHashUnitTest
     extends ASN1UnitTest
 {
@@ -19,7 +19,7 @@ public class CertHashUnitTest
     public void performTest()
         throws Exception
     {
-        AlgorithmIdentifier algId = new AlgorithmIdentifier(new DERObjectIdentifier("1.2.2.3"));
+        AlgorithmIdentifier algId = new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.2.3"));
         byte[]              digest = new byte[20];
         
         CertHash certID = new CertHash(algId, digest);
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
index 9b3d5d29..0ce1c236 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.esf.CommitmentTypeIdentifier;
 import org.bouncycastle.asn1.esf.CommitmentTypeIndication;
@@ -26,7 +26,7 @@ public class CommitmentTypeIndicationUnitTest
         
         checkConstruction(cti, CommitmentTypeIdentifier.proofOfOrigin, null);
         
-        ASN1Sequence qualifier = new DERSequence(new DERObjectIdentifier("1.2"));
+        ASN1Sequence qualifier = new DERSequence(new ASN1ObjectIdentifier("1.2"));
         
         cti = new CommitmentTypeIndication(CommitmentTypeIdentifier.proofOfOrigin, qualifier);
 
@@ -53,7 +53,7 @@ public class CommitmentTypeIndicationUnitTest
 
     private void checkConstruction(
          CommitmentTypeIndication mv,
-         DERObjectIdentifier commitmenttTypeId,
+         ASN1ObjectIdentifier commitmenttTypeId,
          ASN1Encodable qualifier) 
          throws IOException
     {
@@ -74,7 +74,7 @@ public class CommitmentTypeIndicationUnitTest
 
     private void checkStatement(
         CommitmentTypeIndication cti,
-        DERObjectIdentifier     commitmentTypeId,
+        ASN1ObjectIdentifier     commitmentTypeId,
         ASN1Encodable           qualifier)
     {
         if (!cti.getCommitmentTypeId().equals(commitmentTypeId))
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
index bebb1195..2d782ba9 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.esf.CommitmentTypeIdentifier;
 import org.bouncycastle.asn1.esf.CommitmentTypeQualifier;
 import org.bouncycastle.util.test.SimpleTest;
@@ -25,7 +25,7 @@ public class CommitmentTypeQualifierUnitTest
         
         checkConstruction(ctq, CommitmentTypeIdentifier.proofOfOrigin, null);
         
-        ASN1Encodable info = new DERObjectIdentifier("1.2");
+        ASN1Encodable info = new ASN1ObjectIdentifier("1.2");
         
         ctq = new CommitmentTypeQualifier(CommitmentTypeIdentifier.proofOfOrigin, info);
 
@@ -52,7 +52,7 @@ public class CommitmentTypeQualifierUnitTest
 
     private void checkConstruction(
          CommitmentTypeQualifier mv,
-         DERObjectIdentifier commitmenttTypeId,
+         ASN1ObjectIdentifier commitmenttTypeId,
          ASN1Encodable qualifier) 
          throws IOException
     {
@@ -73,7 +73,7 @@ public class CommitmentTypeQualifierUnitTest
 
     private void checkStatement(
         CommitmentTypeQualifier ctq,
-        DERObjectIdentifier     commitmentTypeId,
+        ASN1ObjectIdentifier     commitmentTypeId,
         ASN1Encodable           qualifier)
     {
         if (!ctq.getCommitmentTypeIdentifier().equals(commitmentTypeId))
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java b/core/src/test/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java
index b41a8821..2e047dee 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java
@@ -1,10 +1,10 @@
 package org.bouncycastle.asn1.test;
 
 import org.bouncycastle.asn1.ASN1Encoding;
+import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.BERTags;
 import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.DERInteger;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Hex;
 import org.bouncycastle.util.test.SimpleTest;
@@ -37,7 +37,7 @@ public class DERApplicationSpecificTest
     public void performTest()
         throws Exception
     {
-        DERInteger value = new DERInteger(9);
+        ASN1Integer value = new ASN1Integer(9);
 
         DERApplicationSpecific tagged = new DERApplicationSpecific(false, 3, value);
 
@@ -46,7 +46,7 @@ public class DERApplicationSpecificTest
             fail("implicit encoding failed");
         }
 
-        DERInteger recVal = (DERInteger)tagged.getObject(BERTags.INTEGER);
+        ASN1Integer recVal = (ASN1Integer)tagged.getObject(BERTags.INTEGER);
 
         if (!value.equals(recVal))
         {
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java b/core/src/test/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java
index 640d7f61..3da4e6ad 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java
@@ -4,7 +4,11 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Date;
 
+import org.bouncycastle.asn1.ASN1Boolean;
+import org.bouncycastle.asn1.ASN1Enumerated;
 import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1Integer;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OutputStream;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.BERConstructedOctetString;
@@ -14,15 +18,11 @@ import org.bouncycastle.asn1.BERTaggedObject;
 import org.bouncycastle.asn1.DERApplicationSpecific;
 import org.bouncycastle.asn1.DERBMPString;
 import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERBoolean;
-import org.bouncycastle.asn1.DEREnumerated;
 import org.bouncycastle.asn1.DERGeneralString;
 import org.bouncycastle.asn1.DERGeneralizedTime;
 import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERInteger;
 import org.bouncycastle.asn1.DERNull;
 import org.bouncycastle.asn1.DERNumericString;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.DERPrintableString;
 import org.bouncycastle.asn1.DERSequence;
@@ -52,16 +52,16 @@ public class EqualsAndHashCodeTest
                 new DERApplicationSpecific(0, data),
                 new DERBitString(data),
                 new DERBMPString("hello world"),
-                new DERBoolean(true),
-                new DERBoolean(false),
-                new DEREnumerated(100),
+                new ASN1Boolean(true),
+                new ASN1Boolean(false),
+                new ASN1Enumerated(100),
                 new DERGeneralizedTime("20070315173729Z"),
                 new DERGeneralString("hello world"),
                 new DERIA5String("hello"),
-                new DERInteger(1000),
+                new ASN1Integer(1000),
                 new DERNull(),
                 new DERNumericString("123456"),
-                new DERObjectIdentifier("1.1.1.10000.1"),
+                new ASN1ObjectIdentifier("1.1.1.10000.1"),
                 new DEROctetString(data),
                 new DERPrintableString("hello world"),
                 new DERSequence(new DERPrintableString("hello world")),
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java
index 09214029..8dfcf8cd 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java
@@ -1,13 +1,13 @@
 package org.bouncycastle.asn1.test;
 
+import java.io.IOException;
+
 import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
 import org.bouncycastle.asn1.x500.DirectoryString;
 
-import java.io.IOException;
-
 public class NamingAuthorityUnitTest
     extends ASN1UnitTest
 {
@@ -19,7 +19,7 @@ public class NamingAuthorityUnitTest
     public void performTest()
         throws Exception
     {
-        DERObjectIdentifier namingAuthorityID = new DERObjectIdentifier("1.2.3");
+        ASN1ObjectIdentifier namingAuthorityID = new ASN1ObjectIdentifier("1.2.3");
         String              namingAuthorityURL = "url";
         DirectoryString     namingAuthorityText = new DirectoryString("text");
 
@@ -60,7 +60,7 @@ public class NamingAuthorityUnitTest
 
     private void checkConstruction(
         NamingAuthority auth,
-        DERObjectIdentifier namingAuthorityID,
+        ASN1ObjectIdentifier namingAuthorityID,
         String              namingAuthorityURL,
         DirectoryString     namingAuthorityText)
         throws IOException
@@ -82,7 +82,7 @@ public class NamingAuthorityUnitTest
 
     private void checkValues(
         NamingAuthority auth,
-        DERObjectIdentifier namingAuthorityId,
+        ASN1ObjectIdentifier namingAuthorityId,
         String              namingAuthorityURL,
         DirectoryString     namingAuthorityText)
     {
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OIDTest.java b/core/src/test/java/org/bouncycastle/asn1/test/OIDTest.java
index b238fa5e..fa5aa61b 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OIDTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/OIDTest.java
@@ -7,7 +7,6 @@ import java.io.IOException;
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DEROutputStream;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.util.encoders.Hex;
@@ -36,8 +35,8 @@ public class OIDTest
         ByteArrayInputStream     bIn = new ByteArrayInputStream(enc);
         ASN1InputStream          aIn = new ASN1InputStream(bIn);
 
-        DERObjectIdentifier      o = new DERObjectIdentifier(oid);
-        DERObjectIdentifier      encO = (DERObjectIdentifier)aIn.readObject();
+        ASN1ObjectIdentifier      o = new ASN1ObjectIdentifier(oid);
+        ASN1ObjectIdentifier      encO = (ASN1ObjectIdentifier)aIn.readObject();
         
         if (!o.equals(encO))
         {
@@ -69,7 +68,7 @@ public class OIDTest
         String  oid)
         throws IOException
     {
-        DERObjectIdentifier     o = new DERObjectIdentifier(oid);
+        ASN1ObjectIdentifier     o = new ASN1ObjectIdentifier(oid);
         ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
         ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
         
@@ -78,7 +77,7 @@ public class OIDTest
         ByteArrayInputStream    bIn = new ByteArrayInputStream(bOut.toByteArray());
         ASN1InputStream         aIn = new ASN1InputStream(bIn);
         
-        o = (DERObjectIdentifier)aIn.readObject();
+        o = (ASN1ObjectIdentifier)aIn.readObject();
         
         if (!o.getId().equals(oid))
         {
@@ -91,7 +90,7 @@ public class OIDTest
     {
         try
         {
-            new DERObjectIdentifier(oid);
+            new ASN1ObjectIdentifier(oid);
             fail("failed to catch bad oid: " + oid);
         }
         catch (IllegalArgumentException e)
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OctetStringTest.java b/core/src/test/java/org/bouncycastle/asn1/test/OctetStringTest.java
index 88618b70..68ed5da5 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OctetStringTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/OctetStringTest.java
@@ -7,14 +7,14 @@ import java.io.OutputStream;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.bouncycastle.asn1.ASN1Integer;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetStringParser;
 import org.bouncycastle.asn1.ASN1SequenceParser;
 import org.bouncycastle.asn1.ASN1StreamParser;
 import org.bouncycastle.asn1.BEROctetStringGenerator;
 import org.bouncycastle.asn1.BERSequenceGenerator;
 import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERInteger;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequenceGenerator;
 import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
 import org.bouncycastle.asn1.cms.CompressedDataParser;
@@ -135,18 +135,18 @@ public class OctetStringTest
         
         BERSequenceGenerator sGen = new BERSequenceGenerator(bOut);
         
-        sGen.addObject(new DERObjectIdentifier(CMSObjectIdentifiers.compressedData.getId()));
+        sGen.addObject(new ASN1ObjectIdentifier(CMSObjectIdentifiers.compressedData.getId()));
         
         BERSequenceGenerator cGen = new BERSequenceGenerator(sGen.getRawOutputStream(), 0, true);
         
-        cGen.addObject(new DERInteger(0));
+        cGen.addObject(new ASN1Integer(0));
         
         //
         // AlgorithmIdentifier
         //
         DERSequenceGenerator algGen = new DERSequenceGenerator(cGen.getRawOutputStream());
         
-        algGen.addObject(new DERObjectIdentifier("1.2"));
+        algGen.addObject(new ASN1ObjectIdentifier("1.2"));
 
         algGen.close();
         
@@ -155,7 +155,7 @@ public class OctetStringTest
         //
         BERSequenceGenerator eiGen = new BERSequenceGenerator(cGen.getRawOutputStream());
         
-        eiGen.addObject(new DERObjectIdentifier("1.1"));
+        eiGen.addObject(new ASN1ObjectIdentifier("1.1"));
         
         BEROctetStringGenerator octGen = new BEROctetStringGenerator(eiGen.getRawOutputStream(), 0, true);
         
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java
index e133ebd0..9a85ceac 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1Integer;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.ess.OtherCertID;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.GeneralName;
@@ -24,7 +24,7 @@ public class OtherCertIDUnitTest
     public void performTest()
         throws Exception
     {
-        AlgorithmIdentifier algId = new AlgorithmIdentifier(new DERObjectIdentifier("1.2.2.3"));
+        AlgorithmIdentifier algId = new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.2.3"));
         byte[]              digest = new byte[20];
         IssuerSerial        issuerSerial = new IssuerSerial(new GeneralNames(new GeneralName(new X509Name("CN=test"))), new ASN1Integer(1));
 
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java
index dfb46be7..9de12ee8 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java
@@ -1,14 +1,14 @@
 package org.bouncycastle.asn1.test;
 
+import java.io.IOException;
+
 import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.ess.OtherCertID;
 import org.bouncycastle.asn1.ess.OtherSigningCertificate;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 
-import java.io.IOException;
-
 public class OtherSigningCertificateUnitTest
     extends ASN1UnitTest
 {
@@ -20,7 +20,7 @@ public class OtherSigningCertificateUnitTest
     public void performTest()
         throws Exception
     {
-        AlgorithmIdentifier algId = new AlgorithmIdentifier(new DERObjectIdentifier("1.2.2.3"));
+        AlgorithmIdentifier algId = new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.2.3"));
         byte[]              digest = new byte[20];
         OtherCertID         otherCertID = new OtherCertID(algId, digest);
 
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java
index bb9cf8ca..34b33070 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java
@@ -5,7 +5,6 @@ import java.io.IOException;
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
 import org.bouncycastle.asn1.isismtt.x509.ProcurationSyntax;
@@ -23,7 +22,7 @@ public class ProfessionInfoUnitTest
     public void performTest()
         throws Exception
     {
-        NamingAuthority auth =  new NamingAuthority(new DERObjectIdentifier("1.2.3"), "url", new DirectoryString("fred"));
+        NamingAuthority auth =  new NamingAuthority(new ASN1ObjectIdentifier("1.2.3"), "url", new DirectoryString("fred"));
         DirectoryString[] professionItems = { new DirectoryString("substitution") };
         ASN1ObjectIdentifier[] professionOids = { new ASN1ObjectIdentifier("1.2.3") };
         String registrationNumber = "12345";
@@ -72,7 +71,7 @@ public class ProfessionInfoUnitTest
         ProfessionInfo profInfo,
         NamingAuthority auth,
         DirectoryString[] professionItems,
-        DERObjectIdentifier[] professionOids,
+        ASN1ObjectIdentifier[] professionOids,
         String registrationNumber,
         DEROctetString addProfInfo)
         throws IOException
@@ -96,7 +95,7 @@ public class ProfessionInfoUnitTest
         ProfessionInfo profInfo,
         NamingAuthority auth,
         DirectoryString[] professionItems,
-        DERObjectIdentifier[] professionOids,
+        ASN1ObjectIdentifier[] professionOids,
         String registrationNumber,
         DEROctetString addProfInfo)
     {
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java
index e431dc9c..d7a84a5e 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java
@@ -6,7 +6,6 @@ import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.x509.qualified.QCStatement;
 import org.bouncycastle.asn1.x509.qualified.RFC3739QCObjectIdentifiers;
 import org.bouncycastle.asn1.x509.qualified.SemanticsInformation;
@@ -54,7 +53,7 @@ public class QCStatementUnitTest
 
     private void checkConstruction(
          QCStatement mv,
-         DERObjectIdentifier statementId,
+         ASN1ObjectIdentifier statementId,
          ASN1Encodable statementInfo) 
          throws IOException
     {
@@ -75,7 +74,7 @@ public class QCStatementUnitTest
 
     private void checkStatement(
         QCStatement         qcs,
-        DERObjectIdentifier statementId,
+        ASN1ObjectIdentifier statementId,
         ASN1Encodable       statementInfo)
         throws IOException
     {
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java
index de5f0cf2..3fd26db5 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java
@@ -4,7 +4,6 @@ import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.x509.GeneralName;
 import org.bouncycastle.asn1.x509.X509Name;
@@ -74,7 +73,7 @@ public class SemanticsInformationUnitTest
 
     private void checkConstruction(
         SemanticsInformation mv,
-        DERObjectIdentifier  semanticsIdentifier,
+        ASN1ObjectIdentifier  semanticsIdentifier,
         GeneralName[]        names)
         throws Exception
     {
@@ -95,7 +94,7 @@ public class SemanticsInformationUnitTest
 
     private void checkStatement(
         SemanticsInformation si,
-        DERObjectIdentifier  id,
+        ASN1ObjectIdentifier  id,
         GeneralName[]        names)
     {
         if (id != null)
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/SetTest.java b/core/src/test/java/org/bouncycastle/asn1/test/SetTest.java
index d6256516..2e4fb392 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/SetTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/SetTest.java
@@ -1,12 +1,12 @@
 package org.bouncycastle.asn1.test;
 
+import org.bouncycastle.asn1.ASN1Boolean;
 import org.bouncycastle.asn1.ASN1EncodableVector;
+import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.ASN1TaggedObject;
 import org.bouncycastle.asn1.BERSet;
 import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERBoolean;
-import org.bouncycastle.asn1.DERInteger;
 import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERSet;
@@ -27,8 +27,8 @@ public class SetTest
 
     private void checkedSortedSet(int attempt, ASN1Set s)
     {
-        if (s.getObjectAt(0) instanceof DERBoolean
-            && s.getObjectAt(1) instanceof DERInteger
+        if (s.getObjectAt(0) instanceof ASN1Boolean
+            && s.getObjectAt(1) instanceof ASN1Integer
             && s.getObjectAt(2) instanceof DERBitString
             && s.getObjectAt(3) instanceof DEROctetString)
         {
@@ -45,24 +45,24 @@ public class SetTest
 
         v.add(new DEROctetString(data));
         v.add(new DERBitString(data));
-        v.add(new DERInteger(100));
-        v.add(new DERBoolean(true));
+        v.add(new ASN1Integer(100));
+        v.add(new ASN1Boolean(true));
 
         checkedSortedSet(0, new DERSet(v));
 
         v = new ASN1EncodableVector();
-        v.add(new DERInteger(100));
-        v.add(new DERBoolean(true));
+        v.add(new ASN1Integer(100));
+        v.add(new ASN1Boolean(true));
         v.add(new DEROctetString(data));
         v.add(new DERBitString(data));
 
         checkedSortedSet(1, new DERSet(v));
 
         v = new ASN1EncodableVector();
-        v.add(new DERBoolean(true));
+        v.add(new ASN1Boolean(true));
         v.add(new DEROctetString(data));
         v.add(new DERBitString(data));
-        v.add(new DERInteger(100));
+        v.add(new ASN1Integer(100));
 
 
         checkedSortedSet(2, new DERSet(v));
@@ -70,16 +70,16 @@ public class SetTest
         v = new ASN1EncodableVector();
         v.add(new DERBitString(data));
         v.add(new DEROctetString(data));
-        v.add(new DERInteger(100));
-        v.add(new DERBoolean(true));
+        v.add(new ASN1Integer(100));
+        v.add(new ASN1Boolean(true));
 
         checkedSortedSet(3, new DERSet(v));
 
         v = new ASN1EncodableVector();
         v.add(new DEROctetString(data));
         v.add(new DERBitString(data));
-        v.add(new DERInteger(100));
-        v.add(new DERBoolean(true));
+        v.add(new ASN1Integer(100));
+        v.add(new ASN1Boolean(true));
 
         ASN1Set s = new BERSet(v);
 
@@ -92,7 +92,7 @@ public class SetTest
         ASN1TaggedObject tag = new DERTaggedObject(false, 1, new DERSequence(v));
         s = ASN1Set.getInstance(tag, false);
 
-        if (s.getObjectAt(0) instanceof DERBoolean)
+        if (s.getObjectAt(0) instanceof ASN1Boolean)
         {
             fail("sorted when shouldn't be.");
         }
@@ -100,9 +100,9 @@ public class SetTest
         // equality test
         v = new ASN1EncodableVector();
 
-        v.add(new DERBoolean(true));
-        v.add(new DERBoolean(true));
-        v.add(new DERBoolean(true));
+        v.add(new ASN1Boolean(true));
+        v.add(new ASN1Boolean(true));
+        v.add(new ASN1Boolean(true));
 
         s = new DERSet(v);
     }
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java b/core/src/test/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java
index 52dfd56f..add21ce3 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java
@@ -5,7 +5,6 @@ import java.io.IOException;
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.x509.qualified.TypeOfBiometricData;
 import org.bouncycastle.util.test.SimpleTest;
 
@@ -124,7 +123,7 @@ public class TypeOfBiometricDataUnitTest
     
     private void checkNonPredefined(
         TypeOfBiometricData type,
-        DERObjectIdentifier value)
+        ASN1ObjectIdentifier value)
     {
         if (type.isPredefined())
         {
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/X509NameTest.java b/core/src/test/java/org/bouncycastle/asn1/test/X509NameTest.java
index 88c95818..a53a5f56 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/X509NameTest.java
+++ b/core/src/test/java/org/bouncycastle/asn1/test/X509NameTest.java
@@ -16,7 +16,6 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.DERGeneralizedTime;
 import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERPrintableString;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERSet;
@@ -59,7 +58,7 @@ public class X509NameTest
         return X509Name.getInstance(new ASN1InputStream(new ByteArrayInputStream(bytes)).readObject());
     }
 
-    private ASN1Encodable createEntryValue(DERObjectIdentifier oid, String value)
+    private ASN1Encodable createEntryValue(ASN1ObjectIdentifier oid, String value)
     {
         Hashtable attrs = new Hashtable();
 
@@ -78,7 +77,7 @@ public class X509NameTest
         return seq.getObjectAt(1);
     }
 
-    private ASN1Encodable createEntryValueFromString(DERObjectIdentifier oid, String value)
+    private ASN1Encodable createEntryValueFromString(ASN1ObjectIdentifier oid, String value)
     {
         Hashtable attrs = new Hashtable();
 
@@ -97,7 +96,7 @@ public class X509NameTest
         return seq.getObjectAt(1);
     }
 
-    private void testEncodingPrintableString(DERObjectIdentifier oid, String value)
+    private void testEncodingPrintableString(ASN1ObjectIdentifier oid, String value)
     {
         ASN1Encodable converted = createEntryValue(oid, value);
         if (!(converted instanceof DERPrintableString))
@@ -106,7 +105,7 @@ public class X509NameTest
         }
     }
 
-    private void testEncodingIA5String(DERObjectIdentifier oid, String value)
+    private void testEncodingIA5String(ASN1ObjectIdentifier oid, String value)
     {
         ASN1Encodable converted = createEntryValue(oid, value);
         if (!(converted instanceof DERIA5String))
@@ -116,7 +115,7 @@ public class X509NameTest
     }
 
 
-    private void testEncodingUTF8String(DERObjectIdentifier oid, String value)
+    private void testEncodingUTF8String(ASN1ObjectIdentifier oid, String value)
         throws IOException
     {
         ASN1Encodable converted = createEntryValue(oid, value);
@@ -130,7 +129,7 @@ public class X509NameTest
         }
     }
 
-    private void testEncodingGeneralizedTime(DERObjectIdentifier oid, String value)
+    private void testEncodingGeneralizedTime(ASN1ObjectIdentifier oid, String value)
     {
         ASN1Encodable converted = createEntryValue(oid, value);
         if (!(converted instanceof DERGeneralizedTime))
@@ -431,8 +430,8 @@ public class X509NameTest
 
         ASN1EncodableVector v = new ASN1EncodableVector();
 
-        v.add(new DERObjectIdentifier("1.1"));
-        v.add(new DERObjectIdentifier("1.1"));
+        v.add(new ASN1ObjectIdentifier("1.1"));
+        v.add(new ASN1ObjectIdentifier("1.1"));
         if (name1.equals(new DERSequence(new DERSet(new DERSet(v)))))
         {
             fail("inequality test with sequence and bad set");
@@ -455,7 +454,7 @@ public class X509NameTest
 
         v = new ASN1EncodableVector();
 
-        v.add(new DERObjectIdentifier("1.1"));
+        v.add(new ASN1ObjectIdentifier("1.1"));
         v.add(new DERSequence());
 
         if (name1.equals(new DERSequence(new DERSet(new DERSequence(v)))))