Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/quite/humla-spongycastle.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/pkix/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'pkix/src/test')
-rw-r--r--pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java8
-rw-r--r--pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java8
-rw-r--r--pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java9
-rw-r--r--pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java4
-rw-r--r--pkix/src/test/jdk1.1/org/bouncycastle/cert/test/CertTest.java10
-rw-r--r--pkix/src/test/jdk1.1/org/bouncycastle/cert/test/PKCS10Test.java4
-rw-r--r--pkix/src/test/jdk1.3/org/bouncycastle/cert/test/CertTest.java10
-rw-r--r--pkix/src/test/jdk1.3/org/bouncycastle/cert/test/PKCS10Test.java8
-rw-r--r--pkix/src/test/jdk1.4/org/bouncycastle/cert/test/CertTest.java10
9 files changed, 34 insertions, 37 deletions
diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java b/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java
index a11e76e4..30dec302 100644
--- a/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java
+++ b/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java
@@ -39,9 +39,7 @@ 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.DERNull;
-import org.bouncycastle.asn1.DERObjectIdentifier;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DERSequence;
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -1775,7 +1773,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 +2028,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 +2111,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/java/org/bouncycastle/cert/test/PKCS10Test.java b/pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java
index c3ca8690..cd3e8af5 100644
--- a/pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java
+++ b/pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java
@@ -14,7 +14,7 @@ import java.security.spec.RSAPublicKeySpec;
import javax.security.auth.x500.X500Principal;
-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;
@@ -184,7 +184,7 @@ public class PKCS10Test
/*
* we generate a self signed certificate for the sake of testing - SHA224withECDSA
*/
- private void createECRequest(String algorithm, DERObjectIdentifier algOid, DERObjectIdentifier curveOid)
+ private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid, ASN1ObjectIdentifier curveOid)
throws Exception
{
ECNamedCurveParameterSpec spec = ECNamedCurveTable.getParameterSpec(curveOid.getId());
@@ -262,7 +262,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(
@@ -594,7 +594,7 @@ public class PKCS10Test
createECRequest("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
createECRequest("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
- createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1, new DERObjectIdentifier("1.3.132.0.34"));
+ createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1, new ASN1ObjectIdentifier("1.3.132.0.34"));
createECGOSTRequest();
diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java
index 1c0a80cf..8d788b58 100644
--- a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java
+++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java
@@ -15,7 +15,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERObjectIdentifier;
import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
@@ -141,13 +140,13 @@ public class NewAuthenticatedDataTest
public void testKEKDESede()
throws Exception
{
- tryKekAlgorithm(CMSTestUtil.makeDesede192Key(), new DERObjectIdentifier("1.2.840.113549.1.9.16.3.6"));
+ tryKekAlgorithm(CMSTestUtil.makeDesede192Key(), new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.3.6"));
}
public void testKEKDESedeWithDigest()
throws Exception
{
- tryKekAlgorithmWithDigest(CMSTestUtil.makeDesede192Key(), new DERObjectIdentifier("1.2.840.113549.1.9.16.3.6"));
+ tryKekAlgorithmWithDigest(CMSTestUtil.makeDesede192Key(), new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.3.6"));
}
public void testPasswordAES256()
@@ -351,7 +350,7 @@ public class NewAuthenticatedDataTest
}
}
- private void tryKekAlgorithm(SecretKey kek, DERObjectIdentifier algOid)
+ private void tryKekAlgorithm(SecretKey kek, ASN1ObjectIdentifier algOid)
throws NoSuchAlgorithmException, NoSuchProviderException, CMSException, OperatorCreationException
{
byte[] data = "Eric H. Echidna".getBytes();
@@ -390,7 +389,7 @@ public class NewAuthenticatedDataTest
}
}
- private void tryKekAlgorithmWithDigest(SecretKey kek, DERObjectIdentifier algOid)
+ private void tryKekAlgorithmWithDigest(SecretKey kek, ASN1ObjectIdentifier algOid)
throws NoSuchAlgorithmException, NoSuchProviderException, CMSException, OperatorCreationException
{
byte[] data = "Eric H. Echidna".getBytes();
diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java b/pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java
index 1c3a4418..e9d94262 100644
--- a/pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java
+++ b/pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java
@@ -14,7 +14,7 @@ import java.util.Date;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
import org.bouncycastle.asn1.x509.BasicConstraints;
import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
@@ -47,7 +47,7 @@ public class TSPTestUtil
public static final boolean DEBUG = true;
- public static DERObjectIdentifier EuroPKI_TSA_Test_Policy = new DERObjectIdentifier(
+ public static ASN1ObjectIdentifier EuroPKI_TSA_Test_Policy = new ASN1ObjectIdentifier(
"1.3.6.1.4.1.5255.5.1");
public static JcaX509ExtensionUtils extUtils;
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(
diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/CertTest.java b/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/CertTest.java
index 4a1f4b2f..2c5a8594 100644
--- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/CertTest.java
+++ b/pkix/src/test/jdk1.3/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.3/org/bouncycastle/cert/test/PKCS10Test.java b/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/PKCS10Test.java
index 2cde520d..58838811 100644
--- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/PKCS10Test.java
+++ b/pkix/src/test/jdk1.3/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;
@@ -142,7 +142,7 @@ public class PKCS10Test
/*
* we generate a self signed certificate for the sake of testing - SHA224withECDSA
*/
- private void createECRequest(String algorithm, DERObjectIdentifier algOid, DERObjectIdentifier curveOid)
+ private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid, ASN1ObjectIdentifier curveOid)
throws Exception
{
ECNamedCurveParameterSpec spec = ECNamedCurveTable.getParameterSpec(curveOid.getId());
@@ -220,7 +220,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(
@@ -556,7 +556,7 @@ public class PKCS10Test
createECRequest("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
createECRequest("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
- createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1, new DERObjectIdentifier("1.3.132.0.34"));
+ createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1, new ASN1ObjectIdentifier("1.3.132.0.34"));
createECGOSTRequest();
diff --git a/pkix/src/test/jdk1.4/org/bouncycastle/cert/test/CertTest.java b/pkix/src/test/jdk1.4/org/bouncycastle/cert/test/CertTest.java
index b4a3a74e..55686343 100644
--- a/pkix/src/test/jdk1.4/org/bouncycastle/cert/test/CertTest.java
+++ b/pkix/src/test/jdk1.4/org/bouncycastle/cert/test/CertTest.java
@@ -39,9 +39,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)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 07:24:52 +0300