refactoring UTCTime, GeneralizedTime

3 files changed, 3 insertions, 6 deletions

diff --git a/pkix/src/main/j2me/org/bouncycastle/cert/CertUtils.java b/pkix/src/main/j2me/org/bouncycastle/cert/CertUtils.java
index 0ba7bcd6..b263f237 100644
--- a/pkix/src/main/j2me/org/bouncycastle/cert/CertUtils.java
+++ b/pkix/src/main/j2me/org/bouncycastle/cert/CertUtils.java
@@ -199,7 +199,7 @@ class CertUtils
         return null;
     }
 
-    static Date recoverDate(DERGeneralizedTime time)
+    static Date recoverDate(ASN1GeneralizedTime time)
     {
         return time.getDate();
     }
diff --git a/pkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPRespBuilder.java b/pkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPRespBuilder.java
index a57e7d8f..d06dcfca 100644
--- a/pkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPRespBuilder.java
+++ b/pkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPRespBuilder.java
@@ -39,8 +39,8 @@ public class BasicOCSPRespBuilder
     {
         CertificateID         certId;
         CertStatus            certStatus;
-        DERGeneralizedTime    thisUpdate;
-        DERGeneralizedTime    nextUpdate;
+        ASN1GeneralizedTime   thisUpdate;
+        ASN1GeneralizedTime   nextUpdate;
         Extensions        extensions;
 
         public ResponseObject(
diff --git a/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSParseTest.java b/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSParseTest.java
index cb66fec6..90a46b4e 100644
--- a/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSParseTest.java
+++ b/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSParseTest.java
@@ -14,8 +14,6 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.cmp.PKIStatus;
 import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.SignedData;
 import org.bouncycastle.asn1.dvcs.CertEtcToken;
 import org.bouncycastle.asn1.dvcs.DVCSCertInfo;
 import org.bouncycastle.asn1.dvcs.DVCSCertInfoBuilder;
@@ -28,7 +26,6 @@ import org.bouncycastle.asn1.dvcs.DVCSTime;
 import org.bouncycastle.asn1.dvcs.Data;
 import org.bouncycastle.asn1.dvcs.ServiceType;
 import org.bouncycastle.asn1.dvcs.TargetEtcChain;
-import org.bouncycastle.asn1.util.ASN1Dump;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.Certificate;
 import org.bouncycastle.asn1.x509.DigestInfo;