refactoring of ASN1 primitive classes.

3 files changed, 12 insertions, 12 deletions

diff --git a/prov/src/main/jdk1.3/org/bouncycastle/ocsp/BasicOCSPResp.java b/prov/src/main/jdk1.3/org/bouncycastle/ocsp/BasicOCSPResp.java
index a968282d..ebccccba 100644
--- a/prov/src/main/jdk1.3/org/bouncycastle/ocsp/BasicOCSPResp.java
+++ b/prov/src/main/jdk1.3/org/bouncycastle/ocsp/BasicOCSPResp.java
@@ -26,7 +26,7 @@ import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1Encoding;
 import org.bouncycastle.asn1.ASN1OutputStream;
 import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
 import org.bouncycastle.asn1.ocsp.ResponseData;
 import org.bouncycastle.asn1.ocsp.SingleResponse;
@@ -144,7 +144,7 @@ public class BasicOCSPResp
     
             while (e.hasMoreElements())
             {
-                DERObjectIdentifier oid = (DERObjectIdentifier)e.nextElement();
+                ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)e.nextElement();
                 X509Extension       ext = extensions.getExtension(oid);
     
                 if (critical == ext.isCritical())
@@ -173,7 +173,7 @@ public class BasicOCSPResp
 
         if (exts != null)
         {
-            X509Extension   ext = exts.getExtension(new DERObjectIdentifier(oid));
+            X509Extension   ext = exts.getExtension(new ASN1ObjectIdentifier(oid));
 
             if (ext != null)
             {
diff --git a/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPReqGenerator.java b/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPReqGenerator.java
index 7288fd7d..f4d01dc9 100644
--- a/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPReqGenerator.java
+++ b/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPReqGenerator.java
@@ -18,7 +18,7 @@ import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.DERBitString;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.ocsp.OCSPRequest;
 import org.bouncycastle.asn1.ocsp.Request;
@@ -115,7 +115,7 @@ public class OCSPReqGenerator
     }
 
     private OCSPReq generateRequest(
-        DERObjectIdentifier signingAlgorithm,
+        ASN1ObjectIdentifier signingAlgorithm,
         PrivateKey          key,
         X509Certificate[]   chain,
         String              provider,
@@ -270,7 +270,7 @@ public class OCSPReqGenerator
 
         try
         {
-            DERObjectIdentifier oid = OCSPUtil.getAlgorithmOID(signingAlgorithm);
+            ASN1ObjectIdentifier oid = OCSPUtil.getAlgorithmOID(signingAlgorithm);
             
             return generateRequest(oid, key, chain, provider, random);
         }
diff --git a/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPUtil.java b/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPUtil.java
index 8cbd4bac..69e86437 100644
--- a/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPUtil.java
+++ b/prov/src/main/jdk1.3/org/bouncycastle/ocsp/OCSPUtil.java
@@ -1,7 +1,7 @@
 package org.bouncycastle.ocsp;
 
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -102,21 +102,21 @@ class OCSPUtil
         noParams.add(NISTObjectIdentifiers.dsa_with_sha256);
     }
      
-    static DERObjectIdentifier getAlgorithmOID(
+    static ASN1ObjectIdentifier getAlgorithmOID(
         String algorithmName)
     {
         algorithmName = Strings.toUpperCase(algorithmName);
         
         if (algorithms.containsKey(algorithmName))
         {
-            return (DERObjectIdentifier)algorithms.get(algorithmName);
+            return (ASN1ObjectIdentifier)algorithms.get(algorithmName);
         }
         
-        return new DERObjectIdentifier(algorithmName);
+        return new ASN1ObjectIdentifier(algorithmName);
     }
 
     static String getAlgorithmName(
-        DERObjectIdentifier oid)
+        ASN1ObjectIdentifier oid)
     {
         if (oids.containsKey(oid))
         {
@@ -127,7 +127,7 @@ class OCSPUtil
     }
     
     static AlgorithmIdentifier getSigAlgID(
-        DERObjectIdentifier sigOid)
+        ASN1ObjectIdentifier sigOid)
     {
         if (noParams.contains(sigOid))
         {