diff options
author | David Hook <dgh@cryptoworkshop.com> | 2014-03-21 06:25:24 +0400 |
---|---|---|
committer | David Hook <dgh@cryptoworkshop.com> | 2014-03-21 06:25:24 +0400 |
commit | c36089c37a0656df8b63ceebf5d52161238694d7 (patch) | |
tree | 36151679085d4108697a357b2d9838cd7a58e6f8 /pkix/src/main/java/org/bouncycastle/tsp | |
parent | 9407ff16b8cf860d59e4493af60b43996d13703c (diff) |
refactoring of ASN1 primitive classes.
Diffstat (limited to 'pkix/src/main/java/org/bouncycastle/tsp')
3 files changed, 5 insertions, 6 deletions
diff --git a/pkix/src/main/java/org/bouncycastle/tsp/GenTimeAccuracy.java b/pkix/src/main/java/org/bouncycastle/tsp/GenTimeAccuracy.java index b48976d2..3cabb86b 100644 --- a/pkix/src/main/java/org/bouncycastle/tsp/GenTimeAccuracy.java +++ b/pkix/src/main/java/org/bouncycastle/tsp/GenTimeAccuracy.java @@ -1,6 +1,6 @@ package org.bouncycastle.tsp; -import org.bouncycastle.asn1.DERInteger; +import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.tsp.Accuracy; public class GenTimeAccuracy @@ -28,7 +28,7 @@ public class GenTimeAccuracy } private int getTimeComponent( - DERInteger time) + ASN1Integer time) { if (time != null) { diff --git a/pkix/src/main/java/org/bouncycastle/tsp/TimeStampRequest.java b/pkix/src/main/java/org/bouncycastle/tsp/TimeStampRequest.java index 696c2d8c..fa7c9f78 100644 --- a/pkix/src/main/java/org/bouncycastle/tsp/TimeStampRequest.java +++ b/pkix/src/main/java/org/bouncycastle/tsp/TimeStampRequest.java @@ -14,7 +14,6 @@ import java.util.Set; import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERObjectIdentifier; import org.bouncycastle.asn1.cmp.PKIFailureInfo; import org.bouncycastle.asn1.tsp.TimeStampReq; import org.bouncycastle.asn1.x509.Extension; @@ -162,7 +161,7 @@ public class TimeStampRequest Enumeration en = this.getExtensions().oids(); while(en.hasMoreElements()) { - String oid = ((DERObjectIdentifier)en.nextElement()).getId(); + String oid = ((ASN1ObjectIdentifier)en.nextElement()).getId(); if (!extensions.contains(oid)) { throw new TSPValidationException("request contains unknown extension.", PKIFailureInfo.unacceptedExtension); diff --git a/pkix/src/main/java/org/bouncycastle/tsp/TimeStampResponseGenerator.java b/pkix/src/main/java/org/bouncycastle/tsp/TimeStampResponseGenerator.java index 7b7c7574..8ab68aa4 100644 --- a/pkix/src/main/java/org/bouncycastle/tsp/TimeStampResponseGenerator.java +++ b/pkix/src/main/java/org/bouncycastle/tsp/TimeStampResponseGenerator.java @@ -8,9 +8,9 @@ import java.util.Iterator; import java.util.Set; import org.bouncycastle.asn1.ASN1EncodableVector; +import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.DERBitString; -import org.bouncycastle.asn1.DERInteger; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.DERUTF8String; import org.bouncycastle.asn1.cmp.PKIFailureInfo; @@ -119,7 +119,7 @@ public class TimeStampResponseGenerator { ASN1EncodableVector v = new ASN1EncodableVector(); - v.add(new DERInteger(status)); + v.add(new ASN1Integer(status)); if (statusStrings.size() > 0) { |