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 /prov/src/main/jdk1.4/org/bouncycastle/jce/provider | |
parent | 9407ff16b8cf860d59e4493af60b43996d13703c (diff) |
refactoring of ASN1 primitive classes.
Diffstat (limited to 'prov/src/main/jdk1.4/org/bouncycastle/jce/provider')
-rw-r--r-- | prov/src/main/jdk1.4/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java | 12 | ||||
-rw-r--r-- | prov/src/main/jdk1.4/org/bouncycastle/jce/provider/X509SignatureUtil.java | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java b/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java index c4a0f139..4e15de41 100644 --- a/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java +++ b/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java @@ -44,10 +44,10 @@ import org.bouncycastle.asn1.ASN1OctetString; import org.bouncycastle.asn1.ASN1OutputStream; import org.bouncycastle.asn1.ASN1Primitive; import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DEREnumerated; +import org.bouncycastle.asn1.ASN1Enumerated; import org.bouncycastle.asn1.DERGeneralizedTime; import org.bouncycastle.asn1.DERIA5String; -import org.bouncycastle.asn1.DERObjectIdentifier; +import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.isismtt.ISISMTTObjectIdentifiers; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; @@ -456,7 +456,7 @@ public class CertPathValidatorUtilities protected static boolean processCertD1i( int index, List[] policyNodes, - DERObjectIdentifier pOid, + ASN1ObjectIdentifier pOid, Set pq) { List policyNodeVec = policyNodes[index - 1]; @@ -491,7 +491,7 @@ public class CertPathValidatorUtilities protected static void processCertD1ii( int index, List[] policyNodes, - DERObjectIdentifier _poid, + ASN1ObjectIdentifier _poid, Set _pq) { List policyNodeVec = policyNodes[index - 1]; @@ -1030,12 +1030,12 @@ public class CertPathValidatorUtilities } } - DEREnumerated reasonCode = null; + ASN1Enumerated reasonCode = null; if (crl_entry.hasExtensions()) { try { - reasonCode = DEREnumerated + reasonCode = ASN1Enumerated .getInstance(CertPathValidatorUtilities .getExtensionValue(crl_entry, X509Extension.reasonCode.getId())); diff --git a/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/X509SignatureUtil.java b/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/X509SignatureUtil.java index a640cb5c..9aca7ede 100644 --- a/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/X509SignatureUtil.java +++ b/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/X509SignatureUtil.java @@ -8,7 +8,7 @@ import java.security.SignatureException; import org.bouncycastle.asn1.ASN1Encodable; import org.bouncycastle.asn1.ASN1Null; 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.oiw.OIWObjectIdentifiers; @@ -75,7 +75,7 @@ class X509SignatureUtil * representations rather the the algorithm identifier (if possible). */ private static String getDigestAlgName( - DERObjectIdentifier digestAlgOID) + ASN1ObjectIdentifier digestAlgOID) { if (PKCSObjectIdentifiers.md5.equals(digestAlgOID)) { |