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/java/org/bouncycastle/ocsp/OCSPUtil.java | |
parent | 9407ff16b8cf860d59e4493af60b43996d13703c (diff) |
refactoring of ASN1 primitive classes.
Diffstat (limited to 'prov/src/main/java/org/bouncycastle/ocsp/OCSPUtil.java')
-rw-r--r-- | prov/src/main/java/org/bouncycastle/ocsp/OCSPUtil.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/prov/src/main/java/org/bouncycastle/ocsp/OCSPUtil.java b/prov/src/main/java/org/bouncycastle/ocsp/OCSPUtil.java index ffb9245c..4f0c5efc 100644 --- a/prov/src/main/java/org/bouncycastle/ocsp/OCSPUtil.java +++ b/prov/src/main/java/org/bouncycastle/ocsp/OCSPUtil.java @@ -1,15 +1,5 @@ package org.bouncycastle.ocsp; -import org.bouncycastle.asn1.DERNull; -import org.bouncycastle.asn1.DERObjectIdentifier; -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; -import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; -import org.bouncycastle.util.Strings; - import java.security.InvalidAlgorithmParameterException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -27,6 +17,16 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.bouncycastle.asn1.ASN1ObjectIdentifier; +import org.bouncycastle.asn1.DERNull; +import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; +import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; +import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers; +import org.bouncycastle.asn1.x509.AlgorithmIdentifier; +import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; +import org.bouncycastle.util.Strings; + class OCSPUtil { private static Hashtable algorithms = new Hashtable(); @@ -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)) { |