diff options
Diffstat (limited to 'pkix/src/main')
11 files changed, 29 insertions, 34 deletions
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataParser.java b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataParser.java index 57ea3059..11c90c67 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataParser.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataParser.java @@ -109,7 +109,7 @@ public class CMSAuthenticatedDataParser this.authData = new AuthenticatedDataParser((ASN1SequenceParser)_contentInfo.getContent(BERTags.SEQUENCE)); // TODO Validate version? - //DERInteger version = this.authData.getVersion(); + //ASN1Integer version = this.authData.getVersion(); OriginatorInfo info = authData.getOriginatorInfo(); diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java index 87afd701..f32666d1 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java @@ -9,11 +9,11 @@ import java.util.Map; import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1Encoding; +import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1Set; import org.bouncycastle.asn1.BERSequenceGenerator; import org.bouncycastle.asn1.BERSet; -import org.bouncycastle.asn1.DERInteger; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DERSet; import org.bouncycastle.asn1.DERTaggedObject; @@ -161,7 +161,7 @@ public class CMSAuthenticatedDataStreamGenerator // BERSequenceGenerator authGen = new BERSequenceGenerator(cGen.getRawOutputStream(), 0, true); - authGen.addObject(new DERInteger(AuthenticatedData.calculateVersion(originatorInfo))); + authGen.addObject(new ASN1Integer(AuthenticatedData.calculateVersion(originatorInfo))); if (originatorInfo != null) { diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataParser.java b/pkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataParser.java index defd2f70..67c9d913 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataParser.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataParser.java @@ -78,7 +78,7 @@ public class CMSEnvelopedDataParser this.envelopedData = new EnvelopedDataParser((ASN1SequenceParser)_contentInfo.getContent(BERTags.SEQUENCE)); // TODO Validate version? - //DERInteger version = this._envelopedData.getVersion(); + //ASN1Integer version = this._envelopedData.getVersion(); OriginatorInfo info = this.envelopedData.getOriginatorInfo(); diff --git a/pkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignatureVerifierBuilder.java b/pkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignatureVerifierBuilder.java index c353d1ee..51156423 100644 --- a/pkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignatureVerifierBuilder.java +++ b/pkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignatureVerifierBuilder.java @@ -12,8 +12,8 @@ import java.security.Signature; import java.security.SignatureException; import org.bouncycastle.asn1.ASN1EncodableVector; +import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERInteger; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.eac.EACObjectIdentifiers; import org.bouncycastle.eac.operator.EACSignatureVerifier; @@ -116,8 +116,8 @@ public class JcaEACSignatureVerifierBuilder System.arraycopy(rawSign, len, s, 0, len); ASN1EncodableVector v = new ASN1EncodableVector(); - v.add(new DERInteger(new BigInteger(1, r))); - v.add(new DERInteger(new BigInteger(1, s))); + v.add(new ASN1Integer(new BigInteger(1, r))); + v.add(new ASN1Integer(new BigInteger(1, s))); DERSequence seq = new DERSequence(v); return seq.getEncoded(); diff --git a/pkix/src/main/java/org/bouncycastle/openssl/MiscPEMGenerator.java b/pkix/src/main/java/org/bouncycastle/openssl/MiscPEMGenerator.java index 488b9282..02866883 100644 --- a/pkix/src/main/java/org/bouncycastle/openssl/MiscPEMGenerator.java +++ b/pkix/src/main/java/org/bouncycastle/openssl/MiscPEMGenerator.java @@ -8,7 +8,6 @@ import java.util.List; import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERInteger; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.cms.ContentInfo; import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; @@ -21,7 +20,6 @@ import org.bouncycastle.cert.X509AttributeCertificateHolder; import org.bouncycastle.cert.X509CRLHolder; import org.bouncycastle.cert.X509CertificateHolder; import org.bouncycastle.pkcs.PKCS10CertificationRequest; -import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; import org.bouncycastle.util.Strings; import org.bouncycastle.util.io.pem.PemGenerationException; import org.bouncycastle.util.io.pem.PemHeader; @@ -105,16 +103,16 @@ public class MiscPEMGenerator DSAParameter p = DSAParameter.getInstance(info.getPrivateKeyAlgorithm().getParameters()); ASN1EncodableVector v = new ASN1EncodableVector(); - v.add(new DERInteger(0)); - v.add(new DERInteger(p.getP())); - v.add(new DERInteger(p.getQ())); - v.add(new DERInteger(p.getG())); + v.add(new ASN1Integer(0)); + v.add(new ASN1Integer(p.getP())); + v.add(new ASN1Integer(p.getQ())); + v.add(new ASN1Integer(p.getG())); BigInteger x = ASN1Integer.getInstance(info.parsePrivateKey()).getValue(); BigInteger y = p.getG().modPow(x, p.getP()); - v.add(new DERInteger(y)); - v.add(new DERInteger(x)); + v.add(new ASN1Integer(y)); + v.add(new ASN1Integer(x)); encoding = new DERSequence(v).getEncoded(); } diff --git a/pkix/src/main/java/org/bouncycastle/openssl/PEMUtilities.java b/pkix/src/main/java/org/bouncycastle/openssl/PEMUtilities.java index e6bd989d..71b365a9 100644 --- a/pkix/src/main/java/org/bouncycastle/openssl/PEMUtilities.java +++ b/pkix/src/main/java/org/bouncycastle/openssl/PEMUtilities.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.Set; import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERObjectIdentifier; import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.bouncycastle.util.Integers; @@ -48,7 +47,7 @@ public final class PEMUtilities return ((Integer)KEYSIZES.get(algorithm)).intValue(); } - static boolean isPKCS5Scheme1(DERObjectIdentifier algOid) + static boolean isPKCS5Scheme1(ASN1ObjectIdentifier algOid) { return PKCS5_SCHEME_1.contains(algOid); } @@ -58,7 +57,7 @@ public final class PEMUtilities return PKCS5_SCHEME_2.contains(algOid); } - public static boolean isPKCS12(DERObjectIdentifier algOid) + public static boolean isPKCS12(ASN1ObjectIdentifier algOid) { return algOid.getId().startsWith(PKCSObjectIdentifiers.pkcs_12PbeIds.getId()); } diff --git a/pkix/src/main/java/org/bouncycastle/openssl/jcajce/PEMUtilities.java b/pkix/src/main/java/org/bouncycastle/openssl/jcajce/PEMUtilities.java index 49aaa2fe..bf713771 100644 --- a/pkix/src/main/java/org/bouncycastle/openssl/jcajce/PEMUtilities.java +++ b/pkix/src/main/java/org/bouncycastle/openssl/jcajce/PEMUtilities.java @@ -14,7 +14,6 @@ import javax.crypto.spec.RC2ParameterSpec; import javax.crypto.spec.SecretKeySpec; import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERObjectIdentifier; import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.bouncycastle.crypto.PBEParametersGenerator; @@ -63,7 +62,7 @@ class PEMUtilities return ((Integer)KEYSIZES.get(algorithm)).intValue(); } - static boolean isPKCS5Scheme1(DERObjectIdentifier algOid) + static boolean isPKCS5Scheme1(ASN1ObjectIdentifier algOid) { return PKCS5_SCHEME_1.contains(algOid); } @@ -73,7 +72,7 @@ class PEMUtilities return PKCS5_SCHEME_2.contains(algOid); } - public static boolean isPKCS12(DERObjectIdentifier algOid) + public static boolean isPKCS12(ASN1ObjectIdentifier algOid) { return algOid.getId().startsWith(PKCSObjectIdentifiers.pkcs_12PbeIds.getId()); } 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) { diff --git a/pkix/src/main/jdk1.1/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java b/pkix/src/main/jdk1.1/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java index 16c85dca..9e14ad92 100644 --- a/pkix/src/main/jdk1.1/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java +++ b/pkix/src/main/jdk1.1/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java @@ -9,9 +9,9 @@ import java.security.InvalidKeyException; import javax.crypto.Cipher; import javax.crypto.SecretKey; -import org.bouncycastle.asn1.DERInteger; +import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.DERNull; -import org.bouncycastle.asn1.DERObjectIdentifier; +import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers; import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers; @@ -87,18 +87,18 @@ public class JceSymmetricKeyWrapper if (algorithm.startsWith("DES")) { - return new AlgorithmIdentifier(new DERObjectIdentifier( + return new AlgorithmIdentifier(new ASN1ObjectIdentifier( "1.2.840.113549.1.9.16.3.6"), new DERNull()); } else if (algorithm.startsWith("RC2")) { - return new AlgorithmIdentifier(new DERObjectIdentifier( - "1.2.840.113549.1.9.16.3.7"), new DERInteger(58)); + return new AlgorithmIdentifier(new ASN1ObjectIdentifier( + "1.2.840.113549.1.9.16.3.7"), new ASN1Integer(58)); } else if (algorithm.startsWith("AES")) { int length = key.getEncoded().length * 8; - DERObjectIdentifier wrapOid; + ASN1ObjectIdentifier wrapOid; if (length == 128) { @@ -128,7 +128,7 @@ public class JceSymmetricKeyWrapper else if (algorithm.startsWith("Camellia")) { int length = key.getEncoded().length * 8; - DERObjectIdentifier wrapOid; + ASN1ObjectIdentifier wrapOid; if (length == 128) { |