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/test/jdk1.1/org/bouncycastle | |
parent | 9407ff16b8cf860d59e4493af60b43996d13703c (diff) |
refactoring of ASN1 primitive classes.
Diffstat (limited to 'pkix/src/test/jdk1.1/org/bouncycastle')
-rw-r--r-- | pkix/src/test/jdk1.1/org/bouncycastle/cert/test/CertTest.java | 10 | ||||
-rw-r--r-- | pkix/src/test/jdk1.1/org/bouncycastle/cert/test/PKCS10Test.java | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/CertTest.java b/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/CertTest.java index 1025a4bb..86ed344b 100644 --- a/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/CertTest.java +++ b/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/CertTest.java @@ -36,9 +36,9 @@ import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1Enumerated; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1Primitive; -import org.bouncycastle.asn1.DEREnumerated; +import org.bouncycastle.asn1.ASN1Enumerated; import org.bouncycastle.asn1.DERNull; -import org.bouncycastle.asn1.DERObjectIdentifier; +import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; @@ -1775,7 +1775,7 @@ public class CertTest /** * we generate a self signed certificate for the sake of testing - SHA224withECDSA */ - private void createECCert(String algorithm, DERObjectIdentifier algOid) + private void createECCert(String algorithm, ASN1ObjectIdentifier algOid) throws Exception { ECCurve.Fp curve = new ECCurve.Fp( @@ -2030,7 +2030,7 @@ public class CertTest if (ext != null) { - DEREnumerated reasonCode = (DEREnumerated)X509ExtensionUtil.fromExtensionValue(ext); + ASN1Enumerated reasonCode = (ASN1Enumerated)X509ExtensionUtil.fromExtensionValue(ext); if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn) { @@ -2113,7 +2113,7 @@ public class CertTest if (ext != null) { - DEREnumerated reasonCode = (DEREnumerated)X509ExtensionUtil.fromExtensionValue(ext); + ASN1Enumerated reasonCode = (ASN1Enumerated)X509ExtensionUtil.fromExtensionValue(ext); if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn) { diff --git a/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/PKCS10Test.java b/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/PKCS10Test.java index e64c2d1b..48787e0d 100644 --- a/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/PKCS10Test.java +++ b/pkix/src/test/jdk1.1/org/bouncycastle/cert/test/PKCS10Test.java @@ -13,7 +13,7 @@ import java.security.spec.RSAPrivateCrtKeySpec; import java.security.spec.RSAPublicKeySpec; import java.util.Vector; -import org.bouncycastle.asn1.DERObjectIdentifier; +import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; import org.bouncycastle.asn1.pkcs.Attribute; @@ -139,7 +139,7 @@ public class PKCS10Test } } - private void createECRequest(String algorithm, DERObjectIdentifier algOid) + private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid) throws Exception { ECCurve.Fp curve = new ECCurve.Fp( |